Skip to content

Commit 4890bd6

Browse files
ItsNayabSDConchuOD
authored andcommitted
configs: bump optee os to version 4.0.0
- Bumps optee os version to release 4.0.0. - Update source uri to point to open source OP-TEE repo - Add tee-supplicant systemd service file Co-developed-by: Dharma Balasubiramani <[email protected]> Signed-off-by: Nayab Sayed <[email protected]> Acked-by: Hari Prasath Gujulan Elango <[email protected]> Signed-off-by: Conor Dooley <[email protected]>
1 parent 93886af commit 4890bd6

File tree

4 files changed

+21
-4
lines changed

4 files changed

+21
-4
lines changed

board/microchip/sama5/post_build.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,10 @@ if grep -Eq "^BR2_PACKAGE_SYSTEMD=y$" ${BR2_CONFIG}; then
5555
rm -rf ${TARGET_DIR}/etc/systemd/system/multi-user.target.wants/wpa_supplicant.service
5656
rm -rf ${TARGET_DIR}/usr/lib/systemd/system/wpa_supplicant.service
5757
fi
58+
if grep -Eq "^BR2_TARGET_OPTEE_OS=y$" ${BR2_CONFIG}; then
59+
cp ${BR2_EXTERNAL}/package/optee-client/tee-supplicant.service \
60+
${TARGET_DIR}/usr/lib/systemd/system/tee-supplicant.service
61+
mkdir -p ${TARGET_DIR}/etc/systemd/system/basic.target.wants
62+
ln -sf /usr/lib/systemd/system/tee-supplicant.service \
63+
${TARGET_DIR}/etc/systemd/system/basic.target.wants/tee-supplicant.service
64+
fi

configs/sama5d27_som1_ek_optee_graphics_defconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,8 @@ BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v4.0.8-rc2"
254254
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d27_som1_ek-opteesd_uboot"
255255
BR2_TARGET_OPTEE_OS=y
256256
BR2_TARGET_OPTEE_OS_CUSTOM_GIT=y
257-
BR2_TARGET_OPTEE_OS_CUSTOM_REPO_URL="https://github.com/linux4sam/optee_os-at91.git"
258-
BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION="linux4sam-2022.10"
257+
BR2_TARGET_OPTEE_OS_CUSTOM_REPO_URL="https://github.com/OP-TEE/optee_os.git"
258+
BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION="4.0.0"
259259
BR2_TARGET_OPTEE_OS_NEEDS_DTC=y
260260
BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY=y
261261
BR2_TARGET_OPTEE_OS_PLATFORM="sam"

configs/sama5d27_som1_ek_optee_headless_defconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d27_som1_ek-opteesd_uboot"
163163
BR2_TARGET_OPTEE_OS=y
164164
BR2_PACKAGE_OPTEE_EXAMPLES=y
165165
BR2_TARGET_OPTEE_OS_CUSTOM_GIT=y
166-
BR2_TARGET_OPTEE_OS_CUSTOM_REPO_URL="https://github.com/linux4sam/optee_os-at91.git"
167-
BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION="linux4sam-2022.10"
166+
BR2_TARGET_OPTEE_OS_CUSTOM_REPO_URL="https://github.com/OP-TEE/optee_os.git"
167+
BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION="4.0.0"
168168
BR2_TARGET_OPTEE_OS_NEEDS_DTC=y
169169
BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY=y
170170
BR2_TARGET_OPTEE_OS_PLATFORM="sam"
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[Unit]
2+
Description=TEE Supplicant
3+
4+
[Service]
5+
User=root
6+
EnvironmentFile=-/etc/default/tee-supplicant
7+
ExecStart=/usr/sbin/tee-supplicant $OPTARGS
8+
9+
[Install]
10+
WantedBy=basic.target

0 commit comments

Comments
 (0)