[PATCH 06/29] rockchip: dts: Factor out arch and compression

[Jonas Karlman]

Hi Simon,

On 2025-02-05 02:54, Simon Glass wrote:
> Declare these at the top of the file to avoid needing #ifdefs in every
> usage.
> 
> Add a few comments to help with the remaining #ifdefs
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>

This patch should happen after the os = "U-Boot" fix if they are part of
same series, fixes before features/enhancements, with that:

Reviewed-by: Jonas Karlman <jonas at kwiboo.se>

Regards,
Jonas

> ---
> 
>  arch/arm/dts/rockchip-u-boot.dtsi | 44 +++++++++++++++----------------
>  1 file changed, 22 insertions(+), 22 deletions(-)
> 
> diff --git a/arch/arm/dts/rockchip-u-boot.dtsi b/arch/arm/dts/rockchip-u-boot.dtsi
> index c8c928c7e50..8d6b2184f43 100644
> --- a/arch/arm/dts/rockchip-u-boot.dtsi
> +++ b/arch/arm/dts/rockchip-u-boot.dtsi
> @@ -5,6 +5,20 @@
>  
>  #include <config.h>
>  
> +#ifdef CONFIG_ARM64
> +#define ARCH	"arm64"
> +#else
> +#define ARCH	"arm"
> +#endif
> +
> +#if defined(CONFIG_SPL_GZIP)
> +#define COMP	"gzip"
> +#elif defined(CONFIG_SPL_LZMA)
> +#define COMP	"lzma"
> +#else
> +#define COMP	"none"
> +#endif
> +
>  / {
>  	binman: binman {
>  		multiple-images;
> @@ -51,26 +65,12 @@
>  					description = "U-Boot";
>  					type = "standalone";
>  					os = "U-Boot";
> -#ifdef CONFIG_ARM64
> -					arch = "arm64";
> -#else
> -					arch = "arm";
> -#endif
> -#if defined(CONFIG_SPL_GZIP)
> -					compression = "gzip";
> -#elif defined(CONFIG_SPL_LZMA)
> -					compression = "lzma";
> -#else
> -					compression = "none";
> -#endif
> +					arch = ARCH;
> +					compression = COMP;
>  					load = <CONFIG_TEXT_BASE>;
>  					entry = <CONFIG_TEXT_BASE>;
>  					u-boot-nodtb {
> -#if defined(CONFIG_SPL_GZIP)
> -					compress = "gzip";
> -#elif defined(CONFIG_SPL_LZMA)
> -					compress = "lzma";
> -#endif
> +					compress = COMP;
>  					};
>  #ifdef CONFIG_SPL_FIT_SIGNATURE
>  					hash {
> @@ -84,7 +84,7 @@
>  					fit,operation = "split-elf";
>  					description = "ARM Trusted Firmware";
>  					type = "firmware";
> -					arch = "arm64";
> +					arch = ARCH;
>  					os = "arm-trusted-firmware";
>  					compression = "none";
>  					fit,load;
> @@ -103,7 +103,7 @@
>  					fit,operation = "split-elf";
>  					description = "TEE";
>  					type = "tee";
> -					arch = "arm64";
> +					arch = ARCH;
>  					os = "tee";
>  					compression = "none";
>  					fit,load;
> @@ -119,11 +119,11 @@
>  					};
>  #endif
>  				};
> -#else
> +#else /* !CONFIG_ARM64 */
>  				op-tee {
>  					description = "OP-TEE";
>  					type = "tee";
> -					arch = "arm";
> +					arch = ARCH;
>  					os = "tee";
>  					compression = "none";
>  					load = <(CFG_SYS_SDRAM_BASE + 0x8400000)>;
> @@ -137,7 +137,7 @@
>  					};
>  #endif
>  				};
> -#endif
> +#endif /* CONFIG_ARM64 */
>  
>  				@fdt-SEQ {
>  					description = "fdt-NAME";