Merge patch series "Add Android 14 bootflow support for AM62X and AM62P board"

Guillaume La Roque <glaroque@baylibre.com> says:

Ths patchset add support of Android 14 with boot image version 4
for :
- AM62X-SK EVM: https://www.ti.com/tool/SK-AM62B
- BeaglePlay: https://beagleplay.org/
- AM62PX-SK EVM: https://www.ti.com/tool/SK-AM62P-LP

Android Images use to test this series are on the Official TI website:
- AM62x/BeaglePlay: https://www.ti.com/tool/PROCESSOR-SDK-AM62X
- AM62PX: https://www.ti.com/tool/PROCESSOR-SDK-AM62P
This commit is contained in:
Tom Rini
2024-10-02 13:34:35 -06:00
6 changed files with 106 additions and 0 deletions

View File

@@ -17,3 +17,33 @@ bootdir=/boot
boot_targets=mmc1 mmc0
bootmeths=script extlinux efi pxe
rd_spec=-
#if CONFIG_BOOTMETH_ANDROID
#include <env/ti/android.env>
/* Override Android partitions
* Required because tiboot3 is in mmc0boot0, not in UDA
* note that += is needed because \n is converted by space in .env files */
partitions=
name=bootloader,start=5M,size=8M,uuid=${uuid_gpt_bootloader};
partitions+=name=misc,start=13824K,size=512K,uuid=${uuid_gpt_misc};
partitions+=name=frp,size=512K,uuid=${uuid_gpt_frp};
partitions+=name=boot_a,size=40M,uuid=${uuid_gpt_boot_a};
partitions+=name=boot_b,size=40M,uuid=${uuid_gpt_boot_b};
partitions+=name=vendor_boot_a,size=32M,uuid=${uuid_gpt_vendor_boot_a};
partitions+=name=vendor_boot_b,size=32M,uuid=${uuid_gpt_vendor_boot_b};
partitions+=name=init_boot_a,size=8M,uuid=${uuid_gpt_init_boot_a};
partitions+=name=init_boot_b,size=8M,uuid=${uuid_gpt_init_boot_b};
partitions+=name=dtbo_a,size=8M,uuid=${uuid_gpt_dtbo_a};
partitions+=name=dtbo_b,size=8M,uuid=${uuid_gpt_dtbo_b};
partitions+=name=vbmeta_a,size=64K,uuid=${uuid_gpt_vbmeta_a};
partitions+=name=vbmeta_b,size=64K,uuid=${uuid_gpt_vbmeta_b};
partitions+=name=vbmeta_vendor_dlkm_a,size=64K,uuid=${uuid_gpt_vbmeta_vendor_dlkm_a};
partitions+=name=vbmeta_vendor_dlkm_b,size=64K,uuid=${uuid_gpt_vbmeta_vendor_dlkm_b};
partitions+=name=super,size=4608M,uuid=${uuid_gpt_super};
partitions+=name=metadata,size=64M,uuid=${uuid_gpt_metadata};
partitions+=name=persist,size=32M,uuid=${uuid_gpt_persist};
partitions+=name=userdata,size=-,uuid=${uuid_gpt_userdata}
fastboot_raw_partition_tiboot3="0x0 0x800 mmcpart 1"
adtb_idx=2
#endif

View File

@@ -13,3 +13,8 @@ mmcdev=1
bootpart=1:2
bootdir=/boot
rd_spec=-
#if CONFIG_BOOTMETH_ANDROID
#include <env/ti/android.env>
adtb_idx=3
#endif

View File

@@ -19,3 +19,8 @@ splashfile=ti_logo_414x97_32bpp.bmp.gz
splashimage=0x80200000
splashpos=m,m
splashsource=sf
#if CONFIG_BOOTMETH_ANDROID
#include <env/ti/android.env>
adtb_idx=0
#endif

View File

