summaryrefslogtreecommitdiff
path: root/boot/image-android.c
diff options
context:
space:
mode:
authorMattijs Korpershoek <[email protected]>2024-07-10 10:40:02 +0200
committerTom Rini <[email protected]>2024-07-18 13:51:30 -0600
commit58fed99f46115fe8547e7978fa361bbbbb3f3b50 (patch)
treed04a7ae6566582f82b64a10086cdca9d699f5f7f /boot/image-android.c
parent475aa8345a78396d39b42f96eccecd37ebe24e99 (diff)
boot: android: Provide vendor_bootimg_addr in boot_get_fdt()
When calling android_image_get_dtb_by_index() using boot image v3+, we should also pass the vendor_boot ramdisk address. Use get_avendor_bootimg_addr() to do so. Notes: on boot image v2, this is harmless since get_avendor_bootimg_addr() returns -1. for legacy implementations that don't have CMD_ABOOTIMG, add a weak implementation to avoid linking errors. Reviewed-by: Simon Glass <[email protected]> Reviewed-by: Julien Masson <[email protected]> Reviewed-by: Igor Opaniuk <[email protected]> Reviewed-by: Guillaume La Roque <[email protected]> Tested-by: Guillaume La Roque <[email protected]> Signed-off-by: Mattijs Korpershoek <[email protected]>
Diffstat (limited to 'boot/image-android.c')
-rw-r--r--boot/image-android.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/boot/image-android.c b/boot/image-android.c
index ee626972c11..09c7a44e058 100644
--- a/boot/image-android.c
+++ b/boot/image-android.c
@@ -56,6 +56,11 @@ static ulong add_trailer(ulong bootconfig_start_addr, ulong bootconfig_size)
return BOOTCONFIG_TRAILER_SIZE;
}
+__weak ulong get_avendor_bootimg_addr(void)
+{
+ return -1;
+}
+
static void android_boot_image_v3_v4_parse_hdr(const struct andr_boot_img_hdr_v3 *hdr,
struct andr_image_data *data)
{