boot: android: Add support for the bootflow of Android 13+
PATCH v2 1/1 boot: android: Add support for the bootflow of Android 13+
The devices launching Android 13+ were using a new partition named init_boot to store generic ramdisk.
In the new bootflow, kernel still be stored in boot image, however, the First Stage files in ramdisk were moved to init_boot image. We should load it to memory and verify it so that the kernel can execute init program to continue booting.
Signed-off-by Valentin Liu <[email protected]>
--- boot/bootmeth_android.c | 65 ++++++++++++++++++++++++++++++- boot/image-android.c | 67 ++++++++++++++++++++++++++++++++ cmd/abootimg.c | 6 +++ doc/develop/bootstd/overview.rst | 3 ++ include/android_image.h | 1 + include/image.h | 59 ++++++++++++++++++++++++++++ 6 files changed, 200 insertions(+), 1 deletion(-)
boot/bootmeth_android.c +64 -1
@@ -4,6 +4,7 @@* * Copyright (C) 2024 BayLibre, SAS * Written by Mattijs Korpershoek <[email protected]> +* Copyright (c) 2026 Valentin Liu <[email protected]> */ #define LOG_CATEGORY UCLASS_BOOTSTD
@@ -29,6 +30,7 @@#define BCB_FIELD_COMMAND_SZ 32#define BCB_PART_NAME "misc"#define BOOT_PART_NAME "boot" +#define INIT_BOOT_PART_NAME "init_boot"#define VENDOR_BOOT_PART_NAME "vendor_boot"#define SLOT_LEN 2
@@ -47,6 +49,7 @@ struct android_priv {char *slot;u32 header_version;u32 boot_img_size; +u32 init_boot_img_size;u32 vendor_boot_img_size; };
@@ -113,6 +116,51 @@ static int scan_boot_part(struct udevice *blk, struct android_priv *priv)return 0 ; } +static int scan_init_boot_part (struct udevice *blk,struct android_priv *priv) +{ +struct blk_desc *desc =dev_get_uclass_plat (blk); +struct disk_partition partition; +char partname[PART_NAME_LEN ]; +ulong num_blks, bufsz; +char *buf; +int ret; + +if (priv->slot) +sprintf (partname,INIT_BOOT_PART_NAME "_%s" , priv->slot); +else +sprintf (partname,INIT_BOOT_PART_NAME ); + + ret =part_get_info_by_name (desc, partname, &partition); +if (ret <0 ) +return log_msg_ret ("part info" , ret); + + num_blks =DIV_ROUND_UP (sizeof (struct andr_boot_img_hdr_v3 ), desc->blksz); + bufsz = num_blks * desc->blksz; + buf =malloc (bufsz); +if (!buf) +return log_msg_ret ("buf" , -ENOMEM ); + + ret =blk_read (blk, partition.start, num_blks, buf); +if (ret != num_blks) { +free (buf); +return log_msg_ret ("part read" , -EIO ); + } + +if (!is_android_init_boot_image_header (buf)) { +free (buf); +return log_msg_ret ("header" , -ENOENT ); + } + +if (!android_image_get_init_bootimg_size (buf, &priv->init_boot_img_size)) { +free (buf); +return log_msg_ret ("get init bootimg size" , -EINVAL ); + } + +free (buf); + +return 0 ; +} +static int scan_vendor_boot_part (struct udevice *blk,struct android_priv *priv) {struct blk_desc *desc =dev_get_uclass_plat (blk);
@@ -292,6 +340,13 @@ static int android_read_bootflow(struct udevice *dev, struct bootflow *bflow) }if (priv->header_version >=3 ) { +if (priv->header_version >=4 ) { + ret =scan_init_boot_part (bflow->blk, priv); +if (ret <0 ) { +log_debug ("scan init_boot failed: err=%d\n" , ret); + goto free_priv; + } + } ret =scan_vendor_boot_part (bflow->blk, priv);if (ret <0 ) {log_debug ("scan vendor_boot failed: err=%d\n" , ret);
@@ -425,7 +480,7 @@ static int run_avb_verification(struct bootflow *bflow) {struct blk_desc *desc =dev_get_uclass_plat (bflow->blk);struct android_priv *priv = bflow->bootmeth_priv; -const char *const requested_partitions[] = {"boot" ,"vendor_boot" ,NULL }; +const char *const requested_partitions[] = {"boot" ,"init_boot" ,"vendor_boot" ,NULL };struct AvbOps *avb_ops;AvbSlotVerifyResult result;AvbSlotVerifyData *out_data =NULL ;
@@ -556,6 +611,7 @@ static int boot_android_normal(struct bootflow *bflow)struct android_priv *priv = bflow->bootmeth_priv;int ret;ulong loadaddr =env_get_hex ("loadaddr" ,0 ); +ulong iloadaddr =env_get_hex ("init_boot_comp_addr_r" ,0 );ulong vloadaddr =env_get_hex ("vendor_boot_comp_addr_r" ,0 ); ret =run_avb_verification (bflow);
@@ -573,6 +629,13 @@ static int boot_android_normal(struct bootflow *bflow)return log_msg_ret ("read boot" , ret);if (priv->header_version >=3 ) { +if (priv->header_version >=4 ) { + ret =read_slotted_partition (desc,"init_boot" , priv->slot, + priv->init_boot_img_size, iloadaddr); +if (ret <0 ) +return log_msg_ret ("read init_boot" , ret); +set_ainit_bootimg_addr (iloadaddr); + } ret =read_slotted_partition (desc,"vendor_boot" , priv->slot, priv->vendor_boot_img_size, vloadaddr);if (ret <0 )
boot/image-android.c +67 -0
97 lines not on this page · raw message
cmd/abootimg.c +6 -0
@@ -2,6 +2,7 @@/* * (C) Copyright 2020 * Sam Protsenko <[email protected]> +* Copyright (c) 2026 Valentin Liu <[email protected]> */ #include <android_image.h>
@@ -33,6 +34,11 @@ ulong get_ainit_bootimg_addr(void)return _ainit_bootimg_addr; } +void set_ainit_bootimg_addr (ulong addr) +{ + _ainit_bootimg_addr = addr; +} +ulong get_avendor_bootimg_addr (void ) {return _avendor_bootimg_addr;
doc/develop/bootstd/overview.rst +3 -0
@@ -293,6 +293,9 @@ script_offset_f script_size_f Size of the script to load, e.g. 0x2000 +init_boot_comp_addr_r + Address to which to load the init_boot Android image, e.g. 0xd0000000 + vendor_boot_comp_addr_r Address to which to load the vendor_boot Android image, e.g. 0xe0000000
include/android_image.h +1 -0
@@ -357,6 +357,7 @@ struct andr_image_data {ulong tags_addr;/* physical addr for kernel tags */ u32 header_version;/* version of the boot image header */ u32 boot_img_total_size;/* boot image size */ +u32 init_boot_img_total_size;/* init boot image size */ u32 vendor_boot_img_total_size;/* vendor boot image size */ };
include/image.h +59 -0
83 lines not on this page · raw message
Signature · 1 line
2.53.0