env: ti: boot: Boot Android with dynamic partitions
Changes:
- use boot.img instead of boot_fit.img
- use .dtb from boot.img v2
- implement recovery boot
- always boot ramdisk from boot.img, we can't mount system as root
now, as system is a logical partition inside of super partition
- don't add "skip_initramfs" to cmdline anymore
- to boot into recovery, use boot image from recovery partition
- prepare partition table:
- A/B scheme
- use 'super' partition instead of 'system' and 'vendor'
- add dtbo partitions
- introduce metadata partition
Not implemented: reading and applying dtbo blobs from dtbo partition.
Signed-off-by: Sam Protsenko <joe.skb7@gmail.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
This commit is contained in:
Sam Protsenko
Lokesh Vutla
parent
0f5103dee3
commit
d94e6dbcf6
@ -13,30 +13,14 @@
|
||||
#define CONSOLEDEV "ttyS2"
|
||||
#endif
|
||||
|
||||
#define VBMETA_PART_SIZE (64 * 1024)
|
||||
|
||||
#if defined(CONFIG_LIBAVB)
|
||||
#define VBMETA_PART \
|
||||
"name=vbmeta,size=" __stringify(VBMETA_PART_SIZE) \
|
||||
",uuid=${uuid_gpt_vbmeta};"
|
||||
#else
|
||||
#define VBMETA_PART ""
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_CMD_AB_SELECT)
|
||||
#define COMMON_PARTS \
|
||||
"name=boot_a,size=20M,uuid=${uuid_gpt_boot_a};" \
|
||||
"name=boot_b,size=20M,uuid=${uuid_gpt_boot_b};" \
|
||||
"name=system_a,size=1024M,uuid=${uuid_gpt_system_a};" \
|
||||
"name=system_b,size=1024M,uuid=${uuid_gpt_system_b};"
|
||||
#else
|
||||
#define COMMON_PARTS \
|
||||
"name=boot,size=20M,uuid=${uuid_gpt_boot};" \
|
||||
"name=system,size=1024M,uuid=${uuid_gpt_system};"
|
||||
#endif
|
||||
|
||||
#ifndef PARTS_DEFAULT
|
||||
/* Define the default GPT table for eMMC */
|
||||
/*
|
||||
* Default GPT tables for eMMC (Linux and Android). Notes:
|
||||
* 1. Keep partitions aligned to erase group size (512 KiB) when possible
|
||||
* 2. Keep partitions in sync with DFU_ALT_INFO_EMMC (see dfu.h)
|
||||
* 3. Keep 'bootloader' partition (U-Boot proper) start address in sync with
|
||||
* CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR (see common/spl/Kconfig)
|
||||
*/
|
||||
#define PARTS_DEFAULT \
|
||||
/* Linux partitions */ \
|
||||
"uuid_disk=${uuid_gpt_disk};" \
|
||||
@ -49,10 +33,15 @@
|
||||
"name=bootloader,size=2048K,uuid=${uuid_gpt_bootloader};" \
|
||||
"name=uboot-env,start=2432K,size=256K,uuid=${uuid_gpt_reserved};" \
|
||||
"name=misc,size=128K,uuid=${uuid_gpt_misc};" \
|
||||
"name=recovery,size=40M,uuid=${uuid_gpt_recovery};" \
|
||||
COMMON_PARTS \
|
||||
"name=vendor,size=256M,uuid=${uuid_gpt_vendor};" \
|
||||
VBMETA_PART \
|
||||
"name=boot_a,size=20M,uuid=${uuid_gpt_boot_a};" \
|
||||
"name=boot_b,size=20M,uuid=${uuid_gpt_boot_b};" \
|
||||
"name=dtbo_a,size=8M,uuid=${uuid_gpt_dtbo_a};" \
|
||||
"name=dtbo_b,size=8M,uuid=${uuid_gpt_dtbo_b};" \
|
||||
"name=vbmeta_a,size=64K,uuid=${uuid_gpt_vbmeta_a};" \
|
||||
"name=vbmeta_b,size=64K,uuid=${uuid_gpt_vbmeta_b};" \
|
||||
"name=recovery,size=64M,uuid=${uuid_gpt_recovery};" \
|
||||
"name=super,size=2560M,uuid=${uuid_gpt_super};" \
|
||||
"name=metadata,size=16M,uuid=${uuid_gpt_metadata};" \
|
||||
"name=userdata,size=-,uuid=${uuid_gpt_userdata}"
|
||||
#endif /* PARTS_DEFAULT */
|
||||
|
||||
@ -72,7 +61,7 @@
|
||||
#define CONTROL_PARTITION "misc"
|
||||
|
||||
#if defined(CONFIG_CMD_AB_SELECT)
|
||||
#define AB_SELECT \
|
||||
#define AB_SELECT_SLOT \
|
||||
"if part number mmc 1 " CONTROL_PARTITION " control_part_number; " \
|
||||
"then " \
|
||||
"echo " CONTROL_PARTITION \
|
||||
@ -82,20 +71,14 @@
|
||||
"echo " CONTROL_PARTITION " partition not found;" \
|
||||
"exit;" \
|
||||
"fi;" \
|
||||
"setenv slot_suffix _${slot_name};" \
|
||||
"if part number mmc ${mmcdev} system${slot_suffix} " \
|
||||
"system_part_number; then " \
|
||||
"setenv bootargs_ab " \
|
||||
"ro root=/dev/mmcblk${mmcdev}p${system_part_number} " \
|
||||
"rootwait init=/init skip_initramfs " \
|
||||
"androidboot.slot_suffix=${slot_suffix};" \
|
||||
"echo A/B cmdline addition: ${bootargs_ab};" \
|
||||
"setenv bootargs ${bootargs} ${bootargs_ab};" \
|
||||
"else " \
|
||||
"echo system${slot_suffix} partition not found;" \
|
||||
"fi;"
|
||||
"setenv slot_suffix _${slot_name};"
|
||||
#define AB_SELECT_ARGS \
|
||||
"setenv bootargs_ab androidboot.slot_suffix=${slot_suffix}; " \
|
||||
"echo A/B cmdline addition: ${bootargs_ab};" \
|
||||
"setenv bootargs ${bootargs} ${bootargs_ab};"
|
||||
#else
|
||||
#define AB_SELECT ""
|
||||
#define AB_SELECT_SLOT ""
|
||||
#define AB_SELECT_ARGS ""
|
||||
#endif
|
||||
|
||||
#define FASTBOOT_CMD \
|
||||
@ -121,46 +104,46 @@
|
||||
"setenv mmcroot /dev/mmcblk0p2 rw; " \
|
||||
"run mmcboot;\0" \
|
||||
"emmc_android_boot=" \
|
||||
"setenv mmcdev 1; " \
|
||||
"mmc dev $mmcdev; " \
|
||||
"mmc rescan; " \
|
||||
AB_SELECT_SLOT \
|
||||
"if bcb load " __stringify(CONFIG_FASTBOOT_FLASH_MMC_DEV) " " \
|
||||
CONTROL_PARTITION "; then " \
|
||||
"setenv ardaddr -; " \
|
||||
"if bcb test command = bootonce-bootloader; then " \
|
||||
"echo BCB: Bootloader boot...; " \
|
||||
"echo Android: Bootloader boot...; " \
|
||||
"bcb clear command; bcb store; " \
|
||||
FASTBOOT_CMD \
|
||||
"exit; " \
|
||||
"elif bcb test command = boot-recovery; then " \
|
||||
"echo BCB: Recovery boot...; " \
|
||||
"echo Warning: recovery is not implemented; " \
|
||||
"echo Performing normal boot for now...; " \
|
||||
"bcb clear command; bcb store; " \
|
||||
"run emmc_android_normal_boot; " \
|
||||
"echo Android: Recovery boot...; " \
|
||||
"setenv ardaddr $loadaddr;" \
|
||||
"setenv apart recovery; " \
|
||||
"else " \
|
||||
"echo BCB: Normal boot requested...; " \
|
||||
"run emmc_android_normal_boot; " \
|
||||
"echo Android: Normal boot...; " \
|
||||
"setenv ardaddr $loadaddr; " \
|
||||
"setenv apart boot${slot_suffix}; " \
|
||||
"fi; " \
|
||||
"else " \
|
||||
"echo Warning: BCB is corrupted or does not exist; " \
|
||||
"echo Performing normal boot...; " \
|
||||
"run emmc_android_normal_boot; " \
|
||||
"fi;\0" \
|
||||
"emmc_android_normal_boot=" \
|
||||
"echo Trying to boot Android from eMMC ...; " \
|
||||
"run update_to_fit; " \
|
||||
"echo Android: Normal boot...; " \
|
||||
"fi; " \
|
||||
"setenv eval_bootargs setenv bootargs $bootargs; " \
|
||||
"run eval_bootargs; " \
|
||||
"setenv mmcdev 1; " \
|
||||
"setenv machid fe6; " \
|
||||
"mmc dev $mmcdev; " \
|
||||
"mmc rescan; " \
|
||||
AVB_VERIFY_CHECK \
|
||||
AB_SELECT \
|
||||
"if part start mmc ${mmcdev} boot${slot_suffix} boot_start; " \
|
||||
"then " \
|
||||
"part size mmc ${mmcdev} boot${slot_suffix} " \
|
||||
"boot_size; " \
|
||||
"mmc read ${loadaddr} ${boot_start} ${boot_size}; " \
|
||||
"bootm ${loadaddr}#${fdtfile}; " \
|
||||
AB_SELECT_ARGS \
|
||||
"if part start mmc $mmcdev $apart boot_start; then " \
|
||||
"part size mmc $mmcdev $apart boot_size; " \
|
||||
"mmc read $loadaddr $boot_start $boot_size; " \
|
||||
"abootimg get dtb --index=0 dtb_start dtb_size; " \
|
||||
"cp.b $dtb_start $fdtaddr $dtb_size; " \
|
||||
"fdt addr $fdtaddr; " \
|
||||
"bootm $loadaddr $ardaddr $fdtaddr; " \
|
||||
"else " \
|
||||
"echo boot${slot_suffix} partition not found; " \
|
||||
"echo $apart partition not found; " \
|
||||
"exit; " \
|
||||
"fi;\0"
|
||||
|
||||
#ifdef CONFIG_OMAP54XX
|
||||
|
||||
Loading…
Reference in New Issue
Block a user