@@ -0,0 +1,21 @@
# Defconfig fragment for enabling Android boot flow
# to apply on top of am62x_evm_a53_defconfig or am62x_lpsk_a53_defconfig
# Enable fastboot
CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
CONFIG_FASTBOOT_BUF_SIZE=0x2F000000
CONFIG_FASTBOOT_FLASH=y
CONFIG_FASTBOOT_FLASH_MMC_DEV=0
CONFIG_CMD_GPT=y # Needed for FASTBOOT_CMD_OEM_FORMAT
CONFIG_RANDOM_UUID=y # Needed for FASTBOOT_CMD_OEM_FORMAT
CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
# Enable Android boot flow
CONFIG_BOOTMETH_ANDROID=y
CONFIG_SYS_BOOTM_LEN=0x4000000
CONFIG_SYS_MALLOC_LEN=0x08000000
CONFIG_AVB_VERIFY=y
CONFIG_LIBAVB=y
CONFIG_CMD_ADTIMG=y
CONFIG_CMD_ABOOTIMG=y
CONFIG_CMD_AB_SELECT=y
CONFIG_CMD_AVB=y

View File

@@ -132,6 +132,20 @@ DFU support (and disable storage support)
.. include:: ../ti/k3.rst
:start-after: .. k3_rst_include_start_build_steps_uboot
:end-before: .. k3_rst_include_end_build_steps_uboot
* 3.2.1 Alternative build of A53 for Android bootflow:
Since the Android requires many more dependencies, it is disabled by default.
An extra config fragment should be used to enable Android bootflow support.
.. prompt:: bash $
export UBOOT_CFG_CORTEXR="${UBOOT_CFG_CORTEXA} am62x_a53_android.config"
.. include:: ../ti/k3.rst
:start-after: .. k3_rst_include_start_build_steps_uboot
:end-before: .. k3_rst_include_end_build_steps_uboot
.. am62x_evm_rst_include_end_build_steps
Target Images

31
include/env/ti/android.env vendored Normal file
View File

@@ -0,0 +1,31 @@
/* Android partitions
* += is needed because \n is converted by space in .env files */
partitions=name=bootloader,start=5M,size=8M,uuid=${uuid_gpt_bootloader};
partitions+=name=tiboot3,start=4M,size=1M,uuid=${uuid_gpt_tiboot3};
partitions+=name=misc,start=13824K,size=512K,uuid=${uuid_gpt_misc};
partitions+=name=frp,size=512K,uuid=${uuid_gpt_frp};
partitions+=name=boot_a,size=40M,uuid=${uuid_gpt_boot_a};
partitions+=name=boot_b,size=40M,uuid=${uuid_gpt_boot_b};
partitions+=name=vendor_boot_a,size=32M,uuid=${uuid_gpt_vendor_boot_a};
partitions+=name=vendor_boot_b,size=32M,uuid=${uuid_gpt_vendor_boot_b};
partitions+=name=init_boot_a,size=8M,uuid=${uuid_gpt_init_boot_a};
partitions+=name=init_boot_b,size=8M,uuid=${uuid_gpt_init_boot_b};
partitions+=name=dtbo_a,size=8M,uuid=${uuid_gpt_dtbo_a};
partitions+=name=dtbo_b,size=8M,uuid=${uuid_gpt_dtbo_b};
partitions+=name=vbmeta_a,size=64K,uuid=${uuid_gpt_vbmeta_a};
partitions+=name=vbmeta_b,size=64K,uuid=${uuid_gpt_vbmeta_b};
partitions+=name=vbmeta_vendor_dlkm_a,size=64K,uuid=${uuid_gpt_vbmeta_vendor_dlkm_a};
partitions+=name=vbmeta_vendor_dlkm_b,size=64K,uuid=${uuid_gpt_vbmeta_vendor_dlkm_b};
partitions+=name=super,size=4608M,uuid=${uuid_gpt_super};
partitions+=name=metadata,size=64M,uuid=${uuid_gpt_metadata};
partitions+=name=persist,size=32M,uuid=${uuid_gpt_persist};
partitions+=name=userdata,size=-,uuid=${uuid_gpt_userdata}
fastboot_raw_partition_bootenv=0x800 0x400 mmcpart 1
fastboot.partition-type:metadata=f2fs
boot_targets=mmc0
mmcdev=0
bootmeths=android
vendor_boot_comp_addr_r=0xd0000000
bootcmd=bootflow scan -lb