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

android: boot: support boot image header version 3 and 4

Browse source 
Enable the support for boot image header version 3 and 4
using abootimg command.

In order to use version 3 or 4:

1- Vendor boot image address should be given to abootimg cmd.

	abootimg addr $1 $vendor_boot_load_addr

2- "ramdisk_addr_r" env variable (ramdisk address) should be set to host
the ramdisk : generic ramdisk + vendor ramdisk

Replace "struct andr_boot_img_hdr_v0*" by "void *" in
some functions since v3 and v4 are now supported as well.

Signed-off-by: Safae Ouajih <souajih@baylibre.com>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
This commit is contained in:
Safae Ouajih 2023-02-06 00:50:17 +01:00 • committed by Tom Rini
parent bc6413bdd9
commit 636da2039a
6 changed files with 99 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

16
boot/image-android.c
View file

@ -201,7 +201,7 @@ static ulong android_image_get_kernel_addr(struct andr_image_data *img_data)
* Return: Zero, os start address and length on success,
* otherwise on failure.
*/
int android_image_get_kernel(const struct andr_boot_img_hdr_v0 *hdr,
int android_image_get_kernel(const void *hdr,
const void *vendor_boot_img, int verify,
ulong *os_data, ulong *os_len)
{
@ -286,7 +286,7 @@ bool is_android_vendor_boot_image_header(const void *vendor_boot_img)
return !memcmp(VENDOR_BOOT_MAGIC, vendor_boot_img, ANDR_VENDOR_BOOT_MAGIC_SIZE);
}
bool is_android_boot_image_header(const struct andr_boot_img_hdr_v0 *hdr)
bool is_android_boot_image_header(const void *hdr)
{
return !memcmp(ANDR_BOOT_MAGIC, hdr, ANDR_BOOT_MAGIC_SIZE);
}
@ -305,7 +305,7 @@ ulong android_image_get_end(const struct andr_boot_img_hdr_v0 *hdr,
return img_data.boot_img_total_size;
}
ulong android_image_get_kload(const struct andr_boot_img_hdr_v0 *hdr,
ulong android_image_get_kload(const void *hdr,
const void *vendor_boot_img)
{
struct andr_image_data img_data;
@ -316,7 +316,7 @@ ulong android_image_get_kload(const struct andr_boot_img_hdr_v0 *hdr,
return android_image_get_kernel_addr(&img_data);
}
ulong android_image_get_kcomp(const struct andr_boot_img_hdr_v0 *hdr,
ulong android_image_get_kcomp(const void *hdr,
const void *vendor_boot_img)
{
struct andr_image_data img_data;
@ -364,14 +364,18 @@ int android_image_get_ramdisk(const void *hdr, const void *vendor_boot_img,
return 0;
}
int android_image_get_second(const struct andr_boot_img_hdr_v0 *hdr,
ulong *second_data, ulong *second_len)
int android_image_get_second(const void *hdr, ulong *second_data, ulong *second_len)
{
struct andr_image_data img_data;
if (!android_image_get_data(hdr, NULL, &img_data))
return -EINVAL;
if (img_data.header_version > 2) {
printf("Second stage bootloader is only supported for boot image version <= 2\n");
return -EOPNOTSUPP;
}
if (!img_data.second_size) {
*second_data = *second_len = 0;
return -1;