diff options
| author | Safae Ouajih <souajih@baylibre.com> | 2023-02-06 00:50:17 +0100 |
|---|---|---|
| committer | Praneeth Bajjuri <praneeth@ti.com> | 2023-04-05 11:41:11 -0500 |
| commit | 5456cac6eacdd55c5f7379f406b08d24a7285112 (patch) | |
| tree | f666110694d39e8f2217f61865116c2ae644bac2 /boot/image-board.c | |
| parent | 0349ecf2f5d4ec227b51a70f95c4e8aff6588c37 (diff) | |
android: boot: support boot image header version 3 and 4
commit 636da2039aea4ea3a638b14da0a9ec258897a10c upstream.
Enable the support for boot image header version 3 and 4
using abootimg command.
In order to use version 3 or 4:
1- Vendor boot image address should be given to abootimg cmd.
abootimg addr $1 $vendor_boot_load_addr
2- "ramdisk_addr_r" env variable (ramdisk address) should be set to host
the ramdisk : generic ramdisk + vendor ramdisk
Replace "struct andr_boot_img_hdr_v0*" by "void *" in
some functions since v3 and v4 are now supported as well.
Signed-off-by: Safae Ouajih <souajih@baylibre.com>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Diffstat (limited to 'boot/image-board.c')
| -rw-r--r-- | boot/image-board.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/boot/image-board.c b/boot/image-board.c index 670658a96c..fd0e438f93 100644 --- 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; |