Skip to content

Commit 691f6d0

Browse files
committed
Enable trusty and revert kernelflinger workaround
Enable all trusty related kernel compile flags for android15 build. Also revert kernelflinger prior workaround. Tracked-On: OAM-134102 Signed-off-by: Avinash Kumar <avinash3.kumar@intel.com>
1 parent 9436e31 commit 691f6d0

File tree

2 files changed

+53
-0
lines changed

2 files changed

+53
-0
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From a7131f91a809ec872f1217e783880807860ef193 Mon Sep 17 00:00:00 2001
2+
From: Avinash Kumar <avinash3.kumar@intel.com>
3+
Date: Fri, 26 Sep 2025 05:55:42 +0000
4+
Subject: [PATCH] Enable trusty on android 15 kernel
5+
6+
Enable all trusty related kernel compile flags for android15 build.
7+
8+
Signed-off-by: Avinash Kumar <avinash3.kumar@intel.com>
9+
---
10+
.../kernel/gmin64/config-lts/linux-intel-lts2024/caas_diffconfig | 1 +
11+
1 file changed, 1 insertion(+)
12+
13+
diff --git a/groups/kernel/gmin64/config-lts/linux-intel-lts2024/caas_diffconfig b/groups/kernel/gmin64/config-lts/linux-intel-lts2024/caas_diffconfig
14+
index 9fc72cd5..d47ec583 100644
15+
--- a/groups/kernel/gmin64/config-lts/linux-intel-lts2024/caas_diffconfig
16+
+++ b/groups/kernel/gmin64/config-lts/linux-intel-lts2024/caas_diffconfig
17+
@@ -1,3 +1,4 @@
18+
+CONFIG_TEE=y
19+
CONFIG_TRUSTY=y
20+
# CONFIG_TRUSTY_IRQ is not set
21+
CONFIG_TRUSTY_LOG=y
22+
--
23+
2.34.1
24+
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From 30b6f03209e0005756b6f8c9e135d75b28e67028 Mon Sep 17 00:00:00 2001
2+
From: Basanagouda Nagappa Koppad <Basanagouda.Nagappa.Koppad@intel.com>
3+
Date: Wed, 24 Sep 2025 07:02:26 +0000
4+
Subject: [PATCH] Revert kernelflinger patch
5+
6+
revert commit id# 38b71582d0d93b11e4710f5c75f2b1d5cafa2261
7+
8+
Signed-off-by: Basanagouda Nagappa Koppad <Basanagouda.Nagappa.Koppad@intel.com>
9+
10+
diff --git a/libkernelflinger/android.c b/libkernelflinger/android.c
11+
index 9944529..58ea694 100644
12+
--- a/libkernelflinger/android.c
13+
+++ b/libkernelflinger/android.c
14+
@@ -479,6 +479,12 @@ static inline EFI_STATUS handover_jump(EFI_HANDLE image,
15+
return ret;
16+
17+
boot:
18+
+#ifdef USE_TRUSTY
19+
+ /*
20+
+ * Called after ExitBootService.
21+
+ */
22+
+ trusty_late_init();
23+
+#endif
24+
25+
#if __LP64__
26+
/* The 64-bit kernel entry is 512 bytes after the start. */
27+
--
28+
2.34.1
29+

0 commit comments

Comments
 (0)