diff options
author | Denys Dmytriyenko <denys@konsulko.com> | 2023-01-12 18:12:12 +0000 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2023-01-24 12:50:06 -0600 |
commit | 04791d24e2d11f6bb94bf4c07e1ef683e8e14ae6 (patch) | |
tree | ede6ce6774698b9dba483ae87f1591b050fea5a0 /meta-ti-bsp/recipes-security | |
parent | 0e5df43108a2123df3892e67c0fe52557255bd49 (diff) | |
download | meta-ti-04791d24e2d11f6bb94bf4c07e1ef683e8e14ae6.tar.gz |
optee-os: sync up with upstream meta-arm update
Upstream meta-arm has updated optee-os to 3.19 and our local changes
conflict with that. Update bbappend to match upstream.
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Diffstat (limited to 'meta-ti-bsp/recipes-security')
-rw-r--r-- | meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend index 8640d7b0..6f711101 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend | |||
@@ -1,12 +1,3 @@ | |||
1 | PV:ti-soc = "3.19.0+git${SRCPV}" | ||
2 | SRCREV:ti-soc = "afacf356f9593a7f83cae9f96026824ec242ff52" | ||
3 | |||
4 | # These patches are from upstream against v3.18, but we moved to v3.19 and the | ||
5 | # patches are now invalid. These can be removed once upstream moves up to or | ||
6 | # beyond v3.19. | ||
7 | SRC_URI:remove:ti-soc = "file://0008-no-warn-rwx-segments.patch" | ||
8 | SRC_URI:remove:ti-soc = "file://0009-add-z-execstack.patch" | ||
9 | |||
10 | EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" | 1 | EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" |
11 | 2 | ||
12 | EXTRA_OEMAKE:append:am62xx = " CFG_WITH_SOFTWARE_PRNG=y CFG_TEE_CORE_LOG_LEVEL=1" | 3 | EXTRA_OEMAKE:append:am62xx = " CFG_WITH_SOFTWARE_PRNG=y CFG_TEE_CORE_LOG_LEVEL=1" |