diff options
| author | Tom Rini <trini@konsulko.com> | 2024-09-02 14:13:57 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-09-02 14:13:57 -0600 |
| commit | 8c069df8dd727bf78426aaa4604750ab93732f04 (patch) | |
| tree | 17ac5bea9d7200864aec9a5f531caed0a3e4e3ec /boot | |
| parent | f0ec3e608902ca1f573e5b7017da6bc804483f55 (diff) | |
| parent | 1312faac5f52d27cfb45dfe1a5a93a2944ca5c21 (diff) | |
Merge tag 'v2024.10-rc4' into next
Prepare v2024.10-rc4
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/image-android.c | 7 | ||||
| -rw-r--r-- | boot/image-board.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/boot/image-android.c b/boot/image-android.c index 09c7a44e058..774565fd1fe 100644 --- a/boot/image-android.c +++ b/boot/image-android.c @@ -393,10 +393,9 @@ int android_image_get_ramdisk(const void *hdr, const void *vendor_boot_img, if (!android_image_get_data(hdr, vendor_boot_img, &img_data)) return -EINVAL; - if (!img_data.ramdisk_size) { - *rd_data = *rd_len = 0; - return -1; - } + if (!img_data.ramdisk_size) + return -ENOENT; + if (img_data.header_version > 2) { ramdisk_ptr = img_data.ramdisk_addr; memcpy((void *)(ramdisk_ptr), (void *)img_data.vendor_ramdisk_ptr, diff --git a/boot/image-board.c b/boot/image-board.c index f2124013046..eca1b1d2bff 100644 --- a/boot/image-board.c +++ b/boot/image-board.c @@ -427,7 +427,9 @@ static int select_ramdisk(struct bootm_headers *images, const char *select, u8 a unmap_sysmem(ptr); } - if (ret) + if (ret == -ENOENT) + return -ENOPKG; + else if (ret) return ret; done = true; } |