Merge git://git.denx.de/u-boot-sunxi

[u-boot] / configs / turris_omnia_defconfig

diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig
index 512b9da74deb375629922b8ea49d85108c516347..f68a1a0d056edf942acd453b84c953a4c56ea041 100644 (file)
--- a/configs/turris_omnia_defconfig
+++ b/configs/turris_omnia_defconfig
@@ -7,56 +7,41 @@ CONFIG_TARGET_TURRIS_OMNIA=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_SPL_BOOT_DEVICE_SPI=y
-CONFIG_DISTRO_DEFAULTS=y
 CONFIG_DEFAULT_DEVICE_TREE="armada-385-turris-omnia"
+CONFIG_DEBUG_UART=y
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
+# CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_SPL=y
 CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_PCI=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
-CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
-CONFIG_CMD_GO=y
-CONFIG_CMD_RUN=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_SAVEENV=y
-CONFIG_CMD_LOADB=y
-CONFIG_CMD_LOADS=y
-CONFIG_CMD_MEMORY=y
-CONFIG_CMD_ECHO=y
-CONFIG_CMD_SETEXPR=y
-# CONFIG_PARTITION_UUIDS is not set
 # CONFIG_SPL_PARTITION_UUIDS is not set
-CONFIG_DOS_PARTITION=y
 CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_MISC=y
 CONFIG_ATSHA204A=y
-CONFIG_DEBUG_UART=y
-CONFIG_DEBUG_UART_NS16550=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_MV=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_GIGE=y
 CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=250000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_MV=y
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI=y
-CONFIG_USB_EHCI_MARVELL=y
 CONFIG_USB_STORAGE=y
 CONFIG_WDT=y
 CONFIG_WDT_ORION=y
-CONFIG_ARCH_MISC_INIT=y
-CONFIG_BOARD_EARLY_INIT_F=y
-CONFIG_CMDLINE=y
-CONFIG_HUSH_PARSER=y
-CONFIG_SYS_PROMPT="=> "
-# CONFIG_DISPLAY_BOARDINFO is not set