projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-sunxi
[oweals/u-boot.git]
/
configs
/
usbarmory_defconfig
diff --git
a/configs/usbarmory_defconfig
b/configs/usbarmory_defconfig
index 17e208b767acf725dc0aa10cef27820aea7f71bf..1e92678a384c71ed003bea9f5bbcec75400d5230 100644
(file)
--- a/
configs/usbarmory_defconfig
+++ b/
configs/usbarmory_defconfig
@@
-1,19
+1,17
@@
CONFIG_ARM=y
CONFIG_ARCH_MX5=y
CONFIG_ARM=y
CONFIG_ARCH_MX5=y
+CONFIG_SYS_TEXT_BASE=0x77800000
CONFIG_TARGET_USBARMORY=y
CONFIG_TARGET_USBARMORY=y
-CONFIG_HUSH_PARSER=y
-CONFIG_
CMD_BOOTZ
=y
-# CONFIG_
CMD_IMLS
is not set
+# CONFIG_CMD_BMODE is not set
+CONFIG_
DISTRO_DEFAULTS
=y
+# CONFIG_
USE_BOOTCOMMAND
is not set
CONFIG_CMD_MEMTEST=y
CONFIG_CMD_MEMTEST=y
-CONFIG_CMD_
MMC
=y
+CONFIG_CMD_
FUSE
=y
CONFIG_CMD_I2C=y
CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
CONFIG_CMD_USB=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_USB=y
# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_USB=y
+CONFIG_USB_STORAGE=y
CONFIG_OF_LIBFDT=y
CONFIG_OF_LIBFDT=y