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

[u-boot] / configs / am3517_evm_defconfig

diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig
index e6c17c70f5b85878d1a7c2818e7e947e95f7517f..3b8e2900ebe6da27567c7914f155b44e4c0e8d6c 100644 (file)
--- a/configs/am3517_evm_defconfig
+++ b/configs/am3517_evm_defconfig
@@ -7,38 +7,42 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_AM3517_EVM=y
 CONFIG_EMIF4=y
+CONFIG_SPL=y
 CONFIG_DEFAULT_DEVICE_TREE="am3517-evm"
+CONFIG_DISTRO_DEFAULTS=y
 CONFIG_BOOTDELAY=10
+# CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_VERSION_VARIABLE=y
-CONFIG_SPL=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 # CONFIG_SPL_EXT_SUPPORT is not set
 CONFIG_SPL_MTD_SUPPORT=y
-CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="AM3517_EVM # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_EEPROM is not set
 # CONFIG_CMD_FLASH is not set
-# CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_GPT is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SPI is not set
 # CONFIG_CMD_SETEXPR is not set
-# CONFIG_CMD_MII is not set
 CONFIG_CMD_CACHE=y
 # CONFIG_CMD_TIME is not set
 CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1920k(u-boot),256k(u-boot-env),8m(kernel),512k(dtb),-(rootfs)"
 CONFIG_CMD_UBI=y
-CONFIG_SPL_PARTITION_UUIDS=y
 CONFIG_OF_CONTROL=y
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_SPL_OF_PLATDATA=y
+# CONFIG_ENV_IS_IN_FAT is not set
 CONFIG_ENV_IS_IN_NAND=y
 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_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
-# CONFIG_FAT_WRITE is not set
+CONFIG_USB_MUSB_AM35X=y
 CONFIG_BCH=y
+# CONFIG_SPL_OF_LIBFDT is not set