1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-05-07 11:59:49 +00:00

optee: Rework include files

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>
This commit is contained in:
Ryan Eatmon
2023-11-02 11:34:23 -05:00
parent 984e838d75
commit 93249485b5
11 changed files with 26 additions and 25 deletions
@@ -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}
@@ -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}
@@ -0,0 +1 @@
EXTRA_OEMAKE:remove = "CFG_MAP_EXT_DT_SECURE=y"
@@ -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}
@@ -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
@@ -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"
@@ -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}
@@ -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}