configs: Re-sync

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

diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig
index 6eaab564b7d14fa5216d33314f5fed09eff0720c..cc83b68d04ea977e44386498e4e9d5eac8d30f5a 100644 (file)
--- a/configs/edminiv2_defconfig
+++ b/configs/edminiv2_defconfig
@@ -2,10 +2,9 @@ CONFIG_ARM=y
 CONFIG_ORION5X=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_ORION5X=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y

-CONFIG_SPL_SERIAL_SUPPORT=y

 CONFIG_TARGET_EDMINIV2=y
 CONFIG_TARGET_EDMINIV2=y

+CONFIG_SPL_SERIAL_SUPPORT=y

 CONFIG_IDENT_STRING=" EDMiniV2"
 CONFIG_IDENT_STRING=" EDMiniV2"

-# CONFIG_MMC is not set

 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_ARCH_MISC_INIT=y
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_ARCH_MISC_INIT=y


@@ -18,6 +17,7 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_EXT2=y
 CONFIG_ISO_PARTITION=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_EXT2=y
 CONFIG_ISO_PARTITION=y

+# CONFIG_MMC is not set

 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y