From 4ee8c933aa9726f0493ead14b4e1c97a0844ec28 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 7 May 2020 15:55:04 -0400 Subject: Add i.MX8MQ EVK support Add imx8mqevk-viv machine template for i.MX8MQ EVK which uses the default Vivante driver configuration in meta-freescale with the new community linux-fslc-imx kernel. The following additional changes have been made to support this: - A linux-fslc-imx bbappend has been added to pull in the AGL kernel configuration, and a imx8mq-evkb config fragment has been added to enable the required Wifi driver for the updated EVKB board. - Stale qtbase and weston-init bbappends/patches have been removed from meta-agl-bsp/meta-freescale-layer. - The meta-agl-profile-graphical Weston 8.0.0 bbappend has been renamed to 8.0.% so the wildcard will apply it to meta-freescale's weston_8.0.0.imx recipe. Known issues: - The required PipeWire configuration for the onboard audio needs further investigation. Bug-AGL: SPEC-3258 Signed-off-by: Scott Murray Change-Id: I4ea5437ef0ea8bedb9dd2157f2822ff25ee56cff --- .../recipes-graphics/wayland/weston-init.bbappend | 1 - .../recipes-kernel/linux/files/imx8mq-evkb.cfg | 1 + .../recipes-kernel/linux/linux-fslc-imx_%.bbappend | 24 ++++++++++++++++++++++ .../qt5/qtbase/0014-Add-IMX-GPU-support.patch | 17 --------------- .../recipes-qt/qt5/qtbase_%.bbappend | 5 ----- 5 files changed, 25 insertions(+), 23 deletions(-) delete mode 100644 meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-init.bbappend create mode 100644 meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/files/imx8mq-evkb.cfg create mode 100644 meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx_%.bbappend delete mode 100644 meta-agl-bsp/meta-freescale-layer/recipes-qt/qt5/qtbase/0014-Add-IMX-GPU-support.patch delete mode 100644 meta-agl-bsp/meta-freescale-layer/recipes-qt/qt5/qtbase_%.bbappend (limited to 'meta-agl-bsp/meta-freescale-layer') diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-init.bbappend b/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-init.bbappend deleted file mode 100644 index 2e1c950ec..000000000 --- a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-init.bbappend +++ /dev/null @@ -1 +0,0 @@ -WESTONARGS_append_imxgpu3d = " --use-gl" diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/files/imx8mq-evkb.cfg b/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/files/imx8mq-evkb.cfg new file mode 100644 index 000000000..92915921f --- /dev/null +++ b/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/files/imx8mq-evkb.cfg @@ -0,0 +1 @@ +CONFIG_BRCMSMAC=m 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 new file mode 100644 index 000000000..33e72bf7d --- /dev/null +++ b/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx_%.bbappend @@ -0,0 +1,24 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +require recipes-kernel/linux/linux-agl.inc + +# Make sure these are enabled so that AGL configurations work +SRC_URI_append = " file://tmpfs.cfg" +KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/tmpfs.cfg" +SRC_URI_append = " file://namespace.cfg" +KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/namespace.cfg" +SRC_URI_append = " file://cgroup.cfg" +KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/cgroup.cfg" + +# Support for CFG80211 subsystem +SRC_URI_append = " file://cfg80211.cfg" +KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/cfg80211.cfg" + +# Support for i.MX8MQ EVKB (e.g. Broadcom wifi) +SRC_URI_append_imx8mqevk = " file://imx8mq-evkb.cfg" +KERNEL_CONFIG_FRAGMENTS_append_imx8mqevk = " ${WORKDIR}/imx8mq-evkb.cfg" + +# Turn off a couple of things enabled by default by Freescale +# (lock debugging and userspace firmware loader fallback) +SRC_URI_append = " file://fixups.cfg" +KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/fixups.cfg" diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-qt/qt5/qtbase/0014-Add-IMX-GPU-support.patch b/meta-agl-bsp/meta-freescale-layer/recipes-qt/qt5/qtbase/0014-Add-IMX-GPU-support.patch deleted file mode 100644 index 8489b6f39..000000000 --- a/meta-agl-bsp/meta-freescale-layer/recipes-qt/qt5/qtbase/0014-Add-IMX-GPU-support.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: git/mkspecs/linux-oe-g++/qmake.conf -=================================================================== ---- git.orig/mkspecs/linux-oe-g++/qmake.conf 2016-12-14 16:51:48.468955533 -0600 -+++ git/mkspecs/linux-oe-g++/qmake.conf 2016-12-14 17:03:17.000000000 -0600 -@@ -39,5 +39,12 @@ isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG - - include(../oe-device-extra.pri) - -+QMAKE_CFLAGS += -DLINUX=1 -DEGL_API_FB=1 -+QMAKE_CXXFLAGS += -DLINUX=1 -DEGL_API_FB=1 -+ -+QMAKE_LIBS_EGL += -lEGL -+QMAKE_LIBS_OPENGL_ES2 += -lEGL -lGLESv2 -+QMAKE_LIBS_OPENVG += -lEGL -lOpenVG -+ - load(device_config) - load(qt_config) diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-qt/qt5/qtbase_%.bbappend b/meta-agl-bsp/meta-freescale-layer/recipes-qt/qt5/qtbase_%.bbappend deleted file mode 100644 index c4afc30eb..000000000 --- a/meta-agl-bsp/meta-freescale-layer/recipes-qt/qt5/qtbase_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ - -# Fixing Qt5.8 build breaks by overriding original patches with ours -# This will be fixed in the latest meta-freescale upstream -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -- cgit 1.2.3-korg