All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] configs: k2x_evm: Always include FIT loading support
@ 2023-07-14 19:00 Andrew Davis
  2023-07-14 21:52 ` Nishanth Menon
  2023-07-21 23:34 ` Tom Rini
  0 siblings, 2 replies; 3+ messages in thread
From: Andrew Davis @ 2023-07-14 19:00 UTC (permalink / raw)
  To: Simon Glass, Tom Rini, Nishanth Menon, Vignesh Raghavendra, u-boot
  Cc: Andrew Davis

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

Signed-off-by: Andrew Davis <afd@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


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] configs: k2x_evm: Always include FIT loading support
  2023-07-14 19:00 [PATCH] configs: k2x_evm: Always include FIT loading support Andrew Davis
@ 2023-07-14 21:52 ` Nishanth Menon
  2023-07-21 23:34 ` Tom Rini
  1 sibling, 0 replies; 3+ messages in thread
From: Nishanth Menon @ 2023-07-14 21:52 UTC (permalink / raw)
  To: Andrew Davis; +Cc: Simon Glass, Tom Rini, Vignesh Raghavendra, u-boot

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@ti.com>

Reviewed-by: Nishanth Menon <nm@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

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH] configs: k2x_evm: Always include FIT loading support
  2023-07-14 19:00 [PATCH] configs: k2x_evm: Always include FIT loading support Andrew Davis
  2023-07-14 21:52 ` Nishanth Menon
@ 2023-07-21 23:34 ` Tom Rini
  1 sibling, 0 replies; 3+ messages in thread
From: Tom Rini @ 2023-07-21 23:34 UTC (permalink / raw)
  To: Andrew Davis; +Cc: Simon Glass, Nishanth Menon, Vignesh Raghavendra, u-boot

[-- Attachment #1: Type: text/plain, Size: 303 bytes --]

On Fri, Jul 14, 2023 at 02:00:58PM -0500, 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@ti.com>
> Reviewed-by: Nishanth Menon <nm@ti.com>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-07-21 23:35 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-14 19:00 [PATCH] configs: k2x_evm: Always include FIT loading support Andrew Davis
2023-07-14 21:52 ` Nishanth Menon
2023-07-21 23:34 ` Tom Rini

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.