diff options
| author | Tom Rini <[email protected]> | 2024-10-07 09:06:49 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-10-07 09:06:49 -0600 |
| commit | c530f6079c70219e01022142b404bf8a6b572366 (patch) | |
| tree | 7696586afaf4c0ae8a94ef811abd7d4a2276eb64 /boot/bootmeth_android.c | |
| parent | f919c3a889f0ec7d63a48b5d0ed064386b0980bd (diff) | |
| parent | 28dc47038edc4e93f32d75a357131bcf01a18d85 (diff) | |
Merge branch 'next'
Diffstat (limited to 'boot/bootmeth_android.c')
| -rw-r--r-- | boot/bootmeth_android.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/boot/bootmeth_android.c b/boot/bootmeth_android.c index 6e8d3e615db..19b1f2c377b 100644 --- a/boot/bootmeth_android.c +++ b/boot/bootmeth_android.c @@ -22,6 +22,7 @@ #include <malloc.h> #include <mapmem.h> #include <part.h> +#include <version.h> #include "bootmeth_android.h" #define BCB_FIELD_COMMAND_SZ 32 @@ -171,6 +172,12 @@ static int configure_serialno(struct bootflow *bflow) return bootflow_cmdline_set_arg(bflow, "androidboot.serialno", serialno, false); } +static int configure_bootloader_version(struct bootflow *bflow) +{ + return bootflow_cmdline_set_arg(bflow, "androidboot.bootloader", + PLAIN_VERSION, false); +} + static int android_read_bootflow(struct udevice *dev, struct bootflow *bflow) { struct blk_desc *desc = dev_get_uclass_plat(bflow->blk); @@ -264,8 +271,12 @@ static int android_read_bootflow(struct udevice *dev, struct bootflow *bflow) goto free_priv; } - /* Ignoring return code: setting serial number is not mandatory for booting */ + /* + * Ignoring return code for the following configurations: + * these are not mandatory for booting. + */ configure_serialno(bflow); + configure_bootloader_version(bflow); if (priv->boot_mode == ANDROID_BOOT_MODE_NORMAL) { ret = bootflow_cmdline_set_arg(bflow, "androidboot.force_normal_boot", |