WIP: zarhus: packagegroups: add OP-TEE userspace support

Signed-off-by: Daniil Klimuk <[email protected]>
zarhus · Sep 6, 2024 · 379fe35 · 379fe35
1 parent 5aafa08
commit 379fe35
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 0 deletions.
diff --git a/...rockchip/recipes-kernel/linux/linux-yocto/0001-rk356x.dtsi-add-optee-firmware-entry.patch b/...rockchip/recipes-kernel/linux/linux-yocto/0001-rk356x.dtsi-add-optee-firmware-entry.patch
@@ -0,0 +1,31 @@
+Upstream-Status: Pending
+
+From 8306034d72cb2e9fd46ee835806f8d41788f8368 Mon Sep 17 00:00:00 2001
+From: Daniil Klimuk <[email protected]>
+Date: Thu, 5 Sep 2024 12:24:52 +0200
+Subject: [PATCH] rk356x.dtsi: add optee firmware entry
+
+Signed-off-by: Daniil Klimuk <[email protected]>
+---
+ arch/arm64/boot/dts/rockchip/rk356x.dtsi | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
+index fff3cf8bb450..3be71f6bec2a 100644
+--- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
+@@ -158,6 +158,11 @@ scmi_clk: protocol@14 {
+ 				#clock-cells = <1>;
+ 			};
+ 		};
++
++		optee: optee {
++			compatible = "linaro,optee-tz";
++			method = "smc";
++		};
+ 	};
+
+ 	gpu_opp_table: opp-table-1 {
+-- 
+2.46.0
+
diff --git a/meta-zarhus-bsp/meta-zarhus-bsp-rockchip/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-zarhus-bsp/meta-zarhus-bsp-rockchip/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -16,6 +16,7 @@ SRC_URI:append = " \
     file://enable-cmdline-bool.cfg \
     file://enable-debug-stackoverflow.cfg \
     file://0001-rk356x.dtsi-reserve-optee-memory.patch \
+    file://0001-rk356x.dtsi-add-optee-firmware-entry.patch \
 "
 
 SRC_URI:append = " \

diff --git a/meta-zarhus-distro/recipes-zarhus/images/zarhus-base-image.inc b/meta-zarhus-distro/recipes-zarhus/images/zarhus-base-image.inc
@@ -8,4 +8,5 @@ inherit core-image
 
 IMAGE_INSTALL:append = " \
     packagegroup-zarhus-system \
+    packagegroup-zarhus-security \
 "
diff --git a/meta-zarhus-distro/recipes-zarhus/packagegroups/packagegroup-zarhus.bb b/meta-zarhus-distro/recipes-zarhus/packagegroups/packagegroup-zarhus.bb
@@ -11,6 +11,7 @@ PACKAGES = " \
     ${PN}-system \
     ${PN}-dbg \
     ${PN}-alsa \
+    ${PN}-security \
 "
 
 RDEPENDS:${PN}-system = " \
@@ -45,3 +46,10 @@ RDEPENDS:${PN}-alsa = " \
     dialog \
     ncurses \
 "
+
+RDEPENDS:${PN}-security = " \
+    libp11 \
+    opensc \
+    openssl \
+    optee-client \
+"