diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-12 23:03:44 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-12 23:03:44 -0400 |
| commit | 88c7a0a8c2ce6b503ff5d5509effb2a9f844993e (patch) | |
| tree | e3c57d6e9c0cdeb438ba8f96c19f93fe14336654 /configs/turris_omnia_defconfig | |
| parent | 60f38d82c45fef55ac04ee52b234e6dd07e31935 (diff) | |
| parent | 193a1e9f196b7fb7e913a70936c8a49060a1859c (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Various improvements to Keymile boards - mostly DT conversation
(Pascal & Holger)
- Removal of now unsupported Keymile boards (Pascal & Holger)
- Small MVEBU PCI fix (Marek)
- Turris Omnia defconfig update (Marek)
- Misc Allied Telesis defconfig updates (Chris)
Diffstat (limited to 'configs/turris_omnia_defconfig')
| -rw-r--r-- | configs/turris_omnia_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig index e7ece9e4b7..17740b9849 100644 --- a/configs/turris_omnia_defconfig +++ b/configs/turris_omnia_defconfig @@ -45,6 +45,8 @@ CONFIG_CMD_TIME=y CONFIG_CMD_AES=y CONFIG_CMD_HASH=y CONFIG_CMD_BTRFS=y +CONFIG_CMD_MEMTEST=y +CONFIG_SYS_ALT_MEMTEST=y # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_DEFAULT_DEVICE_TREE="armada-385-turris-omnia" CONFIG_ENV_IS_IN_SPI_FLASH=y @@ -60,6 +62,7 @@ CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_MV=y CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MARVELL=y CONFIG_PHY_GIGE=y |