From: Denys Dmytriyenko <[email protected]> Like with master, move the actual TI-specific changes into corresponding include files that are only activated for ti-soc derived platforms.
Since include files are already guarded and only activated for ti-soc platforms, no need to use such override again. Signed-off-by: Denys Dmytriyenko <[email protected]> --- meta-ti-bsp/recipes-security/optee/optee-client-ti.inc | 7 +++++++ .../recipes-security/optee/optee-client_3.16%.bbappend | 9 +++------ meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc | 3 +++ .../recipes-security/optee/optee-examples_%.bbappend | 7 ++++--- .../recipes-security/optee/optee-os-tadevkit-ti.inc | 2 ++ .../recipes-security/optee/optee-os-tadevkit_%.bbappend | 6 ++++-- meta-ti-bsp/recipes-security/optee/optee-os-ti.inc | 5 ++++- .../recipes-security/optee/optee-os_3.16%.bbappend | 5 +---- meta-ti-bsp/recipes-security/optee/optee-test-ti.inc | 2 ++ meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend | 7 ++++--- 10 files changed, 34 insertions(+), 19 deletions(-) create mode 100644 meta-ti-bsp/recipes-security/optee/optee-client-ti.inc create mode 100644 meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc create mode 100644 meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc create mode 100644 meta-ti-bsp/recipes-security/optee/optee-test-ti.inc diff --git a/meta-ti-bsp/recipes-security/optee/optee-client-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-client-ti.inc new file mode 100644 index 00000000..fef87d30 --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-client-ti.inc @@ -0,0 +1,7 @@ +PV = "3.20.0+git${SRCPV}" +SRCREV = "dd2d39b49975d2ada7870fe2b7f5a84d0d3860dc" + +inherit pkgconfig +DEPENDS += "util-linux" + +EXTRA_OEMAKE += "PKG_CONFIG=pkg-config" diff --git a/meta-ti-bsp/recipes-security/optee/optee-client_3.16%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-client_3.16%.bbappend index 19db3827..08c5256b 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-client_3.16%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-client_3.16%.bbappend @@ -1,7 +1,4 @@ -PV:ti-soc = "3.20.0+git${SRCPV}" -SRCREV:ti-soc = "dd2d39b49975d2ada7870fe2b7f5a84d0d3860dc" +OPTEE_TI = "" +OPTEE_TI:ti-soc = "${BPN}-ti.inc" -inherit pkgconfig -DEPENDS:append:ti-soc = " util-linux" - -EXTRA_OEMAKE:append:ti-soc = " PKG_CONFIG=pkg-config" +require ${OPTEE_TI} diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc new file mode 100644 index 00000000..7d119f0d --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc @@ -0,0 +1,3 @@ +PV = "3.20.0+git${SRCPV}" +SRCREV = "a98d01e1b9168eaed96bcd0bac0df67c44a81081" +SRC_URI:remove = "file://0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch" diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend index 1760a6fa..08c5256b 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend @@ -1,3 +1,4 @@ -PV:ti-soc = "3.20.0+git${SRCPV}" -SRCREV:ti-soc = "a98d01e1b9168eaed96bcd0bac0df67c44a81081" -SRC_URI = "git://github.com/linaro-swg/optee_examples.git;branch=master;protocol=https" +OPTEE_TI = "" +OPTEE_TI:ti-soc = "${BPN}-ti.inc" + +require ${OPTEE_TI} diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc new file mode 100644 index 00000000..18820af1 --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc @@ -0,0 +1,2 @@ +PV = "3.20.0+git${SRCPV}" +SRCREV = "8e74d47616a20eaa23ca692f4bbbf917a236ed94" diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend index 7109c342..08c5256b 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend @@ -1,2 +1,4 @@ -PV:ti-soc = "3.20.0+git${SRCPV}" -SRCREV:ti-soc = "8e74d47616a20eaa23ca692f4bbbf917a236ed94" +OPTEE_TI = "" +OPTEE_TI:ti-soc = "${BPN}-ti.inc" + +require ${OPTEE_TI} diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc index 4f052996..e57ce4c7 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc @@ -1,3 +1,6 @@ +PV = "3.20.0+git${SRCPV}" +SRCREV = "8e74d47616a20eaa23ca692f4bbbf917a236ed94" + # Use TI SECDEV for signing inherit ti-secdev @@ -82,7 +85,7 @@ do_compile:append:j784s4-hs-evm() { optee_sign_k3hs } -do_install:append:ti-soc() { +do_install:append() { install -m 644 ${B}/*.optee ${D}${nonarch_base_libdir}/firmware/ || true install -m 644 ${B}/bl32.bin ${D}${nonarch_base_libdir}/firmware/ || true install -m 644 ${B}/bl32.bin.unsigned ${D}${nonarch_base_libdir}/firmware/ || true diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend index 1ed8e26e..08c5256b 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend @@ -1,7 +1,4 @@ OPTEE_TI = "" -OPTEE_TI:ti-soc = "optee-os-ti.inc" +OPTEE_TI:ti-soc = "${BPN}-ti.inc" require ${OPTEE_TI} - -PV:ti-soc = "3.20.0+git${SRCPV}" -SRCREV:ti-soc = "8e74d47616a20eaa23ca692f4bbbf917a236ed94" diff --git a/meta-ti-bsp/recipes-security/optee/optee-test-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-test-ti.inc new file mode 100644 index 00000000..43e0172d --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-test-ti.inc @@ -0,0 +1,2 @@ +PV = "3.19.0+git${SRCPV}" +SRCREV = "ab9863cc187724e54c032b738c28bd6e9460a4db" diff --git a/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend index b9e803c5..08c5256b 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend @@ -1,3 +1,4 @@ -PV:ti-soc = "3.19.0+git${SRCPV}" -SRCREV:ti-soc = "ab9863cc187724e54c032b738c28bd6e9460a4db" -SRC_URI:ti-soc = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https" +OPTEE_TI = "" +OPTEE_TI:ti-soc = "${BPN}-ti.inc" + +require ${OPTEE_TI} -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#16574): https://lists.yoctoproject.org/g/meta-ti/message/16574 Mute This Topic: https://lists.yoctoproject.org/mt/99070738/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/6695321/21656/1393940836/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
