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>
This commit is contained in:
Andrew Davis 2023-07-14 14:00:58 -05:00 committed by Tom Rini
parent 70aa5a94d4
commit 300e475967
3 changed files with 6 additions and 27 deletions

View File

@ -11,18 +11,11 @@
#include <environment/ti/spi.h> #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 */ /* U-Boot general configuration */
#define ENV_KS2_BOARD_SETTINGS \ #define ENV_KS2_BOARD_SETTINGS \
DEFAULT_FW_INITRAMFS_BOOT_ENV \ DEFAULT_FW_INITRAMFS_BOOT_ENV \
DEFAULT_SEC_BOOT_ENV \ DEFAULT_FIT_TI_ARGS \
"findfdt=setenv fdtfile ${name_fdt}\0" \
"boot=ubi\0" \ "boot=ubi\0" \
"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \
"root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \ "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \

View File

@ -11,18 +11,11 @@
#include <environment/ti/spi.h> #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 */ /* U-Boot general configuration */
#define ENV_KS2_BOARD_SETTINGS \ #define ENV_KS2_BOARD_SETTINGS \
DEFAULT_FW_INITRAMFS_BOOT_ENV \ DEFAULT_FW_INITRAMFS_BOOT_ENV \
DEFAULT_SEC_BOOT_ENV \ DEFAULT_FIT_TI_ARGS \
"findfdt=setenv fdtfile ${name_fdt}\0" \
"boot=ubi\0" \ "boot=ubi\0" \
"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \
"root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \ "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \

View File

@ -11,18 +11,11 @@
#include <environment/ti/spi.h> #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 */ /* U-Boot general configuration */
#define ENV_KS2_BOARD_SETTINGS \ #define ENV_KS2_BOARD_SETTINGS \
DEFAULT_FW_INITRAMFS_BOOT_ENV \ DEFAULT_FW_INITRAMFS_BOOT_ENV \
DEFAULT_SEC_BOOT_ENV \ DEFAULT_FIT_TI_ARGS \
"findfdt=setenv fdtfile ${name_fdt}\0" \
"boot=ubi\0" \ "boot=ubi\0" \
"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \
"root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,4096\0" \ "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,4096\0" \