diff options
author | Tim Lee <timlee660101@gmail.com> | 2023-07-07 09:57:03 +0300 |
---|---|---|
committer | Tim Lee <chli30@nuvoton.com> | 2023-07-12 08:29:55 +0300 |
commit | 01c50ad35aef011d0d95c443e30f2d4ca588d8aa (patch) | |
tree | 16aee5282f905ce0dbdf2891c0580edbddf157c1 /meta-nuvoton/dynamic-layers | |
parent | ca8a64db121ca28d8cc87b38126fa5cc2c5edbb6 (diff) | |
download | openbmc-01c50ad35aef011d0d95c443e30f2d4ca588d8aa.tar.xz |
meta-nuvoton: optee-os: update to 3.20
Keep up with the latest support of optee-os in openbmc.
Tested: build pass and boot successfully.
Signed-off-by: Tim Lee <timlee660101@gmail.com>
Change-Id: Ia22d9641135356dc575d72382bc1daba9d1e531c
Diffstat (limited to 'meta-nuvoton/dynamic-layers')
4 files changed, 34 insertions, 34 deletions
diff --git a/meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os-tadevkit_3.18.0.bbappend b/meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os-tadevkit_3.18.0.bbappend deleted file mode 100644 index e19078e0d1..0000000000 --- a/meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os-tadevkit_3.18.0.bbappend +++ /dev/null @@ -1,9 +0,0 @@ -SRC_URI:remove:npcm8xx = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https" - -SRC_URI:remove:npcm8xx = " \ - file://0001-allow-setting-sysroot-for-libgcc-lookup.patch \ - " - -SRC_URI:append:npcm8xx = "git://github.com/Nuvoton-Israel/optee_os.git;branch=npcm_3_18;protocol=https" - -SRCREV:npcm8xx = "485dc7ac4e4a3f51d86c5b6562e3720a338441c7" diff --git a/meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os-tadevkit_3.20.0.bbappend b/meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os-tadevkit_3.20.0.bbappend new file mode 100644 index 0000000000..85068bc758 --- /dev/null +++ b/meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os-tadevkit_3.20.0.bbappend @@ -0,0 +1,7 @@ +SRCREV:npcm8xx = "a012b9923d52be5721f6046c0464bdf645d87b01" + +SRC_URI:remove:npcm8xx = "file://0004-core-Define-section-attributes-for-clang.patch" +SRC_URI:remove:npcm8xx = "file://0005-core-arm-S-EL1-SPMC-boot-ABI-update.patch" +SRC_URI:remove:npcm8xx = "file://0006-core-ffa-add-TOS_FW_CONFIG-handling.patch" +SRC_URI:remove:npcm8xx = "file://0007-core-spmc-handle-non-secure-interrupts.patch" +SRC_URI:remove:npcm8xx = "file://0008-core-spmc-configure-SP-s-NS-interrupt-action-based-o.patch" diff --git a/meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os_3.18.0.bbappend b/meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os_3.18.0.bbappend deleted file mode 100644 index 5bc864cf03..0000000000 --- a/meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os_3.18.0.bbappend +++ /dev/null @@ -1,25 +0,0 @@ -SRC_URI:remove:npcm8xx = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https" - -SRC_URI:remove:npcm8xx = "file://0003-core-link-add-no-warn-rwx-segments.patch" -SRC_URI:remove:npcm8xx = "file://0004-core-Define-section-attributes-for-clang.patch" -SRC_URI:remove:npcm8xx = "file://0005-core-ldelf-link-add-z-execstack.patch" -SRC_URI:remove:npcm8xx = "file://0006-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch" - -SRC_URI:append:npcm8xx = "git://github.com/Nuvoton-Israel/optee_os.git;branch=npcm_3_18;protocol=https" - -SRCREV:npcm8xx = "57e44ae6b3d6de756da8652ec132ffd7005439b7" - -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 \ - " - -do_deploy:npcm8xx() { - install -d ${DEPLOYDIR}/ - install -m 644 ${D}${nonarch_base_libdir}/firmware/* ${DEPLOYDIR}/ -} diff --git a/meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os_3.20.0.bbappend b/meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os_3.20.0.bbappend new file mode 100644 index 0000000000..5d0be5f85b --- /dev/null +++ b/meta-nuvoton/dynamic-layers/arm-layer/recipes-security/optee/optee-os_3.20.0.bbappend @@ -0,0 +1,27 @@ +SRCREV:npcm8xx = "a012b9923d52be5721f6046c0464bdf645d87b01" + +SRC_URI:remove:npcm8xx = "file://0004-core-Define-section-attributes-for-clang.patch" +SRC_URI:remove:npcm8xx = "file://0005-core-arm-S-EL1-SPMC-boot-ABI-update.patch" +SRC_URI:remove:npcm8xx = "file://0006-core-ffa-add-TOS_FW_CONFIG-handling.patch" +SRC_URI:remove:npcm8xx = "file://0007-core-spmc-handle-non-secure-interrupts.patch" +SRC_URI:remove:npcm8xx = "file://0008-core-spmc-configure-SP-s-NS-interrupt-action-based-o.patch" + +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 \ + CFG_TZDRAM_SIZE=0x03f00000 \ + CFG_SHMEM_START=0x06000000 \ + CFG_TEE_SDP_MEM_BASE=0x05F00000 \ + CFG_TEE_SDP_MEM_SIZE=0x00100000 \ + " + +do_deploy:npcm8xx() { + install -d ${DEPLOYDIR}/ + install -m 644 ${D}${nonarch_base_libdir}/firmware/* ${DEPLOYDIR}/ +} |