| Message ID | 20220908192959.21816-2-jon.mason@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] arm-bsp/optee-os: add 3.10 recipe for corstone1000 | expand |
diff --git a/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000_common.inc b/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc similarity index 100% rename from meta-arm-bsp/recipes-security/optee/optee-os_corstone1000_common.inc rename to meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc diff --git a/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000.inc b/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000.inc similarity index 94% rename from meta-arm-bsp/recipes-security/optee/optee-os_corstone1000.inc rename to meta-arm-bsp/recipes-security/optee/optee-os-corstone1000.inc index eb5f6df0..8ddf47e3 100644 --- a/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000.inc +++ b/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000.inc @@ -1,4 +1,4 @@ -require optee-os_corstone1000_common.inc +require optee-os-corstone1000-common.inc DEPENDS += " secure-partitions" EXTRA_OEMAKE +="'SP_PACKAGING_METHOD=embedded'" diff --git a/meta-arm-bsp/recipes-security/optee/optee-spdevkit-corstone1000.inc b/meta-arm-bsp/recipes-security/optee/optee-spdevkit-corstone1000.inc new file mode 100644 index 00000000..db85ed8e --- /dev/null +++ b/meta-arm-bsp/recipes-security/optee/optee-spdevkit-corstone1000.inc @@ -0,0 +1 @@ +require optee-os-corstone1000-common.inc diff --git a/meta-arm-bsp/recipes-security/optee/optee-spdevkit_corstone1000.inc b/meta-arm-bsp/recipes-security/optee/optee-spdevkit_corstone1000.inc deleted file mode 100644 index 363b0ed1..00000000 --- a/meta-arm-bsp/recipes-security/optee/optee-spdevkit_corstone1000.inc +++ /dev/null @@ -1 +0,0 @@ -require optee-os_corstone1000_common.inc diff --git a/meta-arm-bsp/recipes-security/optee/optee-spdevkit_git.bbappend b/meta-arm-bsp/recipes-security/optee/optee-spdevkit_git.bbappend index 13e109cb..5f74ae45 100644 --- a/meta-arm-bsp/recipes-security/optee/optee-spdevkit_git.bbappend +++ b/meta-arm-bsp/recipes-security/optee/optee-spdevkit_git.bbappend @@ -1,6 +1,6 @@ # Machine specific configurations MACHINE_OPTEE_SPDEVKIT_REQUIRE ?= "" -MACHINE_OPTEE_SPDEVKIT_REQUIRE:corstone1000 = "optee-spdevkit_corstone1000.inc" +MACHINE_OPTEE_SPDEVKIT_REQUIRE:corstone1000 = "optee-spdevkit-corstone1000.inc" require ${MACHINE_OPTEE_SPDEVKIT_REQUIRE}
The corstone1000 optee files have an underbar when it should have a hyphen in the naming scheme. Change this to match other files. Signed-off-by: Jon Mason <jon.mason@arm.com> --- ...corstone1000_common.inc => optee-os-corstone1000-common.inc} | 0 .../{optee-os_corstone1000.inc => optee-os-corstone1000.inc} | 2 +- .../recipes-security/optee/optee-spdevkit-corstone1000.inc | 1 + .../recipes-security/optee/optee-spdevkit_corstone1000.inc | 1 - meta-arm-bsp/recipes-security/optee/optee-spdevkit_git.bbappend | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename meta-arm-bsp/recipes-security/optee/{optee-os_corstone1000_common.inc => optee-os-corstone1000-common.inc} (100%) rename meta-arm-bsp/recipes-security/optee/{optee-os_corstone1000.inc => optee-os-corstone1000.inc} (94%) create mode 100644 meta-arm-bsp/recipes-security/optee/optee-spdevkit-corstone1000.inc delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-spdevkit_corstone1000.inc