From 35cdb96b21eb4573271154d17beb97e6e04564b3 Mon Sep 17 00:00:00 2001 From: "Shi, Qiming" Date: Mon, 18 Mar 2024 18:49:35 +0800 Subject: [PATCH 1/3] Change boot image size to 45 Tracked-On: https://jira.devtools.intel.com/browse/OAM-127965 Signed-off-by: Shi, Qiming --- groups/boot-arch/project-celadon/BoardConfig.mk | 2 +- groups/boot-arch/project-celadon/gpt.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/groups/boot-arch/project-celadon/BoardConfig.mk b/groups/boot-arch/project-celadon/BoardConfig.mk index 17f41c572..7d709d04b 100644 --- a/groups/boot-arch/project-celadon/BoardConfig.mk +++ b/groups/boot-arch/project-celadon/BoardConfig.mk @@ -26,7 +26,7 @@ TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888" # # NOTE: These values must be kept in sync with BOARD_GPT_INI -BOARD_BOOTIMAGE_PARTITION_SIZE ?= 42991616 +BOARD_BOOTIMAGE_PARTITION_SIZE ?= 47185920 SYSTEM_PARTITION_SIZE = $(shell echo {{system_partition_size}}*1024*1024 | bc) {{^dynamic-partitions}} BOARD_SYSTEMIMAGE_PARTITION_SIZE ?= $(SYSTEM_PARTITION_SIZE) diff --git a/groups/boot-arch/project-celadon/gpt.ini b/groups/boot-arch/project-celadon/gpt.ini index 56c6904d0..16041a5f0 100644 --- a/groups/boot-arch/project-celadon/gpt.ini +++ b/groups/boot-arch/project-celadon/gpt.ini @@ -54,7 +54,7 @@ type = fat [partition.boot] label = boot -len = 41 +len = 45 type = boot {{#slot-ab}} has_slot = true From e526fbac0ec4b9db1db1700f79d6bca3f1bd3ef9 Mon Sep 17 00:00:00 2001 From: "Shi, Qiming" Date: Thu, 28 Mar 2024 23:39:56 +0800 Subject: [PATCH 2/3] Don't start thermal-daemon in AAOS14 Tracked-On: https://jira.devtools.intel.com/browse/OAM-127965 Signed-off-by: Shi, Qiming --- groups/thermal/thermal-daemon/init.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/groups/thermal/thermal-daemon/init.rc b/groups/thermal/thermal-daemon/init.rc index aa6d305a8..d22b9b7d0 100644 --- a/groups/thermal/thermal-daemon/init.rc +++ b/groups/thermal/thermal-daemon/init.rc @@ -20,5 +20,5 @@ on post-fs-data setprop persist.vendor.thermal.mode thermal-daemon mkdir /data/vendor/thermal-daemon 0660 system system -on property:sys.boot_completed=1 && property:vendor.thermal.enable=1 - start thermal-daemon +# on property:sys.boot_completed=1 && property:vendor.thermal.enable=1 +# start thermal-daemon From b30d98b97566c3c7e8c5f8085c616e15669ffe42 Mon Sep 17 00:00:00 2001 From: "Shi, Qiming" Date: Wed, 24 Apr 2024 22:35:31 +0800 Subject: [PATCH 3/3] Add ext4 format for system for GSI Tracked-On: https://jira.devtools.intel.com/browse/OAM-128016 Signed-off-by: Shi, Qiming --- groups/boot-arch/project-celadon/fstab | 1 + 1 file changed, 1 insertion(+) diff --git a/groups/boot-arch/project-celadon/fstab b/groups/boot-arch/project-celadon/fstab index 40cba4f19..75d6d0942 100644 --- a/groups/boot-arch/project-celadon/fstab +++ b/groups/boot-arch/project-celadon/fstab @@ -5,6 +5,7 @@ # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK {{#dynamic-partitions}} system /system {{system_fs}} ro{{#system_fs_ext4}},barrier=1{{/system_fs_ext4}} wait{{#slot-ab}},slotselect{{/slot-ab}},avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey,avb=vbmeta,logical,first_stage_mount +system /system ext4 ro,barrier=1 wait{{#slot-ab}},slotselect{{/slot-ab}},avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey,avb=vbmeta,logical,first_stage_mount {{/dynamic-partitions}} {{^dynamic-partitions}} /dev/block/by-name/system /{{^slot-ab}}system{{/slot-ab}} {{system_fs}} ro wait{{#slot-ab}},slotselect{{/slot-ab}},avb