vhaudiquet/u-boot-krane
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rockchip: binman: Factor out arch and compression

Browse Source 
Declare arch and compression 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@chromium.org>
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Simon Glass
2025-05-06 15:58:25 +08:00
committed by Kever Yang
parent 876df0a57d
commit 3810ce1b47
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/dts/rockchip-u-boot.dtsi
+22 -22
View File
@@ -5,6 +5,20 @@
#include <config.h>
#ifdef CONFIG_ARM64
#define FIT_ARCH "arm64"
#else
#define FIT_ARCH "arm"
#endif
#if defined(CONFIG_SPL_GZIP)
#define FIT_UBOOT_COMP "gzip"
#elif defined(CONFIG_SPL_LZMA)
#define FIT_UBOOT_COMP "lzma"
#else
#define FIT_UBOOT_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 = FIT_ARCH;
compression = FIT_UBOOT_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 = FIT_UBOOT_COMP;
};
#ifdef CONFIG_SPL_FIT_SIGNATURE
hash {
@@ -84,7 +84,7 @@
fit,operation = "split-elf";
description = "ARM Trusted Firmware";
type = "firmware";
arch = "arm64";
arch = FIT_ARCH;
os = "arm-trusted-firmware";
compression = "none";
fit,load;
@@ -103,7 +103,7 @@
fit,operation = "split-elf";
description = "TEE";
type = "tee";
arch = "arm64";
arch = FIT_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 = FIT_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";