summaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta-agl-bsp/conf')
-rw-r--r--meta-agl-bsp/conf/include/agl_imx8mq-evk-common.inc (renamed from meta-agl-bsp/conf/include/agl_imx8mqevk-common.inc)4
-rw-r--r--meta-agl-bsp/conf/include/agl_imx8mq-evk.inc23
-rw-r--r--meta-agl-bsp/conf/include/agl_imx8mqevk-viv.inc1
-rw-r--r--meta-agl-bsp/conf/include/agl_imx8mqevk.inc23
4 files changed, 25 insertions, 26 deletions
diff --git a/meta-agl-bsp/conf/include/agl_imx8mqevk-common.inc b/meta-agl-bsp/conf/include/agl_imx8mq-evk-common.inc
index f3c4a736e..36493dcbf 100644
--- a/meta-agl-bsp/conf/include/agl_imx8mqevk-common.inc
+++ b/meta-agl-bsp/conf/include/agl_imx8mq-evk-common.inc
@@ -2,10 +2,10 @@ require agl_imx-common.inc
# 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"
diff --git a/meta-agl-bsp/conf/include/agl_imx8mq-evk.inc b/meta-agl-bsp/conf/include/agl_imx8mq-evk.inc
new file mode 100644
index 000000000..d04ee41a7
--- /dev/null
+++ b/meta-agl-bsp/conf/include/agl_imx8mq-evk.inc
@@ -0,0 +1,23 @@
+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"
diff --git a/meta-agl-bsp/conf/include/agl_imx8mqevk-viv.inc b/meta-agl-bsp/conf/include/agl_imx8mqevk-viv.inc
deleted file mode 100644
index 8227f5c06..000000000
--- a/meta-agl-bsp/conf/include/agl_imx8mqevk-viv.inc
+++ /dev/null
@@ -1 +0,0 @@
-include agl_imx8mqevk-common.inc
diff --git a/meta-agl-bsp/conf/include/agl_imx8mqevk.inc b/meta-agl-bsp/conf/include/agl_imx8mqevk.inc
deleted file mode 100644
index 6801722be..000000000
--- a/meta-agl-bsp/conf/include/agl_imx8mqevk.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-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"