commit 8843589bd1add7ceb2cceeb25c44608eb22226b7
author Tim Lee <timlee660101@gmail.com> Fri Aug 11 16:28:33 2023 +0800
committer Tim Lee <chli30@nuvoton.com> Wed Aug 30 06:16:55 2023 +0000
tree e8df6aec3a6ae91a3a254869658f28f2a783c289
parent f90c03145cb9d12e59dbf4c67639ec06e1bbef4a

meta-nuvoton: optee-os: remove RPMB configurations

The RPMB partition of the eMMC on our boards has been written
with a test key from optee-os. As a result, we cannot use the
key from OTP to access RPMB. Thus, we need to remove it.

And add back CFG_REE_FS and CFG_REE_FS_TA support for optee-os.

Tested: build pass and boot successfully then run xtest pass.

Signed-off-by: Tim Lee <timlee660101@gmail.com>
Change-Id: I47ea2f1ba8ed09b34a1530c2b4110d296dd09e11

meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os_%.bbappend

diff --git a/meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os_%.bbappend b/meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os_%.bbappend
index 4ed6031..d210f16 100644
--- a/meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os_%.bbappend
+++ b/meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os_%.bbappend
@@ -1,9 +1,4 @@
 EXTRA_OEMAKE:append:npcm8xx = " \
-    CFG_REE_FS=n \
-    CFG_REE_FS_TA=n \
-    CFG_RPMB_FS=y \
-    CFG_RPMB_TESTKEY=y \
-    CFG_RPMB_WRITE_KEY=y \
     CFG_CORE_HEAP_SIZE=524288 \
     CFG_TEE_RAM_VA_SIZE=3145728 \
     CFG_TZDRAM_START=0x02100000 \