android: support boot header version 3 and 4

This adds support for Android boot header version 3 and 4.

Signed-off-by: Safae Ouajih souajih@baylibre.com

Bug: TIAU-132

Series:

• ti-linux-kernel!75 (closed)
• baylibre/ti/android/aosp/device/ti/am62x!29 (closed)
• !7 (closed)

include/configs/am62x_evm.h

@@ -109,6 +109,8 @@
 	"name=misc,start=13824K,size=512K,uuid=${uuid_gpt_misc};" \
 	"name=boot_a,size=40M,uuid=${uuid_gpt_boot_a};" \
 	"name=boot_b,size=40M,uuid=${uuid_gpt_boot_b};" \
+	"name=vendor_boot_a,size=32M,uuid=${uuid_gpt_vendor_boot_a};" \
+	"name=vendor_boot_b,size=32M,uuid=${uuid_gpt_vendor_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};" \
@@ -411,6 +413,8 @@
 	"bootcmd_recovery=" \
 		"if test \"${android_boot}\" -eq 1; then;" \
 			"setenv run_recovery 0;" \
+			"setenv ramdisk_addr_r  0xa1e84802;" \
+			"setenv vloadaddr 0xa0000001;" \
 			"if bcb load " __stringify(CONFIG_FASTBOOT_FLASH_MMC_DEV) " " \
 			CONTROL_PARTITION "; then " \
 				"if bcb test command = boot-recovery; then; " \
@@ -437,10 +441,15 @@
 				AVB_VERIFY_CHECK \
 				"part start mmc ${mmcdev} " RECOVERY_PARTITION "${slot_suffix} boot_start;" \
 				"part size mmc ${mmcdev} " RECOVERY_PARTITION "${slot_suffix} boot_size;" \
+	                        "part start mmc ${mmcdev} vendor_boot${slot_suffix} vendor_boot_start;" \
+				"part size  mmc ${mmcdev} vendor_boot${slot_suffix} vendor_boot_size;" \
 				"if mmc read ${loadaddr} ${boot_start} ${boot_size}; then " \
-					PREPARE_FDT \
-					"echo Running Android Recovery...;" \
-					BOOT_CMD \
+					"if mmc read $vloadaddr ${vendor_boot_start} ${vendor_boot_size}; then " \
+						"abootimg addr $loadaddr $vloadaddr;"\
+						PREPARE_FDT \
+						"echo Running Android Recovery...;" \
+						BOOT_CMD \
+					"fi;" \
 				"fi;" \
 				"echo Failed to boot Android...;" \
 				"reset;" \
@@ -459,13 +468,20 @@
 			AB_SELECT_SLOT \
 			AB_SELECT_ARGS \
 			AVB_VERIFY_CHECK \
+			"setenv vloadaddr 0xa0000001;" \
+			"setenv ramdisk_addr_r  0xa1e84802;" \
 			"part start mmc ${mmcdev} " BOOT_PARTITION "${slot_suffix} boot_start;" \
 			"part size mmc ${mmcdev} " BOOT_PARTITION "${slot_suffix} boot_size;" \
+			"part start mmc ${mmcdev} vendor_boot${slot_suffix} vendor_boot_start;" \
+			"part size  mmc ${mmcdev} vendor_boot${slot_suffix} vendor_boot_size;" \
 			"if mmc read ${loadaddr} ${boot_start} ${boot_size}; then " \
-				PREPARE_FDT \
-				"setenv bootargs \"${bootargs} " AB_BOOTARGS "\"  ; " \
-				"echo Running Android...;" \
-				BOOT_CMD \
+				"if mmc read $vloadaddr ${vendor_boot_start} ${vendor_boot_size}; then " \
+					"abootimg addr $loadaddr $vloadaddr;"\
+					PREPARE_FDT \
+					"setenv bootargs \"${bootargs} " AB_BOOTARGS "\"  ; " \
+					"echo Running Android...;" \
+					BOOT_CMD \
+				"fi;" \
 			"fi;" \
 			"echo Failed to boot Android...;" \
 		"fi\0"