From dcbe0aa808bb15278f1a89af75eb809a0a48cabc Mon Sep 17 00:00:00 2001 From: JeevakaPrabu Date: Mon, 9 Dec 2024 16:20:34 +0000 Subject: [PATCH] Revert "WA Disable trusty for MTL BM Boot" Tests done: - Android boot - adb reboot Tracked-On: OAM-128292 Signed-off-by: JeevakaPrabu --- ...02-WA-Disable-trusty-for-MTL-BM-Boot.patch | 49 ------------------- 1 file changed, 49 deletions(-) delete mode 100644 bsp_diff/common/device/intel/project-celadon/caas/0002-WA-Disable-trusty-for-MTL-BM-Boot.patch diff --git a/bsp_diff/common/device/intel/project-celadon/caas/0002-WA-Disable-trusty-for-MTL-BM-Boot.patch b/bsp_diff/common/device/intel/project-celadon/caas/0002-WA-Disable-trusty-for-MTL-BM-Boot.patch deleted file mode 100644 index 35da012523..0000000000 --- a/bsp_diff/common/device/intel/project-celadon/caas/0002-WA-Disable-trusty-for-MTL-BM-Boot.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 8d89450b45e98b9cc74bfbe1023f463d272700a0 Mon Sep 17 00:00:00 2001 -From: Tanuj Tekriwal -Date: Thu, 4 Jul 2024 03:30:20 +0000 -Subject: [PATCH] WA Disable trusty for MTL BM Boot - -This patch will disable the trusty for MTL BM boot - -Tests Done: NA - -Tracked-On: NA -Signed-off-by: Tanuj Tekriwal ---- - caas/mixins.spec | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/caas/mixins.spec b/caas/mixins.spec -index 687b92f8..53a7b04f 100755 ---- a/caas/mixins.spec -+++ b/caas/mixins.spec -@@ -9,7 +9,7 @@ product.mk: device.mk - [groups] - kernel: gmin64(useprebuilt=false,src_path=kernel/lts2023-chromium, loglevel=7, interactive_governor=false, relative_sleepstates=false, modules_in_bootimg=false, external_modules=,debug_modules=, use_bcmdhd=false, use_iwlwifi=false, extmod_platform=bxt, iwl_defconfig=, cfg_path=config-lts/lts2023-chromium, more_modules=true,lts2023_chromium_src_path=kernel/lts2023-chromium, lts2023_chromium_cfg_path=config-lts/lts2023-chromium, linux_intel_lts2023_src_path=kernel/linux-intel-lts2023, linux_intel_lts2023_cfg_path=config-lts/linux-intel-lts2023) - disk-bus: auto --boot-arch: project-celadon(uefi_arch=x86_64,fastboot=efi,ignore_rsci=true,disable_watchdog=true,watchdog_parameters=10 30,verity_warning=false,txe_bind_root_of_trust=false,bootloader_block_size=4096,verity_mode=false,disk_encryption=false,file_encryption=true,metadata_encryption=true,fsverity=true,target=caas,ignore_not_applicable_reset=true,self_usb_device_mode_protocol=true,usb_storage=true,live_boot=true,userdata_checkpoint=true,data_use_f2fs=true,trusty=true) -+boot-arch: project-celadon(uefi_arch=x86_64,fastboot=efi,ignore_rsci=true,disable_watchdog=true,watchdog_parameters=10 30,verity_warning=false,txe_bind_root_of_trust=false,bootloader_block_size=4096,verity_mode=false,disk_encryption=false,file_encryption=true,metadata_encryption=true,fsverity=true,target=caas,ignore_not_applicable_reset=true,self_usb_device_mode_protocol=true,usb_storage=true,live_boot=true,userdata_checkpoint=true,data_use_f2fs=true) - sepolicy: enforcing - bluetooth: btusb(ivi=false) - audio: project-celadon -@@ -52,14 +52,14 @@ lights: true - power: true(power_throttle=true) - debug-usb-config: true(source_dev=dvcith-0-msc0) - intel_prop: true --tee: trusty(ref_target=celadon_64) -+tee: false - memtrack: true --tpm: true -+tpm: false - avx: auto - health: hal - slot-ab: true - abota-fw: true --firststage-mount: true(trusty=true) -+firststage-mount: true - cpuset: autocores - usb-init: true - usb-audio-init: false --- -2.34.1 -