From e21c11b4a44417f67c78503bc3f954c175ac20e2 Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denys@konsulko.com>
Date: Wed, 11 Aug 2021 14:39:05 -0400
Subject: meta-ti: convert to new override syntax in honister

Upcoming "honister" release changes the override syntax to improve usability,
speed and memory footprint. Update recipes with the new syntax and set layer
compatibility to honister.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Tested-by: Paul Barker <paul.barker@sancloud.com>
Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
---
 recipes-security/optee/optee-%.bbappend    |  2 +-
 recipes-security/optee/optee-os_%.bbappend | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'recipes-security')

diff --git a/recipes-security/optee/optee-%.bbappend b/recipes-security/optee/optee-%.bbappend
index 32307e2f..bc590bfd 100644
--- a/recipes-security/optee/optee-%.bbappend
+++ b/recipes-security/optee/optee-%.bbappend
@@ -1 +1 @@
-COMPATIBLE_MACHINE_ti-soc = "ti-soc"
+COMPATIBLE_MACHINE:ti-soc = "ti-soc"
diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend
index d7e81c5a..aac14a50 100644
--- a/recipes-security/optee/optee-os_%.bbappend
+++ b/recipes-security/optee/optee-os_%.bbappend
@@ -1,8 +1,8 @@
-do_compile_prepend_ti-soc() {
+do_compile:prepend:ti-soc() {
     export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
 }
 
-do_compile_append_k3() {
+do_compile:append:k3() {
     ( cd ${B}/core/; \
         cp tee-pager_v2.bin ${B}/bl32.bin; \
         cp tee.elf ${B}/bl32.elf; \
@@ -37,23 +37,23 @@ optee_sign_k3hs() {
     )
 }
 
-do_compile_append_ti43x() {
+do_compile:append:ti43x() {
     optee_sign_legacyhs
 }
 
-do_compile_append_dra7xx() {
+do_compile:append:dra7xx() {
     optee_sign_legacyhs
 }
 
-do_compile_append_am65xx-hs-evm() {
+do_compile:append:am65xx-hs-evm() {
     optee_sign_k3hs
 }
 
-do_compile_append_j7-hs-evm() {
+do_compile:append:j7-hs-evm() {
     optee_sign_k3hs
 }
 
-do_install_append_ti-soc() {
+do_install:append:ti-soc() {
     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.elf ${D}${nonarch_base_libdir}/firmware/ || true
@@ -66,18 +66,18 @@ optee_deploy_legacyhs() {
     done
 }
 
-do_deploy_append_ti43x() {
+do_deploy:append:ti43x() {
     optee_deploy_legacyhs
 }
 
-do_deploy_append_dra7xx() {
+do_deploy:append:dra7xx() {
     optee_deploy_legacyhs
 }
 
-do_deploy_append_k3() {
+do_deploy:append:k3() {
     ln -sf optee/bl32.bin ${DEPLOYDIR}/
     ln -sf optee/bl32.elf ${DEPLOYDIR}/
 }
 
 # This is needed for bl32.elf
-INSANE_SKIP_${PN}_append_k3 = " textrel"
+INSANE_SKIP:${PN}:append:k3 = " textrel"
-- 
cgit v1.2.3-54-g00ecf