Fix up i.MX8MQ EVK configuration

Changes:
- Since linux-fslc-lts does not boot on the EVK at the moment,
  and both it and linux-fslc still do not have support for the
  HDMI output, switch back to using linux-fslc-imx with tweaks
  to use etnaviv as we did pre-kirkstone.
- A bbappend has been added for linux-fslc-lts since that was
  missed in a previous upgrade, and even though we are not using
  it now, it is possibly useful for other i.MX variants.
- A machine template for using the NXP BSP with the Vivante GPU
  driver, imx8mq-evk-viv, has been restored, as testing shows it
  now works with the current panel-less homescreens.  As before,
  the intent of this configuration is for testing or as an example
  of potential production use of meta-freescale where NXP support
  is available.
- Start up of Bluetooth support has been disabled, as it currently
  causes kernel oopses or panics (both have been seen in testing).
  This happens with both machine templates.  SPEC-4807 has been
  opened to track this issue.

Bug-AGL: SPEC-4799

Change-Id: I38e4e720643714541efb0fed08d5ab64545bb02d
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/28925
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

4 files changed, 19 insertions, 0 deletions

diff --git a/templates/machine/imx8mq-evk-viv/40_bblayers.conf.inc b/templates/machine/imx8mq-evk-viv/40_bblayers.conf.inc
new file mode 100644
index 000000000..edcb6a3a2
--- /dev/null
+++ b/templates/machine/imx8mq-evk-viv/40_bblayers.conf.inc
@@ -0,0 +1,5 @@
+# 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/imx8mq-evk-viv/50_local.conf.inc b/templates/machine/imx8mq-evk-viv/50_local.conf.inc
new file mode 100644
index 000000000..7504c1120
--- /dev/null
+++ b/templates/machine/imx8mq-evk-viv/50_local.conf.inc
@@ -0,0 +1,3 @@
+MACHINE = "imx8mq-evk"
+#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mq-evk-viv.inc
+require conf/include/agl_imx8mq-evk-viv.inc
diff --git a/templates/machine/imx8mq-evk-viv/50_setup.sh b/templates/machine/imx8mq-evk-viv/50_setup.sh
new file mode 100644
index 000000000..eefd1eb7f
--- /dev/null
+++ b/templates/machine/imx8mq-evk-viv/50_setup.sh
@@ -0,0 +1,2 @@
+find_and_ack_eula $METADIR/bsp/meta-freescale EULA
+export EULA_FLAG_NAME="ACCEPT_FSL_EULA"
diff --git a/templates/machine/imx8mq-evk-viv/README_machine_imx8mq-evk-viv.md b/templates/machine/imx8mq-evk-viv/README_machine_imx8mq-evk-viv.md
new file mode 100644
index 000000000..be30e00fe
--- /dev/null
+++ b/templates/machine/imx8mq-evk-viv/README_machine_imx8mq-evk-viv.md
@@ -0,0 +1,9 @@
+---
+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.
+