Merge git://git.denx.de/u-boot-mpc85xx

[platform/kernel/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 df26528..d120c69 100644 (file)
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -14,8 +14,6 @@
 
 /* U-Boot Build Configuration */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* U-Boot is a 2nd stage loader */
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_DISPLAY_CPUINFO
 
 /* SoC Configuration */
 #define CONFIG_ARCH_CPU_INIT
@@ -195,7 +193,6 @@
 /* USB Configuration */
 #define CONFIG_USB_XHCI_KEYSTONE
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS     2
-#define CONFIG_EFI_PARTITION
 #define CONFIG_FS_FAT
 #define CONFIG_USB_SS_BASE                     KS2_USB_SS_BASE
 #define CONFIG_USB_HOST_XHCI_BASE              KS2_USB_HOST_XHCI_BASE
@@ -221,6 +218,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"                                     \
@@ -229,6 +228,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,15 +301,6 @@
 /* Now for the remaining common defines */
 #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.. */
-
 /* we may include files below only after all above definitions */
 #include <asm/arch/hardware.h>
 #include <asm/arch/clock.h>