diff options
| author | Mattijs Korpershoek <[email protected]> | 2024-07-10 10:40:02 +0200 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-07-18 13:51:30 -0600 |
| commit | 58fed99f46115fe8547e7978fa361bbbbb3f3b50 (patch) | |
| tree | d04a7ae6566582f82b64a10086cdca9d699f5f7f /boot/image-fdt.c | |
| parent | 475aa8345a78396d39b42f96eccecd37ebe24e99 (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-fdt.c')
| -rw-r--r-- | boot/image-fdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/boot/image-fdt.c b/boot/image-fdt.c index 56dd7687f51..8332792b8e8 100644 --- a/boot/image-fdt.c +++ b/boot/image-fdt.c @@ -502,7 +502,7 @@ int boot_get_fdt(void *buf, const char *select, uint arch, * Firstly check if this android boot image has dtb field. */ dtb_idx = (u32)env_get_ulong("adtb_idx", 10, 0); - if (android_image_get_dtb_by_index((ulong)hdr, 0, + if (android_image_get_dtb_by_index((ulong)hdr, get_avendor_bootimg_addr(), dtb_idx, &fdt_addr, &fdt_size)) { fdt_blob = (char *)map_sysmem(fdt_addr, 0); if (fdt_check_header(fdt_blob)) |