LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: boot: content print is not supported for v3, v4 header version 

commit bb5d692732ca02511f2f491af1e680c87373fd35 upstream.

Content print is not supported for version 3 and 4 of boot image header.
Thus, only print that content when v2 is used.

Update android_print_contents() to print an error message
when trying to print boot image header version 3 or 4 content.

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>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
This commit is contained in:
Safae Ouajih 2023-02-06 00:50:09 +01:00 committed by Praneeth Bajjuri
parent 920344f968
commit a630f86007
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boot/image-android.c
View File

@ -477,6 +477,10 @@ bool android_image_get_dtb_by_index(ulong hdr_addr, u32 index, ulong *addr,
*/ */
void android_print_contents(const struct andr_boot_img_hdr_v0 *hdr) void android_print_contents(const struct andr_boot_img_hdr_v0 *hdr)
{ {
if (hdr->header_version >= 3) {
printf("Content print is not supported for boot image header version > 2");
return;
}
const char * const p = IMAGE_INDENT_STRING; const char * const p = IMAGE_INDENT_STRING;
/* os_version = ver << 11 | lvl */ /* os_version = ver << 11 | lvl */
u32 os_ver = hdr->os_version >> 11; u32 os_ver = hdr->os_version >> 11;
@ -509,7 +513,7 @@ void android_print_contents(const struct andr_boot_img_hdr_v0 *hdr)
hdr->header_size); hdr->header_size);
} }
if (hdr->header_version >= 2) { if (hdr->header_version == 2) {
printf("%sdtb size: %x\n", p, hdr->dtb_size); printf("%sdtb size: %x\n", p, hdr->dtb_size);
printf("%sdtb addr: %llx\n", p, hdr->dtb_addr); printf("%sdtb addr: %llx\n", p, hdr->dtb_addr);
} }