Merge git://www.denx.de/git/u-boot-marvell

[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 66d85be7223be65e56a79f47983a43d22cec31bb..f88501505fc0bbb53b779dae5369dcc2ce3cd58b 100644 (file)
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -14,7 +14,6 @@
 
 /* U-Boot Build Configuration */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* U-Boot is a 2nd stage loader */
-#define CONFIG_BOARD_EARLY_INIT_F
 
 /* SoC Configuration */
 #define CONFIG_ARCH_CPU_INIT
@@ -220,6 +219,8 @@
        "set_rd_spec=setenv rd_spec ${rdaddr}:${filesize}\0"            \
        "init_fw_rd_net=dhcp ${rdaddr} ${tftp_root}/${name_fw_rd}; "    \
                "run set_rd_spec\0"                                     \
+       "init_fw_rd_nfs=nfs ${rdaddr} ${nfs_root}/boot/${name_fw_rd}; " \
+               "run set_rd_spec\0"                                     \
        "init_fw_rd_ramfs=setenv rd_spec -\0"                           \
        "init_fw_rd_ubi=ubifsload ${rdaddr} ${bootdir}/${name_fw_rd}; " \
                "run set_rd_spec\0"                                     \
@@ -228,6 +229,7 @@
        "set_name_pmmc=setenv name_pmmc ti-sci-firmware-${soc_variant}.bin\0" \
        "dev_pmmc=0\0"                                                  \
        "get_pmmc_net=dhcp ${loadaddr} ${tftp_root}/${name_pmmc}\0"     \
+       "get_pmmc_nfs=nfs ${loadaddr} ${nfs_root}/boot/${name_pmmc}\0"  \
        "get_pmmc_ramfs=run get_pmmc_net\0"                             \
        "get_pmmc_mmc=load mmc ${bootpart} ${loadaddr} "                \
                        "${bootdir}/${name_pmmc}\0"                     \
@@ -301,10 +303,8 @@
 #include <configs/ti_armv7_common.h>
 
 /* We wont be loading up OS from SPL for now.. */
-#undef CONFIG_SPL_OS_BOOT
 
 /* We do not have MMC support.. yet.. */
-#undef CONFIG_MMC
 #undef CONFIG_GENERIC_MMC
 
 /* And no support for GPIO, yet.. */