diff options
| author | Safae Ouajih <souajih@baylibre.com> | 2023-02-06 00:50:11 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-04-04 14:50:47 -0400 |
| commit | e058176be32b09ca4f787442fd99d29e44079519 (patch) | |
| tree | 54acfa56aff54114bdea2da1d56967dd3750a39f /boot/bootm.c | |
| parent | 447240e27b892ab2ccc1ada03a260abbb562484e (diff) | |
| download | u-boot-e058176be32b09ca4f787442fd99d29e44079519.tar.gz u-boot-e058176be32b09ca4f787442fd99d29e44079519.tar.bz2 u-boot-e058176be32b09ca4f787442fd99d29e44079519.zip | |
android: boot: add vendor boot image to prepare for v3, v4 support
Introduce vendor boot image for version 3 and 4 of boot image header.
The vendor boot image will hold extra information about kernel, dtb
and ramdisk.
This is done to prepare for boot image version 3 and 4 support.
Signed-off-by: Safae Ouajih <souajih@baylibre.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Diffstat (limited to 'boot/bootm.c')
| -rw-r--r-- | boot/bootm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/boot/bootm.c b/boot/bootm.c index 2eec60ec7b..28a8fc3261 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -182,11 +182,11 @@ static int bootm_find_os(struct cmd_tbl *cmdtp, int flag, int argc, #ifdef CONFIG_ANDROID_BOOT_IMAGE case IMAGE_FORMAT_ANDROID: images.os.type = IH_TYPE_KERNEL; - images.os.comp = android_image_get_kcomp(os_hdr); + images.os.comp = android_image_get_kcomp(os_hdr, NULL); images.os.os = IH_OS_LINUX; - images.os.end = android_image_get_end(os_hdr); - images.os.load = android_image_get_kload(os_hdr); + images.os.end = android_image_get_end(os_hdr, NULL); + images.os.load = android_image_get_kload(os_hdr, NULL); images.ep = images.os.load; ep_found = true; break; @@ -965,7 +965,7 @@ static const void *boot_get_kernel(struct cmd_tbl *cmdtp, int flag, int argc, #ifdef CONFIG_ANDROID_BOOT_IMAGE case IMAGE_FORMAT_ANDROID: printf("## Booting Android Image at 0x%08lx ...\n", img_addr); - if (android_image_get_kernel(buf, images->verify, + if (android_image_get_kernel(buf, NULL, images->verify, os_data, os_len)) return NULL; break; |