mixin updates

add a new variable of TEE to store tee mixin configuration this variable 'TEE' will be used to decide packing of optee prebuilt binary into bootloader. In future it can be used for other decision making too. Enable serial console in recovery mode This can help with debugging issues in userdebug build, in user build the serial is disabled. Specify bootloader a slot during flashing slot a should be used during the flashing. Tracked-On: OAM-112711 Tracked-On: OAM-112796 Tracked-On: OAM-112901 Mixin-Reviewed-On: projectceladon/device-androidia-mixins#1791 Mixin-Reviewed-On: projectceladon/device-androidia-mixins#1798 Mixin-Reviewed-On: projectceladon/device-androidia-mixins#1799 Signed-off-by: Yan, Shaopu <[email protected]> Signed-off-by: jizhenlo <[email protected]>
projectceladon · Oct 27, 2023 · 0be1cc2 · 0be1cc2
1 parent b63844b
commit 0be1cc2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/celadon_ivi/device.mk b/celadon_ivi/device.mk
@@ -118,6 +118,8 @@ KERNELFLINGER_DISABLE_EFI_MEMMAP := true
 PRODUCT_COPY_FILES += $(LOCAL_PATH)/extra_files/boot-arch/set_soc_prop.sh:vendor/bin/set_soc_prop.sh
 
 ACRN_HV := false
+
+TEE := False
 ##############################################################
 # Source: device/intel/mixins/groups/wlan/iwlwifi/product.mk
 ##############################################################

diff --git a/celadon_ivi/flashfiles.ini b/celadon_ivi/flashfiles.ini
@@ -286,12 +286,11 @@ tool = fastboot
 args = reboot bootloader
 description = Reboot to bootloader fastboot
 
-[command.bootloader.bootloader]
+[command.bootloader.bootloader_a]
 tool = fastboot
-args = flash bootloader $file
+args = flash bootloader_a $file
 file = bootloader:bootloader.img
-description = Flash bootloader partition
-
+description = Flash bootloader_a partition
 
 [command.capsule.rm-capsule]
 tool = fastboot

diff --git a/celadon_ivi/init.recovery.rc b/celadon_ivi/init.recovery.rc
@@ -12,6 +12,11 @@ service watchdogd /system/bin/watchdogd 10 30
     oneshot
     seclabel u:r:watchdogd:s0
 
+service console /system/bin/sh
+    console
+    seclabel u:r:su:s0
+    setenv HOSTNAME console
+
 on boot
     start watchdogd
     write /proc/sys/kernel/hung_task_timeout_secs 120