diff options
| author | Tom Rini <trini@konsulko.com> | 2025-07-03 08:27:29 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-07-03 08:27:29 -0600 |
| commit | 7598b469c16d97128d9c22839b06d94c5c331a7e (patch) | |
| tree | 209b6c8e05b7d6c7450750528a5d1f8ff61cc3d3 | |
| parent | 1323b480a6fc053475901a90bdaece2ddcc47310 (diff) | |
| parent | 4b489f517366595cd3f003d4175e721bd927a18b (diff) | |
Merge tag 'u-boot-dfu-next-20250703' of https://source.denx.de/u-boot/custodians/u-boot-dfu into next
u-boot-dfu-next-20250703
CI job:
- https://source.denx.de/u-boot/custodians/u-boot-dfu/-/pipelines/26938
Android:
- Fix uninitialized vhdr pointer in image-android.c
- Fix uninitialized vhdr pointer in abootimg cmd
DFU:
- Update maintainers file to include spl/spl_dfu
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | boot/image-android.c | 2 | ||||
| -rw-r--r-- | cmd/abootimg.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5a4ce86178b..b3a12f17de8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1073,6 +1073,7 @@ T: git https://source.denx.de/u-boot/custodians/u-boot-dfu.git F: cmd/dfu.c F: cmd/usb_*.c F: common/dfu.c +F: common/spl/spl_dfu.c F: common/update.c F: doc/api/dfu.rst F: doc/usage/dfu.rst diff --git a/boot/image-android.c b/boot/image-android.c index 14cf611cee5..1cd2060bb3f 100644 --- a/boot/image-android.c +++ b/boot/image-android.c @@ -680,7 +680,7 @@ bool android_image_get_dtb_by_index(ulong hdr_addr, ulong vendor_boot_img, { struct andr_image_data img_data; const struct andr_boot_img_hdr_v0 *hdr; - const struct andr_vnd_boot_img_hdr *vhdr; + const struct andr_vnd_boot_img_hdr *vhdr = NULL; hdr = map_sysmem(hdr_addr, sizeof(*hdr)); if (vendor_boot_img != -1) diff --git a/cmd/abootimg.c b/cmd/abootimg.c index 44de00fb9c9..6fb52153786 100644 --- a/cmd/abootimg.c +++ b/cmd/abootimg.c @@ -96,7 +96,7 @@ static int abootimg_get_dtb_load_addr(int argc, char *const argv[]) return CMD_RET_USAGE; struct andr_image_data img_data = {0}; const struct andr_boot_img_hdr_v0 *hdr; - const struct andr_vnd_boot_img_hdr *vhdr; + const struct andr_vnd_boot_img_hdr *vhdr = NULL; hdr = map_sysmem(abootimg_addr(), sizeof(*hdr)); if (get_avendor_bootimg_addr() != -1) |