9 files changed, 5 insertions, 24 deletions
diff --git a/templates/machine/imx8mqevk-viv/40_bblayers.conf.inc b/templates/machine/imx8mq-evk/40_bblayers.conf.inc
index edcb6a3a2..edcb6a3a2 100644
--- a/templates/machine/imx8mqevk-viv/40_bblayers.conf.inc
+++ b/templates/machine/imx8mq-evk/40_bblayers.conf.inc
diff --git a/templates/machine/imx8mq-evk/50_local.conf.inc b/templates/machine/imx8mq-evk/50_local.conf.inc
new file mode 100644
index 000000000..8a178e28b
--- /dev/null
+++ b/templates/machine/imx8mq-evk/50_local.conf.inc
@@ -0,0 +1,3 @@
+MACHINE = "imx8mq-evk"
+#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mq-evk.inc
+require conf/include/agl_imx8mq-evk.inc
diff --git a/templates/machine/imx8mqevk-viv/50_setup.sh b/templates/machine/imx8mq-evk/50_setup.sh
index eefd1eb7f..eefd1eb7f 100644
--- a/templates/machine/imx8mqevk-viv/50_setup.sh
+++ b/templates/machine/imx8mq-evk/50_setup.sh
diff --git a/templates/machine/imx8mqevk/README_machine_imx8mqevk.md b/templates/machine/imx8mq-evk/README_machine_imx8mq-evk.md
index 5d2bcbd37..ea9ddacce 100644
--- a/templates/machine/imx8mqevk/README_machine_imx8mqevk.md
+++ b/templates/machine/imx8mq-evk/README_machine_imx8mq-evk.md
@@ -3,11 +3,11 @@ description: i.MX8MQ EVK with etnaviv GPU driver
 authors: Scott Murray <scott.murray@konsulko.com>
 ---
 
-### Machine imx8mqevk
+### Machine imx8mq-evk
 
 i.MX8MQ EVK and EVKB boards with etnaviv GPU driver support.
 Note that etnaviv on the GC7000L GPU in the i.MX8MQ is currently still
-a work in progress, the imx8mqevk-viv template using the NXP Vivante
+a work in progress, the imx8mq-evk-viv template using the NXP Vivante
 driver may be a better choice for those not interested in etnaviv
 debugging and development.
 
diff --git a/templates/machine/imx8mqevk-viv/50_local.conf.inc b/templates/machine/imx8mqevk-viv/50_local.conf.inc
deleted file mode 100644
index e9668c307..000000000
--- a/templates/machine/imx8mqevk-viv/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "imx8mqevk"
-#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk-viv.inc
-require conf/include/agl_imx8mqevk-viv.inc
diff --git a/templates/machine/imx8mqevk-viv/README_machine_imx8mqevk-viv.md b/templates/machine/imx8mqevk-viv/README_machine_imx8mqevk-viv.md
deleted file mode 100644
index be30e00fe..000000000
--- a/templates/machine/imx8mqevk-viv/README_machine_imx8mqevk-viv.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-description: i.MX8MQ EVK with Vivante GPU driver
-authors: Scott Murray <scott.murray@konsulko.com>
----
-
-### Machine imx8mqevk-viv
-
-i.MX8MQ EVK and EVKB boards with Vivante GPU driver support.
-
diff --git a/templates/machine/imx8mqevk/40_bblayers.conf.inc b/templates/machine/imx8mqevk/40_bblayers.conf.inc
deleted file mode 100644
index edcb6a3a2..000000000
--- a/templates/machine/imx8mqevk/40_bblayers.conf.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# This must be parsed after qt5, etc. layers so that they are correctly
-# recognized by meta-freescale/dynamic-layers
-BBLAYERS =+ "\
-  ${METADIR}/bsp/meta-freescale \
-  "
diff --git a/templates/machine/imx8mqevk/50_local.conf.inc b/templates/machine/imx8mqevk/50_local.conf.inc
deleted file mode 100644
index 5f9b95943..000000000
--- a/templates/machine/imx8mqevk/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "imx8mqevk"
-#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk.inc
-require conf/include/agl_imx8mqevk.inc
diff --git a/templates/machine/imx8mqevk/50_setup.sh b/templates/machine/imx8mqevk/50_setup.sh
deleted file mode 100644
index eefd1eb7f..000000000
--- a/templates/machine/imx8mqevk/50_setup.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-find_and_ack_eula $METADIR/bsp/meta-freescale EULA
-export EULA_FLAG_NAME="ACCEPT_FSL_EULA"