| Message ID | 20231107152709.29250-1-reatmon@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,master] optee: Rework include files | expand |
diff --git a/meta-ti-bsp/recipes-security/optee/optee-client-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc similarity index 100% rename from meta-ti-bsp/recipes-security/optee/optee-client-ti.inc rename to meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc diff --git a/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend index 08c5256b..f193e78b 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend @@ -1,4 +1,4 @@ -OPTEE_TI = "" -OPTEE_TI:ti-soc = "${BPN}-ti.inc" +OPTEE_TI_VERSION = "" +OPTEE_TI_VERSION:ti-soc = "${BPN}-ti-version.inc" -require ${OPTEE_TI} +require ${OPTEE_TI_VERSION} diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc similarity index 100% rename from meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc rename to meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend index 08c5256b..f193e78b 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend @@ -1,4 +1,4 @@ -OPTEE_TI = "" -OPTEE_TI:ti-soc = "${BPN}-ti.inc" +OPTEE_TI_VERSION = "" +OPTEE_TI_VERSION:ti-soc = "${BPN}-ti-version.inc" -require ${OPTEE_TI} +require ${OPTEE_TI_VERSION} diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti-overrides.inc b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti-overrides.inc new file mode 100644 index 00000000..df46e243 --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti-overrides.inc @@ -0,0 +1 @@ +EXTRA_OEMAKE:remove = "CFG_MAP_EXT_DT_SECURE=y" 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 08c5256b..980f7a4b 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend @@ -1,4 +1,9 @@ -OPTEE_TI = "" -OPTEE_TI:ti-soc = "${BPN}-ti.inc" +OPTEE_TI_VERSION = "" +OPTEE_TI_VERSION:ti-soc = "optee-os-ti-version.inc" -require ${OPTEE_TI} +require ${OPTEE_TI_VERSION} + +OPTEE_TI_OVERRIDES = "" +OPTEE_TI_OVERRIDES:ti-soc = "${BPN}-ti-overrides.inc" + +require ${OPTEE_TI_OVERRIDES} diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc similarity index 86% rename from meta-ti-bsp/recipes-security/optee/optee-os-ti.inc rename to meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc index 6d192bbe..de13d282 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc @@ -1,11 +1,3 @@ -PV = "4.0.0+git${SRCPV}" -SRCREV = "2a5b1d1232f582056184367fb58a425ac7478ec6" - -# Fixes for pointing to 4.0.0 before upstream meta-arm -FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os-4.0.0:" -SRC_URI:remove = "file://0002-core-Define-section-attributes-for-clang.patch" -SRC_URI:append = " file://0002ti-core-Define-section-attributes-for-clang.patch" - # Use TI SECDEV for signing inherit ti-secdev diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc similarity index 87% rename from meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc rename to meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc index 55453366..06472e34 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc @@ -5,5 +5,3 @@ SRCREV = "2a5b1d1232f582056184367fb58a425ac7478ec6" FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os-4.0.0:" SRC_URI:remove = "file://0002-core-Define-section-attributes-for-clang.patch" SRC_URI:append = " file://0002ti-core-Define-section-attributes-for-clang.patch" - -EXTRA_OEMAKE:remove = "CFG_MAP_EXT_DT_SECURE=y" diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend index 08c5256b..0cee127f 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend @@ -1,4 +1,9 @@ -OPTEE_TI = "" -OPTEE_TI:ti-soc = "${BPN}-ti.inc" +OPTEE_TI_VERSION = "" +OPTEE_TI_VERSION:ti-soc = "${BPN}-ti-version.inc" -require ${OPTEE_TI} +require ${OPTEE_TI_VERSION} + +OPTEE_TI_OVERRIDES = "" +OPTEE_TI_OVERRIDES:ti-soc = "${BPN}-ti-overrides.inc" + +require ${OPTEE_TI_OVERRIDES} diff --git a/meta-ti-bsp/recipes-security/optee/optee-test-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc similarity index 100% rename from meta-ti-bsp/recipes-security/optee/optee-test-ti.inc rename to meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc diff --git a/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend index 08c5256b..f193e78b 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend @@ -1,4 +1,4 @@ -OPTEE_TI = "" -OPTEE_TI:ti-soc = "${BPN}-ti.inc" +OPTEE_TI_VERSION = "" +OPTEE_TI_VERSION:ti-soc = "${BPN}-ti-version.inc" -require ${OPTEE_TI} +require ${OPTEE_TI_VERSION}
Minor rework of the TI include files used to override both SRCREV and other settings in the optee recipes for TI SOC parts. The intent is to make it more clear when we are changing SRCREVs versus changing other items, and allow for sharing the SRCREV changes for optee-os-tadevkit which should track the optee-os SRCREV. Signed-off-by: Ryan Eatmon <reatmon@ti.com> --- ...ptee-client-ti.inc => optee-client-ti-version.inc} | 0 .../recipes-security/optee/optee-client_%.bbappend | 6 +++--- ...-examples-ti.inc => optee-examples-ti-version.inc} | 0 .../recipes-security/optee/optee-examples_%.bbappend | 6 +++--- .../optee/optee-os-tadevkit-ti-overrides.inc | 1 + .../optee/optee-os-tadevkit_%.bbappend | 11 ++++++++--- .../{optee-os-ti.inc => optee-os-ti-overrides.inc} | 8 -------- ...tee-os-tadevkit-ti.inc => optee-os-ti-version.inc} | 2 -- .../recipes-security/optee/optee-os_%.bbappend | 11 ++++++++--- .../{optee-test-ti.inc => optee-test-ti-version.inc} | 0 .../recipes-security/optee/optee-test_%.bbappend | 6 +++--- 11 files changed, 26 insertions(+), 25 deletions(-) rename meta-ti-bsp/recipes-security/optee/{optee-client-ti.inc => optee-client-ti-version.inc} (100%) rename meta-ti-bsp/recipes-security/optee/{optee-examples-ti.inc => optee-examples-ti-version.inc} (100%) create mode 100644 meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti-overrides.inc rename meta-ti-bsp/recipes-security/optee/{optee-os-ti.inc => optee-os-ti-overrides.inc} (86%) rename meta-ti-bsp/recipes-security/optee/{optee-os-tadevkit-ti.inc => optee-os-ti-version.inc} (87%) rename meta-ti-bsp/recipes-security/optee/{optee-test-ti.inc => optee-test-ti-version.inc} (100%)