Skip to content

bootstd: Add Android support

Mattijs Korpershoek u-boot 3 versions – In review

Get series with b4
b4 am [email protected] change-id 20240605-bootmeth-android-bfc8596e9367

Versions newest first

  1. v3 Latest5 patches 5 repliesIn review
  2. v25 patches 21 repliesSuperseded
  3. v16 patches 11 repliesSuperseded

Changes in v3 from the cover letter

- Fixed CI issues (Tom):
* Generate bootv4.img and vendor_boot.img in test_ut.py
* Mark CONFIG_BOOTMETH_ANDROID dependent on CONFIG_CMDLINE
* Make bootflow_android() test dependent on CONFIG_BOOTMETH_ANDROID
Because of the above changes, I've removed the reviewers on patch 5/5
- Link to v2: https://lore.kernel.org/r/[email protected]

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5boot: android: Provide vendor_bootimg_addr in boot_get_fdt()boot/image-android.c boot/image-fdt.c+6 -10 replies
2/5bootstd: Add bootflow_iter_check_mmc() helperboot/bootflow.c include/bootflow.h+21 -01 reply
3/5android: boot: Add set_abootimg_addr() and set_avendor_bootimg_addr()cmd/abootimg.c include/image.h+24 -00 replies
4/5bootstd: Add a bootmeth for AndroidMAINTAINERS boot/Kconfig boot/Makefile +3 more+614 -00 replies
5/5bootstd: Add test for bootmeth_androidarch/sandbox/dts/test.dts configs/sandbox_defconfig test/boot/bootflow.c +1 more+153 -43 replies

Reviews trailers per patch

All 5 patches have a Reviewed-by or Acked-by.

PatchSimon GlassJulien MassonIgor OpaniukGuillaume La Roque
1/5R-b R-b R-b R-b T-b
2/5R-b R-b R-b R-b T-b
3/5R-b R-b R-b R-b T-b
4/5R-b R-b T-b
5/5R-b R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v3 thread

Cover letter [PATCH v3 0/5] bootstd: Add Android support

Android boot flow is a bit different than a regular Linux distro. Android relies on multiple partitions in order to boot.

A typical boot flow would be:
1. Parse the Bootloader Control Block (BCB, misc partition)
2. If BCB requested bootonce-bootloader, start fastboot and wait.
3. If BCB requested recovery or normal android, run the following:
a. Get slot (A/B) from BCB
b. Run AVB (Android Verified Boot) on boot partitions c. Load boot and vendor_boot partitions
d. Load device-tree, ramdisk and boot

The AOSP documentation has more details at [1], [2], [3]

This has been implemented via complex boot scripts such as [4]. However, these boot script are neither very maintainable nor generic. Moreover, DISTRO_DEFAULTS is being deprecated [5].

Add a generic Android bootflow implementation for bootstd.

For this initial version, only boot image v4 is supported.

This has been tested on sandbox using:

$ ./test/py/test.py --bd sandbox --build -k test_ut

This has also been tested on the AM62X SK EVM using TI's Android SDK[6] To test on TI board, the following (WIP) patch is needed as well:
https://gitlab.baylibre.com/baylibre/ti/ti-u-boot/-/commit/84cceb912bccd7cdd7f9dd69bca0e5d987a1fd04

[1] https://source.android.com/docs/core/architecture/bootloader
[2] https://source.android.com/docs/core/architecture/partitions
[3] https://source.android.com/docs/core/architecture/partitions/generic-boot
[4] https://source.denx.de/u-boot/u-boot/-/blob/master/include/configs/meson64_android.h
[5] https://lore.kernel.org/r/all/[email protected]/
[6] https://software-dl.ti.com/processor-sdk-android/esd/AM62X/09_02_00/docs/android/Overview.html

---
Changes in v3:
- Fixed CI issues (Tom):
* Generate bootv4.img and vendor_boot.img in test_ut.py
* Mark CONFIG_BOOTMETH_ANDROID dependent on CONFIG_CMDLINE
* Make bootflow_android() test dependent on CONFIG_BOOTMETH_ANDROID
Because of the above changes, I've removed the reviewers on patch 5/5
- Link to v2: https://lore.kernel.org/r/[email protected]

Changes in v2:
- Dropped patch 2/6 boot: android: Add image_android_get_version() (Igor)
- Fixed multi-line comment style (Igor, Simon)
- Added dependency on CMD_FASTBOOT for BOOTMETH_ANDROID (Igor)
- Fixed various resource leaks (Igor)
- Fixed bootmeth_priv dangling pointer on error cases (Igor)
- Updated test instructions in commit message for patch 6/6
- Added __weak impl of get_avendor_bootimg_addr() in patch 1 (dropped
Igor's review because of this change)
- Added extra info in Kconfig to detail MMC limitation (Simon)
- Fixed typo Bootmethod->Bootmeth (Simon)
- Documented android_priv structure (Simon)
- Demoted various messages from printf() to log_debug (Simon)
- Fixed some lines too long (Simon)
- Added function documentation to read_slotted_partition() (Simon)
- Added some doc about avb extra_args being modified (Simon)
- Link to v1: https://lore.kernel.org/r/[email protected]

---
Mattijs Korpershoek (5):
boot: android: Provide vendor_bootimg_addr in boot_get_fdt()
bootstd: Add bootflow_iter_check_mmc() helper
android: boot: Add set_abootimg_addr() and set_avendor_bootimg_addr()
bootstd: Add a bootmeth for Android
bootstd: Add test for bootmeth_android

 MAINTAINERS               |   7 +
 arch/sandbox/dts/test.dts |   8 +
 boot/Kconfig              |  17 ++
 boot/Makefile             |   2 +
 boot/bootflow.c           |  12 +
 boot/bootmeth_android.c   | 553 ++++++++++++++++++++++++++++++++++++++++++++++
 boot/bootmeth_android.h   |  29 +++
 boot/image-android.c      |   5 +
 boot/image-fdt.c          |   2 +-
 cmd/abootimg.c            |  10 +
 configs/sandbox_defconfig |   2 +-
 doc/develop/bootstd.rst   |   6 +
 include/bootflow.h        |   9 +
 include/image.h           |  14 ++
 test/boot/bootflow.c      |  68 +++++-
 test/py/tests/test_ut.py  |  79 +++++++
 16 files changed, 818 insertions(+), 5 deletions(-)

---
base-commit: 475aa8345a78396d39b42f96eccecd37ebe24e99
change-id: 20240605-bootmeth-android-bfc8596e9367

Best regards,

Signature · 1 line
Mattijs Korpershoek <[email protected]>