Merge branch '2023-04-04-android-image-v3-v4-support'

[J-u-boot.git] / boot / image-board.c

diff --git a/boot/image-board.c b/boot/image-board.c
index 2d73c76a4af3f84580d68c9f140172db5eb1e3a5..7dd0c32e6e1d5ca0f098a0cede0119f6fdee5b3d 100644 (file)
--- a/boot/image-board.c
+++ b/boot/image-board.c
@@ -426,10 +426,22 @@ static int select_ramdisk(struct bootm_headers *images, const char *select, u8 a
                break;
        case IMAGE_FORMAT_ANDROID:
                if (IS_ENABLED(CONFIG_ANDROID_BOOT_IMAGE)) {
-                       void *ptr = map_sysmem(images->os.start, 0);
                        int ret;
-                       ret = android_image_get_ramdisk(ptr, NULL, rd_datap, rd_lenp);
-                       unmap_sysmem(ptr);
+                       if (IS_ENABLED(CONFIG_CMD_ABOOTIMG)) {
+                               void *boot_img = map_sysmem(get_abootimg_addr(), 0);
+                               void *vendor_boot_img = map_sysmem(get_avendor_bootimg_addr(), 0);
+
+                               ret = android_image_get_ramdisk(boot_img, vendor_boot_img,
+                                                               rd_datap, rd_lenp);
+                               unmap_sysmem(vendor_boot_img);
+                               unmap_sysmem(boot_img);
+                       } else {
+                               void *ptr = map_sysmem(images->os.start, 0);
+
+                               ret = android_image_get_ramdisk(ptr, NULL, rd_datap, rd_lenp);
+                               unmap_sysmem(ptr);
+                       }
+
                        if (ret)
                                return ret;
                        done = true;