[PATCH 3/4] boot: bootmeth_android: Conditionally dependent on abootimg
George Chan via B4 Relay
devnull+gchan9527.gmail.com at kernel.org
Tue May 20 16:25:58 CEST 2025
From: George Chan <gchan9527 at gmail.com>
If target u-boot img do not support androidboot v3 or greater,
abootimg might not be necessary.
aarch64-linux-gnu-ld.bfd: boot/bootmeth_android.o: in function `boot_android_normal':
/home/user/sources/u-boot-next/boot/bootmeth_android.c:541:(.text.boot_android_normal+0xd0): undefined reference to `set_avendor_bootimg_addr'
aarch64-linux-gnu-ld.bfd: /home/user/sources/u-boot-next/boot/bootmeth_android.c:543:(.text.boot_android_normal+0xd8): undefined reference to `set_abootimg_addr'
Segmentation fault (core dumped)
Signed-off-by: George Chan <gchan9527 at gmail.com>
---
boot/bootmeth_android.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/boot/bootmeth_android.c b/boot/bootmeth_android.c
index 654ebfdf1fc..29a9a4afe7a 100644
--- a/boot/bootmeth_android.c
+++ b/boot/bootmeth_android.c
@@ -517,7 +517,7 @@ static int boot_android_normal(struct bootflow *bflow)
struct android_priv *priv = bflow->bootmeth_priv;
int ret;
ulong loadaddr = env_get_hex("loadaddr", 0);
- ulong vloadaddr = env_get_hex("vendor_boot_comp_addr_r", 0);
+ ulong __maybe_unused vloadaddr = env_get_hex("vendor_boot_comp_addr_r", 0);
ret = run_avb_verification(bflow);
if (ret < 0)
@@ -533,6 +533,7 @@ static int boot_android_normal(struct bootflow *bflow)
if (ret < 0)
return log_msg_ret("read boot", ret);
+#ifdef CONFIG_CMD_ABOOTIMG
if (priv->header_version >= 3) {
ret = read_slotted_partition(desc, "vendor_boot", priv->slot,
priv->vendor_boot_img_size, vloadaddr);
@@ -541,6 +542,7 @@ static int boot_android_normal(struct bootflow *bflow)
set_avendor_bootimg_addr(vloadaddr);
}
set_abootimg_addr(loadaddr);
+#endif
if (priv->slot)
free(priv->slot);
--
2.43.0
More information about the U-Boot
mailing list