configs: Re-sync with cmd/Kconfig

[people/ms/u-boot.git] / include / configs / ti_armv7_keystone2.h

diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 0274ac6f888ac12c7426ce178a9521057bbc7f3e..2c9028c73558e9b5c03f15fac10e1c4e322626ff 100644 (file)
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -20,7 +20,9 @@
 /* SoC Configuration */
 #define CONFIG_ARCH_CPU_INIT
 #define CONFIG_SYS_ARCH_TIMER
+#ifndef CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_TEXT_BASE           0x0c000000
+#endif
 #define CONFIG_SPL_TARGET              "u-boot-spi.gph"
 #define CONFIG_SYS_DCACHE_OFF
 
@@ -143,8 +145,6 @@
 /* SerDes */
 #define CONFIG_TI_KEYSTONE_SERDES
 
-/* AEMIF */
-#define CONFIG_TI_AEMIF
 #define CONFIG_AEMIF_CNTRL_BASE                KS2_AEMIF_CNTRL_BASE
 
 /* I2C Configuration */
@@ -205,15 +205,10 @@
 #define CONFIG_USB_PHY_CFG_BASE                        KS2_USB_PHY_CFG_BASE
 
 /* U-Boot command configuration */
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_PING
 #define CONFIG_CMD_SAVES
-#define CONFIG_CMD_NAND
 #define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS
-#define CONFIG_CMD_SF
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_USB
 
 /* U-Boot general configuration */
 #define CONFIG_MISC_INIT_R
@@ -259,15 +254,20 @@
        "run_mon=mon_install ${addr_mon}\0"                             \
        "run_kern=bootz ${loadaddr} ${rd_spec} ${fdtaddr}\0"            \
        "init_net=run args_all args_net\0"                              \
+       "init_nfs=setenv autoload no; dhcp; run args_all args_net\0"    \
        "init_ubi=run args_all args_ubi; "                              \
                "ubi part ubifs; ubifsmount ubi:rootfs;\0"                      \
        "get_fdt_net=dhcp ${fdtaddr} ${tftp_root}/${name_fdt}\0"        \
+       "get_fdt_nfs=nfs ${fdtaddr} ${nfs_root}/boot/${name_fdt}\0"     \
        "get_fdt_ubi=ubifsload ${fdtaddr} ${bootdir}/${name_fdt}\0"             \
        "get_kern_net=dhcp ${loadaddr} ${tftp_root}/${name_kern}\0"     \
+       "get_kern_nfs=nfs ${loadaddr} ${nfs_root}/boot/${name_kern}\0"  \
        "get_kern_ubi=ubifsload ${loadaddr} ${bootdir}/${name_kern}\0"          \
        "get_mon_net=dhcp ${addr_mon} ${tftp_root}/${name_mon}\0"       \
+       "get_mon_nfs=nfs ${addr_mon} ${nfs_root}/boot/${name_mon}\0"    \
        "get_mon_ubi=ubifsload ${addr_mon} ${bootdir}/${name_mon}\0"            \
        "get_uboot_net=dhcp ${loadaddr} ${tftp_root}/${name_uboot}\0"   \
+       "get_uboot_nfs=nfs ${loadaddr} ${nfs_root}/boot/${name_uboot}\0" \
        "burn_uboot_spi=sf probe; sf erase 0 0x80000; "         \
                "sf write ${loadaddr} 0 ${filesize}\0"          \
        "burn_uboot_nand=nand erase 0 0x100000; "                       \
@@ -282,6 +282,7 @@
        "get_mon_ramfs=dhcp ${addr_mon} ${tftp_root}/${name_mon}\0"     \
        "get_fs_ramfs=dhcp ${rdaddr} ${tftp_root}/${name_fs}\0" \
        "get_ubi_net=dhcp ${addr_ubi} ${tftp_root}/${name_ubi}\0"       \
+       "get_ubi_nfs=nfs ${addr_ubi} ${nfs_root}/boot/${name_ubi}\0"    \
        "burn_ubi=nand erase.part ubifs; "                              \
                "nand write ${addr_ubi} ubifs ${filesize}\0"            \
        "init_ramfs=run args_all args_ramfs get_fs_ramfs\0"             \
@@ -313,7 +314,6 @@
 #undef CONFIG_SPL_EXT_SUPPORT
 #undef CONFIG_MMC
 #undef CONFIG_GENERIC_MMC
-#undef CONFIG_CMD_MMC
 
 /* And no support for GPIO, yet.. */
 #undef CONFIG_SPL_GPIO_SUPPORT