| Message ID | 20240606-bootmeth-android-v1-1-0c69d4457cc5@baylibre.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | bootstd: Add Android support | expand |
On Thu, Jun 6, 2024 at 2:24 PM Mattijs Korpershoek <mkorpershoek@baylibre.com> wrote: > > 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. > > Note: on boot image v2, this is harmless since get_avendor_bootimg_addr() > returns -1. > > Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> > --- > boot/image-fdt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/boot/image-fdt.c b/boot/image-fdt.c > index 56dd7687f51c..8332792b8e80 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)) > > -- > 2.45.0 > Reviewed-by: Igor Opaniuk <igor.opaniuk@gmail.com>
diff --git a/boot/image-fdt.c b/boot/image-fdt.c index 56dd7687f51c..8332792b8e80 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))
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. Note: on boot image v2, this is harmless since get_avendor_bootimg_addr() returns -1. Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> --- boot/image-fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)