Android-Kernel-Tutorials/patches/022.tz_deploy_tzar.patch at main · ravindu644/Android-Kernel-Tutorials · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
commit 429bce31c68e9a8d779c0c8a8303799fc11df1d6
Author: Ravindu Deshan <droidcasts@protonmail.com>
Date:   Fri Mar 21 18:42:48 2025 +0530

    drivers/misc/tzdev/tz_deploy_tzar: fix startup.tzar inclusion

    Signed-off-by: Denis Efremov <efremov@linux.com>
    Signed-off-by: Ravindu Deshan <droidcasts@protonmail.com>

diff --git a/prebuilt-images/N/tzdev/Makefile b/prebuilt-images/N/tzdev/Makefile
index 3a713ff04..1f96c1656 100644
--- a/prebuilt-images/N/tzdev/Makefile
+++ b/prebuilt-images/N/tzdev/Makefile
@@ -1,6 +1,6 @@
-subdir-ccflags-y += -I$(srctree)/drivers/misc/tzdev/include
-subdir-ccflags-y += -I$(srctree)/drivers/misc/tzdev
-ccflags-$(CONFIG_TZDEV_DEPLOY_TZAR) += -D"_STR(s)=\#s" -D"KBUILD_SRC=_STR($(KBUILD_SRC))"
+subdir-ccflags-y += -I$(srctree)/$(src)/include
+subdir-ccflags-y += -I$(srctree)/$(src)
+ccflags-$(CONFIG_TZDEV_DEPLOY_TZAR) += -Wa,-I$(srctree)/$(src)

 obj-$(CONFIG_TZDEV)			+= lib/
 obj-$(CONFIG_TZDEV)			+= teec/
diff --git a/prebuilt-images/N/tzdev/tz_deploy_tzar.c b/prebuilt-images/N/tzdev/tz_deploy_tzar.c
index fc16e191c..5a280e4ad 100644
--- a/prebuilt-images/N/tzdev/tz_deploy_tzar.c
+++ b/prebuilt-images/N/tzdev/tz_deploy_tzar.c
@@ -33,7 +33,7 @@
 __asm__ (
   ".section .init.data,\"aw\"\n"
   "tzdev_tzar_begin:\n"
-  ".incbin \"" KBUILD_SRC "/drivers/misc/tzdev/startup.tzar\"\n"
+  ".incbin \"startup.tzar\"\n"
   "tzdev_tzar_end:\n"
   ".previous\n"
 );
diff --git a/prebuilt-images/S/tzdev/Makefile b/prebuilt-images/S/tzdev/Makefile
index d0f764b40..ac199989c 100755
--- a/prebuilt-images/S/tzdev/Makefile
+++ b/prebuilt-images/S/tzdev/Makefile
@@ -1,6 +1,6 @@
-subdir-ccflags-y += -I$(srctree)/drivers/misc/tzdev/include
-subdir-ccflags-y += -I$(srctree)/drivers/misc/tzdev
-ccflags-$(CONFIG_TZDEV_DEPLOY_TZAR) += -D"_STR(s)=\#s" -D"KBUILD_SRC=_STR($(KBUILD_SRC))"
+subdir-ccflags-y += -I$(srctree)/$(src)/include
+subdir-ccflags-y += -I$(srctree)/$(src)
+ccflags-$(CONFIG_TZDEV_DEPLOY_TZAR) += -Wa,-I$(srctree)/$(src)

 obj-$(CONFIG_TZDEV)			+= lib/
 obj-$(CONFIG_TZDEV)			+= teec/
diff --git a/prebuilt-images/S/tzdev/tz_deploy_tzar.c b/prebuilt-images/S/tzdev/tz_deploy_tzar.c
index fc16e191c..5a280e4ad 100755
--- a/prebuilt-images/S/tzdev/tz_deploy_tzar.c
+++ b/prebuilt-images/S/tzdev/tz_deploy_tzar.c
@@ -33,7 +33,7 @@
 __asm__ (
   ".section .init.data,\"aw\"\n"
   "tzdev_tzar_begin:\n"
-  ".incbin \"" KBUILD_SRC "/drivers/misc/tzdev/startup.tzar\"\n"
+  ".incbin \"startup.tzar\"\n"
   "tzdev_tzar_end:\n"
   ".previous\n"
 );