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

[u-boot] / configs / am3517_crane_defconfig

diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig
index 2e8d9439add94e73db82b0ab3e5cc158de6ca27a..23b34415055356a8ef1e8894cab8e5dc57ed5240 100644 (file)
--- a/configs/am3517_crane_defconfig
+++ b/configs/am3517_crane_defconfig
@@ -5,22 +5,20 @@ CONFIG_SYS_TEXT_BASE=0x80100000
 # CONFIG_SPL_GPIO_SUPPORT is not set
 CONFIG_TARGET_AM3517_CRANE=y
 CONFIG_EMIF4=y
-CONFIG_BOOTDELAY=10
 CONFIG_SPL=y
+CONFIG_BOOTDELAY=10
 # CONFIG_SPL_EXT_SUPPORT is not set
 CONFIG_HUSH_PARSER=y
+# CONFIG_CMDLINE_EDITING is not set
 CONFIG_SYS_PROMPT="AM3517_CRANE # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_FLASH is not set
-# CONFIG_CMD_FPGA is not set
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
-CONFIG_CMD_DHCP=y
-# CONFIG_CMD_NFS is not set
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
@@ -29,8 +27,10 @@ CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
+CONFIG_CONS_INDEX=3
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HCD=y
 CONFIG_USB_AM35X=y
 CONFIG_USB_STORAGE=y
+# CONFIG_REGEX is not set