diff options
| author | Tom Rini <[email protected]> | 2025-06-09 16:28:28 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-06-09 16:28:28 -0600 |
| commit | 59d00e20fced23e6463aa09db889dd548baee677 (patch) | |
| tree | 2502afc87e22058b3efd0a5c3d878e62ba52e96e /boot | |
| parent | 865130b7308453b9436942f01cc4481124b820eb (diff) | |
| parent | d7c449c3d83a986d61e38d1762433c0607caf5c5 (diff) | |
Merge tag 'v2025.07-rc4' into next
Prepare v2025.07-rc4
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/bootm.c | 3 | ||||
| -rw-r--r-- | boot/image-android.c | 3 | ||||
| -rw-r--r-- | boot/image.c | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/boot/bootm.c b/boot/bootm.c index f6aa32746b7..108ca7fb472 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -1169,8 +1169,7 @@ void bootm_init(struct bootm_info *bmi) { memset(bmi, '\0', sizeof(struct bootm_info)); bmi->boot_progress = true; - if (IS_ENABLED(CONFIG_CMD_BOOTM)) - bmi->images = &images; + bmi->images = &images; } /** 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; diff --git a/boot/image.c b/boot/image.c index 45299a7dc33..139c5bd035a 100644 --- a/boot/image.c +++ b/boot/image.c @@ -92,8 +92,7 @@ static const table_entry_t uimage_arch[] = { { IH_ARCH_ARC, "arc", "ARC", }, { IH_ARCH_X86_64, "x86_64", "AMD x86_64", }, { IH_ARCH_XTENSA, "xtensa", "Xtensa", }, - { IH_ARCH_RISCV, "riscv", "RISC-V 32 Bit",}, - { IH_ARCH_RISCV64, "riscv64", "RISC-V 64 Bit",}, + { IH_ARCH_RISCV, "riscv", "RISC-V", }, { -1, "", "", }, }; |