чт, 23 мая 2024 г. в 09:41, Mattijs Korpershoek mkorpershoek@baylibre.com:
Hi Roman,
Thank you for the patch.
On mer., mai 22, 2024 at 21:26, Roman Stratiienko r.stratiienko@gmail.com wrote:
Quote from [1]:
"For devices launching with Android 13, the generic ramdisk is removed from the boot image and placed in a separate init_boot image. This change leaves the boot image with only the GKI kernel."
While at it, update wrong error handling message when vendor_boot cannot be loaded.
Signed-off-by: Roman Stratiienko r.stratiienko@gmail.com
Reviewed-by: Mattijs Korpershoek mkorpershoek@baylibre.com
Note: this patch still does not apply on master nor next:
$ ~/work/upstream/u-boot/ git show --pretty='%h ("%s")' HEAD --no-patch a7f0154c4128 ("Prepare v2024.07-rc3")
$ ~/work/upstream/u-boot/ b4 shazam -s -l 20240522212645.87250-1-r.stratiienko@gmail.com
[...]
Total patches: 1
Applying: abootimg: Add init_boot image support Patch failed at 0001 abootimg: Add init_boot image support error: sha1 information is lacking or useless (cmd/abootimg.c). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch hint: When you have resolved this problem, run "git am --continue". hint: If you prefer to skip this patch, run "git am --skip" instead. hint: To restore the original branch and stop patching, run "git am --abort". hint: Disable this message with "git config advice.mergeConflict false"
- master: a7f0154c4128 ("Prepare v2024.07-rc3")
- next: 377e91c162ab ("Merge patch series "Clean-up patch set for MbedTLS integration"")
Looking further down below, we can see that this patch has the "abootimg load" command, which is introduced in these series: https://lore.kernel.org/r/20240519191856.2582174-1-r.stratiienko@gmail.com
Please consider rebasing on either master or next before sending.
Ahh. I see. Sorry for the inconvenience. I will rebase and send v3.
boot/image-board.c | 13 ++++++++++--- cmd/abootimg.c | 26 +++++++++++++++++++++----- include/image.h | 7 +++++++ 3 files changed, 38 insertions(+), 8 deletions(-)
[...]
static struct cmd_tbl cmd_abootimg_sub[] = {
U_BOOT_CMD_MKENT(addr, 3, 1, do_abootimg_addr, "", ""),
U_BOOT_CMD_MKENT(addr, 4, 1, do_abootimg_addr, "", ""), U_BOOT_CMD_MKENT(dump, 2, 1, do_abootimg_dump, "", ""), U_BOOT_CMD_MKENT(get, 5, 1, do_abootimg_get, "", ""), U_BOOT_CMD_MKENT(load, 5, 1, do_abootimg_load, "", ""),@@ -376,7 +392,7 @@ static int do_abootimg(struct cmd_tbl *cmdtp, int flag, int argc, U_BOOT_CMD( abootimg, CONFIG_SYS_MAXARGS, 0, do_abootimg, "manipulate Android Boot Image",
"addr <boot_img_addr> [<vendor_boot_img_addr>]>\n"
"addr <boot_img_addr> [<vendor_boot_img_addr> [<init_boot_img_addr>]]\n" " - set the address in RAM where boot image is located\n" " ($loadaddr is used by default)\n" "abootimg dump dtb\n"[...]