Merge pull request #980 from Freescale/topic/generalize-soc-overrides

Generalize overrides subsystem for NXP and Mainline support

3 files changed, 15 insertions, 15 deletions

diff --git a/recipes-security/optee-imx/optee-client_3.10.0.imx.bb b/recipes-security/optee-imx/optee-client_3.10.0.imx.bb
index 51c75bd16..2ad55a645 100644
--- a/recipes-security/optee-imx/optee-client_3.10.0.imx.bb
+++ b/recipes-security/optee-imx/optee-client_3.10.0.imx.bb
@@ -49,4 +49,4 @@ INSANE_SKIP:${PN} = "ldflags dev-elf"
 INSANE_SKIP:${PN}-dev = "ldflags dev-elf"
 INSANE_SKIP:tee-supplicant = "ldflags"
 
-COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-security/optee-imx/optee-os_3.10.0.imx.bb b/recipes-security/optee-imx/optee-os_3.10.0.imx.bb
index 9b91f25e5..003aeba2f 100644
--- a/recipes-security/optee-imx/optee-os_3.10.0.imx.bb
+++ b/recipes-security/optee-imx/optee-os_3.10.0.imx.bb
@@ -25,18 +25,18 @@ PLATFORM_FLAVOR                   = "${@d.getVar('MACHINE')[1:]}"
 PLATFORM_FLAVOR:imx6qdlsabresd    = "mx6qsabresd"
 PLATFORM_FLAVOR:imx6qdlsabreauto  = "mx6qsabreauto"
 PLATFORM_FLAVOR:imx6qpdlsolox     = "mx6qsabresd"
-PLATFORM_FLAVOR:imx6ul7d          = "mx6ulevk"
-PLATFORM_FLAVOR:imx6ull14x14evk   = "mx6ullevk"
-PLATFORM_FLAVOR:imx6ull9x9evk     = "mx6ullevk"
-PLATFORM_FLAVOR:imx6ulz-14x14-evk = "mx6ulzevk"
-PLATFORM_FLAVOR:mx8mq             = "mx8mqevk"
-PLATFORM_FLAVOR:mx8mm             = "mx8mmevk"
-PLATFORM_FLAVOR:mx8mn             = "mx8mnevk"
-PLATFORM_FLAVOR:mx8mp             = "mx8mpevk"
-PLATFORM_FLAVOR:mx8qm             = "mx8qmmek"
-PLATFORM_FLAVOR:mx8qxp            = "mx8qxpmek"
-PLATFORM_FLAVOR:mx8dx             = "mx8dxmek"
-PLATFORM_FLAVOR:mx8dxl            = "mx8dxlevk"
+PLATFORM_FLAVOR:imx6ul            = "mx6ulevk"
+PLATFORM_FLAVOR:imx6ull           = "mx6ullevk"
+PLATFORM_FLAVOR:imx6ull           = "mx6ullevk"
+PLATFORM_FLAVOR:imx6ulz           = "mx6ulzevk"
+PLATFORM_FLAVOR:mx8mq-nxp-bsp             = "mx8mqevk"
+PLATFORM_FLAVOR:mx8mm-nxp-bsp             = "mx8mmevk"
+PLATFORM_FLAVOR:mx8mn-nxp-bsp             = "mx8mnevk"
+PLATFORM_FLAVOR:mx8mp-nxp-bsp             = "mx8mpevk"
+PLATFORM_FLAVOR:mx8qm-nxp-bsp             = "mx8qmmek"
+PLATFORM_FLAVOR:mx8qxp-nxp-bsp            = "mx8qxpmek"
+PLATFORM_FLAVOR:mx8dx-nxp-bsp             = "mx8dxmek"
+PLATFORM_FLAVOR:mx8dxl-nxp-bsp            = "mx8dxlevk"
 
 OPTEE_ARCH ?= "arm32"
 OPTEE_ARCH:armv7a = "arm32"
@@ -93,4 +93,4 @@ FILES:${PN}-staticdev = "/usr/include/optee/"
 RDEPENDS:${PN}-dev += "${PN}-staticdev"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(imx|imx-boot-container)"
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-security/optee-imx/optee-test_3.10.0.imx.bb b/recipes-security/optee-imx/optee-test_3.10.0.imx.bb
index 26339d61b..7039d0c4c 100644
--- a/recipes-security/optee-imx/optee-test_3.10.0.imx.bb
+++ b/recipes-security/optee-imx/optee-test_3.10.0.imx.bb
@@ -60,4 +60,4 @@ do_install () {
 
 FILES:${PN} = "/usr/bin/ /lib*/optee_armtz/"
 
-COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"