Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-19 11:24:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

android: Fix ramdisk loading for bootimage v3+

Browse source 
The boot_ramdisk and vendor_ramdisk must be both concatenated together.
Without this change, Android root is missing some of the necessary tools
to complete virtual AB OTA.

Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
This commit is contained in:
Roman Stratiienko 2024-05-19 13:09:51 +00:00 • committed by Tom Rini
parent c1eb7a993d
commit da3447d09f
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
boot/image-android.c
View file

@ -63,7 +63,6 @@ static void android_boot_image_v3_v4_parse_hdr(const struct andr_boot_img_hdr_v3
data->kcmdline = hdr->cmdline;
data->header_version = hdr->header_version;
data->ramdisk_ptr = env_get_ulong("ramdisk_addr_r", 16, 0);
/*
* The header takes a full page, the remaining components are aligned
@ -74,6 +73,7 @@ static void android_boot_image_v3_v4_parse_hdr(const struct andr_boot_img_hdr_v3
data->kernel_ptr = end;
data->kernel_size = hdr->kernel_size;
end += ALIGN(hdr->kernel_size, ANDR_GKI_PAGE_SIZE);
data->ramdisk_ptr = end;
data->ramdisk_size = hdr->ramdisk_size;
data->boot_ramdisk_size = hdr->ramdisk_size;
end += ALIGN(hdr->ramdisk_size, ANDR_GKI_PAGE_SIZE);
@ -393,25 +393,24 @@ int android_image_get_ramdisk(const void *hdr, const void *vendor_boot_img,
return -1;
}
if (img_data.header_version > 2) {
ramdisk_ptr = img_data.ramdisk_ptr;
ramdisk_ptr = img_data.ramdisk_addr;
memcpy((void *)(ramdisk_ptr), (void *)img_data.vendor_ramdisk_ptr,
img_data.vendor_ramdisk_size);
memcpy((void *)(ramdisk_ptr + img_data.vendor_ramdisk_size),
(void *)img_data.ramdisk_ptr,
ramdisk_ptr += img_data.vendor_ramdisk_size;
memcpy((void *)(ramdisk_ptr), (void *)img_data.ramdisk_ptr,
img_data.boot_ramdisk_size);
ramdisk_ptr += img_data.boot_ramdisk_size;
if (img_data.bootconfig_size) {
memcpy((void *)
(ramdisk_ptr + img_data.vendor_ramdisk_size +
img_data.boot_ramdisk_size),
(void *)img_data.bootconfig_addr,
(ramdisk_ptr), (void *)img_data.bootconfig_addr,
img_data.bootconfig_size);
}
}
printf("RAM disk load addr 0x%08lx size %u KiB\n",
img_data.ramdisk_ptr, DIV_ROUND_UP(img_data.ramdisk_size, 1024));
img_data.ramdisk_addr, DIV_ROUND_UP(img_data.ramdisk_size, 1024));
*rd_data = img_data.ramdisk_ptr;
*rd_data = img_data.ramdisk_addr;
*rd_len = img_data.ramdisk_size;
return 0;