configs: k2x_evm: Always include FIT loading support

Non-HS boards can use FIT images so include the env var commands
for these unconditionally.

Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Nishanth Menon <nm@ti.com>

diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
index 929c9a2..630dfdc 100644 (file)
--- a/include/configs/k2e_evm.h
+++ b/include/configs/k2e_evm.h
@@ -11,18 +11,11 @@
 
 #include <environment/ti/spi.h>
 
-#ifdef CONFIG_TI_SECURE_DEVICE
-#define DEFAULT_SEC_BOOT_ENV                                           \
-       DEFAULT_FIT_TI_ARGS                                             \
-       "findfdt=setenv fdtfile ${name_fdt}\0"
-#else
-#define DEFAULT_SEC_BOOT_ENV
-#endif
-
 /* U-Boot general configuration */
 #define ENV_KS2_BOARD_SETTINGS                                         \
        DEFAULT_FW_INITRAMFS_BOOT_ENV                                   \
-       DEFAULT_SEC_BOOT_ENV                                            \
+       DEFAULT_FIT_TI_ARGS                                             \
+       "findfdt=setenv fdtfile ${name_fdt}\0"                          \
        "boot=ubi\0"                                                    \
        "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "        \
        "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0"       \

diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
index 05b4a3c..ed54be8 100644 (file)
--- a/include/configs/k2hk_evm.h
+++ b/include/configs/k2hk_evm.h
@@ -11,18 +11,11 @@
 
 #include <environment/ti/spi.h>
 
-#ifdef CONFIG_TI_SECURE_DEVICE
-#define DEFAULT_SEC_BOOT_ENV                                           \
-       DEFAULT_FIT_TI_ARGS                                             \
-       "findfdt=setenv fdtfile ${name_fdt}\0"
-#else
-#define DEFAULT_SEC_BOOT_ENV
-#endif
-
 /* U-Boot general configuration */
 #define ENV_KS2_BOARD_SETTINGS                                         \
        DEFAULT_FW_INITRAMFS_BOOT_ENV                                   \
-       DEFAULT_SEC_BOOT_ENV                                            \
+       DEFAULT_FIT_TI_ARGS                                             \
+       "findfdt=setenv fdtfile ${name_fdt}\0"                          \
        "boot=ubi\0"                                                    \
        "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "        \
        "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0"       \

diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h
index b1b839b..69d42ea 100644 (file)
--- a/include/configs/k2l_evm.h
+++ b/include/configs/k2l_evm.h
@@ -11,18 +11,11 @@
 
 #include <environment/ti/spi.h>
 
-#ifdef CONFIG_TI_SECURE_DEVICE
-#define DEFAULT_SEC_BOOT_ENV                                           \
-       DEFAULT_FIT_TI_ARGS                                             \
-       "findfdt=setenv fdtfile ${name_fdt}\0"
-#else
-#define DEFAULT_SEC_BOOT_ENV
-#endif
-
 /* U-Boot general configuration */
 #define ENV_KS2_BOARD_SETTINGS                                         \
        DEFAULT_FW_INITRAMFS_BOOT_ENV                                   \
-       DEFAULT_SEC_BOOT_ENV                                            \
+       DEFAULT_FIT_TI_ARGS                                             \
+       "findfdt=setenv fdtfile ${name_fdt}\0"                          \
        "boot=ubi\0"                                                    \
        "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "        \
        "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,4096\0"       \