Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / configs / usbarmory_defconfig

diff --git a/configs/usbarmory_defconfig b/configs/usbarmory_defconfig
index a71a75751f1ce435b4b41e1b021422031b3b87de..2e5bdadb80eab5175dad422c8651ad43c9e800fd 100644 (file)
--- a/configs/usbarmory_defconfig
+++ b/configs/usbarmory_defconfig
@@ -1,15 +1,18 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX5=y
+CONFIG_SYS_TEXT_BASE=0x77800000
 CONFIG_TARGET_USBARMORY=y
 # CONFIG_CMD_BMODE is not set
 CONFIG_DISTRO_DEFAULTS=y
-# CONFIG_CMD_IMLS is not set
+# CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_CMD_MEMTEST=y
-CONFIG_CMD_MMC=y
+CONFIG_CMD_FUSE=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
-CONFIG_CMD_FUSE=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_FSL_ESDHC=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y