Generalize overrides subsystem for NXP and Mainline support

Essentially, we extend the overrides to a generic-bsp, nxp-bsp, and
mainline-bsp.

So, for example, the mx8mq override is split into:

- imx-generic-bsp: compatible with every i.MX SoC and both BSP variants
- imx-nxp-bsp: compatible with every i.MX SoC but specific to NXP BSP
- imx-mainline-bsp: compatible with every i.MX SoC but specific to Mainline BSP

- mx8-generic-bsp: compatible with every i.MX8 SoC and both BSP variants
- mx8-nxp-bsp: compatible with every i.MX8 SoC but specific to NXP BSP
- mx8-mainline-bsp: compatible with every i.MX8 SoC but specific to Mainline BSP

- mx8m-generic-bsp: compatible with every i.MX8M SoC and both BSP variants
- mx8m-nxp-bsp: compatible with every i.MX8M SoC but specific to NXP BSP
- mx8m-mainline-bsp: compatible with every i.MX8M SoC but specific to Mainline BSP

- mx8mq-generic-bsp: compatible with every i.MX8MQ SoC and both BSP variants
- mx8mq-nxp-bsp: compatible with every i.MX8MQ SoC8 but specific to NXP BSP
- mx8mq-mainline-bsp: compatible with every i.MX8MQ SoC but specific to Mainline BSP

The extender mechanism is responsible for extending the override list to
include the generic overrides. We can then use the three different
variants to handle the metadata correctly.

Generically speaking, the conversion mainly was automated (with a lot of
back and forth until getting it right).

To convert an existing layer, the following script can be used:

```sh
  git ls-files classes recipes-* \
      | xargs sed -i \
              -e 's,:\(mx[6-8]\w*\),:\1-nxp-bsp,g' \
              -e 's,(\(mx[6-8]\w*\)),(\1-nxp-bsp),g' \
              -e 's,\(mx[6-8]\w*\)|,\1-nxp-bsp|,g' \
              -e 's,|\(mx[6-8]\w*\)),|\1-nxp-bsp),g' \
              \
              -e 's,:\(mx[5s]\w*\),:\1-generic-bsp,g' \
              -e 's,(\(mx[5s]\w*\)),(\1-generic-bsp),g' \
              -e 's,\(mx[5s]\w*\)|,\1-generic-bsp|,g' \
              -e 's,|\(mx[5s]\w*\)),|\1-generic-bsp),g' \
              \
              -e 's,:\(vf\w*\),:\1-generic-bsp,g' \
              -e 's,:\(vf[56]0\w*\),:\1-generic-bsp,g' \
              -e 's,\(vf\w*\)|,\1-generic-bsp|,g' \
              -e 's,|\(vf\w*\)),|\1-generic-bsp),g' \
              -e 's,\(vf[56]0\w*\)|,\1-generic-bsp|,g' \
              -e 's,|\(vf[56]0\w*\)),|\1-generic-bsp),g' \
              \
              -e 's,:\(imx\) ,:\1-nxp-bsp ,g' \
              -e 's,(\(imx\)),(\1-nxp-bsp),g' \
              -e 's,\(imx\)|,\1-nxp-bsp|,g' \
              -e 's,|\(imx\)),|\1-nxp-bsp),g'

  for d in $(find -type d | egrep '/mx[6-8]w*'); do
      git mv $d $d-nxp-bsp
  done

  for d in $(find -type d | egrep '/imx$'); do
      git mv $d $d-nxp-bsp
  done

  for d in $(find -type d | egrep '/mx[5s]w*'); do
      git mv $d $d-generic-bsp
  done
```

Fixes: #791.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

3 files changed, 11 insertions, 11 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 51c75bd1..2f5166d1 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 = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-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 9b91f25e..7164eadc 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
@@ -29,14 +29,14 @@ 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: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 26339d61..ef540bbc 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 = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)"