diff options
| author | Tom Rini <trini@konsulko.com> | 2025-02-11 08:56:54 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-02-11 08:56:54 -0600 |
| commit | 7f89b40f1c1472d24e408bce44a6d0eea4e50f3a (patch) | |
| tree | 1c19580056534daa3c35287fff5bb7ffefac51f0 /boot/image-android.c | |
| parent | 636fcc96c3d7e2b00c843e6da78ed3e9e3bdf4de (diff) | |
| parent | 4096d28ec80f982454ef0dc7d42a4d4eaead5d56 (diff) | |
Merge tag 'u-boot-dfu-20250211' of https://source.denx.de/u-boot/custodians/u-boot-dfu
u-boot-dfu-20250211:
CI:
- https://source.denx.de/u-boot/custodians/u-boot-dfu/-/pipelines/24556
Android:
- Handle boot images with missing DTB
Usb gadget:
- Fix nullptr in g_dnl when serial# is unset
- Add missing schedule() in f_mass_storage gadget
- Add support for STih407 in dwc3-generic
- Fix usb clocks on STih407
- Migrate STih407 to DM_USB_GADGET
Diffstat (limited to 'boot/image-android.c')
| -rw-r--r-- | boot/image-android.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/boot/image-android.c b/boot/image-android.c index fa4e14ca469..1746b018900 100644 --- a/boot/image-android.c +++ b/boot/image-android.c @@ -696,7 +696,10 @@ bool android_image_get_dtb_by_index(ulong hdr_addr, ulong vendor_boot_img, ulong dtb_addr; /* address of DTB blob with specified index */ u32 i; /* index iterator */ - android_image_get_dtb_img_addr(hdr_addr, vendor_boot_img, &dtb_img_addr); + if (!android_image_get_dtb_img_addr(hdr_addr, vendor_boot_img, + &dtb_img_addr)) + return false; + /* Check if DTB area of boot image is in DTBO format */ if (android_dt_check_header(dtb_img_addr)) { return android_dt_get_fdt_by_index(dtb_img_addr, index, addr, |