[PATCH] configs: k2x_evm: Always include FIT loading support
Nishanth Menon
nm at ti.com
Fri Jul 14 23:52:57 CEST 2023
On 14:00-20230714, Andrew Davis wrote:
> Non-HS boards can use FIT images so include the env var commands
> for these unconditionally.
>
> Signed-off-by: Andrew Davis <afd at ti.com>
Reviewed-by: Nishanth Menon <nm at ti.com>
> ---
> include/configs/k2e_evm.h | 11 ++---------
> include/configs/k2hk_evm.h | 11 ++---------
> include/configs/k2l_evm.h | 11 ++---------
> 3 files changed, 6 insertions(+), 27 deletions(-)
>
> diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
> index 929c9a26de1..630dfdc5b7f 100644
> --- 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 05b4a3c204d..ed54be839ff 100644
> --- 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 b1b839b5043..69d42eaf9f1 100644
> --- 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" \
> --
> 2.39.2
>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
More information about the U-Boot
mailing list