mixin updates

Add a/b slot support for bootloader partition Tracked-On: OAM-112771 Mixin-Reviewed-On: projectceladon/device-androidia-mixins#1771 Signed-off-by: jizhenlo <[email protected]>
projectceladon · Oct 24, 2023 · 6e2e126 · 6e2e126
1 parent 75ced8d
commit 6e2e126
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/celadon_ivi/BoardConfig.mk b/celadon_ivi/BoardConfig.mk
@@ -157,6 +157,7 @@ BOARD_AVB_ODM_ADD_HASHTREE_FOOTER_ARGS += --hash_algorithm sha256
 
 AB_OTA_PARTITIONS += vbmeta
 
+AB_OTA_PARTITIONS += bootloader
 
 KERNELFLINGER_SUPPORT_USB_STORAGE ?= true
 

diff --git a/celadon_ivi/fstab b/celadon_ivi/fstab
@@ -13,7 +13,6 @@ system   /system  ext4 ro,barrier=1 wait,slotselect,avb_keys=/avb/q-gsi.avbpubke
 /dev/block/by-name/boot         /boot           emmc    defaults                                                    defaults,slotselect,avb
 /dev/block/by-name/misc         /misc           emmc    defaults                                                    defaults
 /dev/block/by-name/bootloader   /bootloader     emmc    defaults                                                    recoveryonly
-/dev/block/by-name/bootloader2  /bootloader2    emmc    defaults                                                    recoveryonly
 /dev/block/by-name/persistent   /persistent     emmc    defaults                                                    defaults
 /dev/block/by-name/metadata     /metadata       ext4    noatime,nosuid,nodev,errors=panic,discard                           wait,check,formattable,first_stage_mount
 

diff --git a/celadon_ivi/fstab.recovery b/celadon_ivi/fstab.recovery
@@ -13,7 +13,6 @@ system   /system  ext4 ro,barrier=1 wait,slotselect,avb_keys=/avb/q-gsi.avbpubke
 /dev/block/by-name/boot         /boot           emmc    defaults                                                    defaults
 /dev/block/by-name/misc         /misc           emmc    defaults                                                    defaults
 /dev/block/by-name/bootloader   /bootloader     emmc    defaults                                                    recoveryonly
-/dev/block/by-name/bootloader2  /bootloader2    emmc    defaults                                                    recoveryonly
 /dev/block/by-name/persistent   /persistent     emmc    defaults                                                    defaults
 /dev/block/by-name/metadata     /metadata       ext4    noatime,nosuid,nodev,errors=panic                           wait,check
 

diff --git a/celadon_ivi/gpt.ini b/celadon_ivi/gpt.ini
@@ -11,22 +11,16 @@ type = linux
 # Source: device/intel/mixins/groups/boot-arch/project-celadon/gpt.ini
 ##############################################################
 [base]
-partitions = bootloader bootloader2 boot misc metadata acpio super data persistent teedata vbmeta
+partitions = bootloader  boot misc metadata acpio super data persistent teedata vbmeta
 device = auto
 nb_slot = 2
 
+
 [partition.bootloader]
 label = bootloader
 len = 33
-type = esp
-efi_loader = \loader.efi
-efi_title = Android-IA
-flags = boot
-
-[partition.bootloader2]
-label = bootloader2
-len = 33
-type = fat
+type = bootloader
+has_slot = true
 
 [partition.boot]
 label = boot