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>

1 files changed, 3 insertions, 17 deletions

diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx_%.bbappend b/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx_%.bbappend
index cc26e25c6..0772a98a8 100644
--- a/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx_%.bbappend
+++ b/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx_%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
-require recipes-kernel/linux/linux-yocto-agl.inc
+require linux-fslc.inc
 
 # These patches and the configuration fragment below will need to be
 # revisited if/when using IMX_DEFAULT_BSP = "mainline" with i.MX8
@@ -10,22 +10,8 @@ SRC_URI:append:etnaviv = " \
     file://0002-dts-enable-etnaviv.patch \
 "
 
-# Make sure these are enabled so that AGL systemd configuration works
-AGL_KCONFIG_FRAGMENTS += " \
-    tmpfs.cfg \
-    namespace.cfg \
-    cgroup.cfg \
-"
-
-# Support for CFG80211 subsystem
-AGL_KCONFIG_FRAGMENTS += "cfg80211.cfg"
-
-# Turn off a couple of things enabled by default by Freescale
-# (lock debugging and userspace firmware loader fallback)
-AGL_KCONFIG_FRAGMENTS += "fixups.cfg"
-
 # Support for i.MX8MQ EVKB (e.g. Broadcom wifi)
-AGL_KCONFIG_FRAGMENTS:append:imx8mqevk = " imx8mq-evkb.cfg"
+AGL_KCONFIG_FRAGMENTS:append:imx8mq-evk = " imx8mq-evkb.cfg"
 
 # Build in etnaviv if required
 AGL_KCONFIG_FRAGMENTS:append:etnaviv = " etnaviv.cfg"