diff options
| author | Tom Rini <trini@konsulko.com> | 2025-06-09 16:28:28 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-06-09 16:28:28 -0600 |
| commit | 59d00e20fced23e6463aa09db889dd548baee677 (patch) | |
| tree | 2502afc87e22058b3efd0a5c3d878e62ba52e96e /boot/image-android.c | |
| parent | 865130b7308453b9436942f01cc4481124b820eb (diff) | |
| parent | d7c449c3d83a986d61e38d1762433c0607caf5c5 (diff) | |
Merge tag 'v2025.07-rc4' into next
Prepare v2025.07-rc4
Diffstat (limited to 'boot/image-android.c')
| -rw-r--r-- | boot/image-android.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/boot/image-android.c b/boot/image-android.c index 1746b018900..459cdb8456c 100644 --- a/boot/image-android.c +++ b/boot/image-android.c @@ -488,7 +488,8 @@ int android_image_get_ramdisk(const void *hdr, const void *vendor_boot_img, } else { /* Ramdisk can be used in-place, use current ptr */ if (img_data.ramdisk_addr == 0 || - img_data.ramdisk_addr == ANDROID_IMAGE_DEFAULT_RAMDISK_ADDR) { + img_data.ramdisk_addr == ANDROID_IMAGE_DEFAULT_RAMDISK_ADDR || + img_data.ramdisk_addr == img_data.kernel_addr) { *rd_data = img_data.ramdisk_ptr; } else { ramdisk_ptr = img_data.ramdisk_addr; |