From fa5152323ad2bd3d433aec72c4fec6614656f06d Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Fri, 1 Apr 2022 12:03:39 -0400 Subject: meta-agl-bsp: Update i.MX8MQ EVK support for kirkstone Changes: - Rename machine template and related files to use imx8mq-evk instead of imx8mqevk to match meta-freescale change. - Switch to purely using the default "mainline" BSP configuration in meta-freescale for imx8mq-evk as opposed to the tweaking of the "nxp" configuration previously used. The mainline configuration now builds a working image, and this lowers maintenance on our part. - Remove imx8mqevk-viv configuration to build with Vivante GPU driver. NXP have not yet released Weston 10 support, and at this point the etnaviv driver is stable. If a demonstration of support of Vivante is requested in the future (e.g. for other i.MX8 variants that still require it), this can be revisited. Bug-AGL: SPEC-3819 Signed-off-by: Scott Murray Change-Id: I7e279268463f68978ecd2990927aab6d64e3cbd2 --- .../conf/include/agl_imx8mq-evk-common.inc | 13 ++++++++++++ meta-agl-bsp/conf/include/agl_imx8mq-evk.inc | 23 ++++++++++++++++++++++ meta-agl-bsp/conf/include/agl_imx8mqevk-common.inc | 13 ------------ meta-agl-bsp/conf/include/agl_imx8mqevk-viv.inc | 1 - meta-agl-bsp/conf/include/agl_imx8mqevk.inc | 23 ---------------------- 5 files changed, 36 insertions(+), 37 deletions(-) create mode 100644 meta-agl-bsp/conf/include/agl_imx8mq-evk-common.inc create mode 100644 meta-agl-bsp/conf/include/agl_imx8mq-evk.inc delete mode 100644 meta-agl-bsp/conf/include/agl_imx8mqevk-common.inc delete mode 100644 meta-agl-bsp/conf/include/agl_imx8mqevk-viv.inc delete mode 100644 meta-agl-bsp/conf/include/agl_imx8mqevk.inc (limited to 'meta-agl-bsp/conf') diff --git a/meta-agl-bsp/conf/include/agl_imx8mq-evk-common.inc b/meta-agl-bsp/conf/include/agl_imx8mq-evk-common.inc new file mode 100644 index 000000000..36493dcbf --- /dev/null +++ b/meta-agl-bsp/conf/include/agl_imx8mq-evk-common.inc @@ -0,0 +1,13 @@ +require agl_imx-common.inc + +# Force use of the community supported LTS kernel instead of the +# default linux-imx +#IMX_DEFAULT_KERNEL:imx8mq-evk = "linux-fslc-imx" + +# For EVKB wifi support +#MACHINE_FEATURES:append = " bcm4356" + +# Add helper to drive setting up HCI UART device +MACHINE_EXTRA_RRECOMMENDS:append = " hci-uart-helper" + +AGL_DEFAULT_INITRAMFS_FSTYPES := "" 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-common.inc b/meta-agl-bsp/conf/include/agl_imx8mqevk-common.inc deleted file mode 100644 index f3c4a736e..000000000 --- a/meta-agl-bsp/conf/include/agl_imx8mqevk-common.inc +++ /dev/null @@ -1,13 +0,0 @@ -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" - -# For EVKB wifi support -MACHINE_FEATURES:append = " bcm4356" - -# Add helper to drive setting up HCI UART device -MACHINE_EXTRA_RRECOMMENDS:append = " hci-uart-helper" - -AGL_DEFAULT_INITRAMFS_FSTYPES := "" 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" -- cgit 1.2.3-korg