# Force use of the community supported LTS kernel instead of the
# default linux-imx
-IMX_DEFAULT_KERNEL:imx8mqevk = "linux-fslc-imx"
+#IMX_DEFAULT_KERNEL:imx8mq-evk = "linux-fslc-imx"
# For EVKB wifi support
-MACHINE_FEATURES:append = " bcm4356"
+#MACHINE_FEATURES:append = " bcm4356"
# Add helper to drive setting up HCI UART device
MACHINE_EXTRA_RRECOMMENDS:append = " hci-uart-helper"
--- /dev/null
+include agl_imx8mq-evk-common.inc
+
+# NOTE: currently not using IMX_DEFAULT_BSP = "mainline", as it
+# requires more changes than this approach of disabling
+# Vivante.
+
+# Add our own over-ride for use in a few recipes where there is
+# conflicting Vivante vs etnaviv configuration.
+#MACHINEOVERRIDES .= ":etnaviv"
+
+# Knock out Vivante overrides
+#MACHINEOVERRIDES_EXTENDER:mx8mq:forcevariable = ""
+#PREFERRED_VERSION_weston_mx8 = "8.0.0"
+#PREFERRED_VERSION_wayland-protocols_mx8 = "1.20"
+#PREFERRED_VERSION_libdrm_mx8 = "2.4.101"
+
+#CORE_IMAGE_EXTRA_INSTALL += "libdrm-etnaviv"
+
+#PREFERRED_VERSION_gstreamer1.0_mx8 = "1.16.3"
+#PREFERRED_VERSION_gstreamer1.0-plugins-base_mx8 = "1.16.3"
+#PREFERRED_VERSION_gstreamer1.0-plugins-good_mx8 = "1.16.3"
+#PREFERRED_VERSION_gstreamer1.0-plugins-bad_mx8 = "1.16.3"
+#PREFERRED_VERSION_gstreamer1.0-plugins-ugly_mx8 = "1.16.3"
+++ /dev/null
-include agl_imx8mqevk-common.inc
+++ /dev/null
-include agl_imx8mqevk-common.inc
-
-# NOTE: currently not using IMX_DEFAULT_BSP = "mainline", as it
-# requires more changes than this approach of disabling
-# Vivante.
-
-# Add our own over-ride for use in a few recipes where there is
-# conflicting Vivante vs etnaviv configuration.
-MACHINEOVERRIDES .= ":etnaviv"
-
-# Knock out Vivante overrides
-MACHINEOVERRIDES_EXTENDER:mx8mq:forcevariable = ""
-PREFERRED_VERSION_weston_mx8 = "8.0.0"
-PREFERRED_VERSION_wayland-protocols_mx8 = "1.20"
-PREFERRED_VERSION_libdrm_mx8 = "2.4.101"
-
-CORE_IMAGE_EXTRA_INSTALL += "libdrm-etnaviv"
-
-PREFERRED_VERSION_gstreamer1.0_mx8 = "1.16.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-base_mx8 = "1.16.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-good_mx8 = "1.16.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad_mx8 = "1.16.3"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly_mx8 = "1.16.3"
file://hci-uart-helper.sh \
"
-COMPATIBLE_MACHINE = "imx8mqevk"
+COMPATIBLE_MACHINE = "imx8mq-evk"
do_configure[noexec] = "1"
do_compile[noexec] = "1"
+++ /dev/null
-Add i.MX8MQ DCSS kmsro support
-
-Add required dummy entry for NXP's i.MX8MQ DCSS display controller DRM
-driver to the kmsro configuration so that the loader will not think it
-is a GPU.
-
-Upstream-Status: pending
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
----
-
-diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
-index ae25a21..17379c7 100644
---- a/src/gallium/targets/dri/meson.build
-+++ b/src/gallium/targets/dri/meson.build
-@@ -72,6 +72,7 @@ foreach d : [[with_gallium_kmsro, [
- 'hx8357d_dri.so',
- 'ili9225_dri.so',
- 'ili9341_dri.so',
-+ 'imx-dcss_dri.so',
- 'imx-drm_dri.so',
- 'ingenic-drm_dri.so',
- 'mcde_dri.so',
-diff --git a/src/gallium/targets/dri/target.c b/src/gallium/targets/dri/target.c
-index f71f690..41c5c75 100644
---- a/src/gallium/targets/dri/target.c
-+++ b/src/gallium/targets/dri/target.c
-@@ -97,6 +97,7 @@ DEFINE_LOADER_DRM_ENTRYPOINT(exynos)
- DEFINE_LOADER_DRM_ENTRYPOINT(hx8357d)
- DEFINE_LOADER_DRM_ENTRYPOINT(ili9225)
- DEFINE_LOADER_DRM_ENTRYPOINT(ili9341)
-+DEFINE_LOADER_DRM_ENTRYPOINT(imx_dcss)
- DEFINE_LOADER_DRM_ENTRYPOINT(imx_drm)
- DEFINE_LOADER_DRM_ENTRYPOINT(ingenic_drm)
- DEFINE_LOADER_DRM_ENTRYPOINT(mcde)
+++ /dev/null
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://0001-kmsro-add-imx-dcss.patch"
-
-# These over-rides should use "use-mainline-bsp" instead when that
-# becomes more workable for i.MX8 in upstream meta-freescale.
-
-USE_OSMESA_ONLY:etnaviv = "no"
-
-PACKAGECONFIG:append:etnaviv = " gallium etnaviv kmsro"
+++ /dev/null
-# Work around PACKAGECONFIG:remove of "x11 wayland" added to the recipe
-# in meta-freescale commit 5a5c5dd. This can be removed once the issue
-# has been resolved by a revert of that breakage upstream.
-# What is done below is effectively a disabling of the "wayland"
-# PACKAGECONFIG option and then open coding what its effects would
-# normally be, since the _remove prevents specifying it in the usual way.
-PACKAGECONFIG[wayland] = ""
-DEPENDS:append = " virtual/egl virtual/libgles2"
-PACKAGECONFIG_CONFARGS:append = " -Dbackend-wayland=true"
-
--- /dev/null
+MACHINE = "imx8mq-evk"
+#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mq-evk.inc
+require conf/include/agl_imx8mq-evk.inc
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.
+++ /dev/null
-MACHINE = "imx8mqevk"
-#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk-viv.inc
-require conf/include/agl_imx8mqevk-viv.inc
+++ /dev/null
----
-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.
-
+++ /dev/null
-# This must be parsed after qt5, etc. layers so that they are correctly
-# recognized by meta-freescale/dynamic-layers
-BBLAYERS =+ "\
- ${METADIR}/bsp/meta-freescale \
- "
+++ /dev/null
-MACHINE = "imx8mqevk"
-#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk.inc
-require conf/include/agl_imx8mqevk.inc
+++ /dev/null
-find_and_ack_eula $METADIR/bsp/meta-freescale EULA
-export EULA_FLAG_NAME="ACCEPT_FSL_EULA"