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

[people/ms/u-boot.git] / configs / edminiv2_defconfig

diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig
index ef221b253f1607efb5db16433628d63439b0ec48..8e6b9d242138b0509d25011cc9b57fed5a3b8d89 100644 (file)
--- a/configs/edminiv2_defconfig
+++ b/configs/edminiv2_defconfig
@@ -2,18 +2,27 @@ CONFIG_ARM=y
 CONFIG_ORION5X=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_TARGET_EDMINIV2=y
+CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_IDENT_STRING=" EDMiniV2"
 CONFIG_BOOTDELAY=3
+# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_ARCH_MISC_INIT=y
 CONFIG_SPL=y
+CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_NOR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="EDMiniV2> "
+CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_EXT2=y
+CONFIG_ISO_PARTITION=y
+CONFIG_ENV_IS_IN_FLASH=y
+# CONFIG_MMC is not set
+CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y