From 0dc8256d65e78dec2055fdc14ea9c731817bce3b Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 16 Jan 2025 17:40:10 -0500 Subject: [PATCH] meta-agl-bsp: remove imx8mx-evk-viv configuration Since weston-imx still has not been updated to 13.x, remove the NXP BSP (i.e. Vivante driver) based configuration for the i.MX8MQ EVK to avoid confusion. This can be revisited in the future if NXP catch up and/or members express interest in supporting older versions of Weston in agl-compositor. Bug-AGL: SPEC-5340 Change-Id: I642f43f2c12728f251bbfef2bcfbc77a8d5326be Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30769 Reviewed-by: Jan-Simon Moeller Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account (cherry picked from commit 4ae7b0ac97d6adca3821ac4b05b8587d0445d087) Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30750 ci-image-boot-test: Jenkins Job builder account --- meta-agl-bsp/conf/include/agl_imx8mq-evk-viv.inc | 8 -------- .../recipes-graphics/wayland/weston_12.0.3.imx.bbappend | 2 -- templates/machine/imx8mq-evk-viv/40_bblayers.conf.inc | 5 ----- templates/machine/imx8mq-evk-viv/50_setup.sh | 2 -- .../machine/imx8mq-evk-viv/README_machine_imx8mq-evk-viv.md | 9 --------- 5 files changed, 26 deletions(-) delete mode 100644 meta-agl-bsp/conf/include/agl_imx8mq-evk-viv.inc delete mode 100644 meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston_12.0.3.imx.bbappend delete mode 100644 templates/machine/imx8mq-evk-viv/40_bblayers.conf.inc delete mode 100644 templates/machine/imx8mq-evk-viv/50_setup.sh delete mode 100644 templates/machine/imx8mq-evk-viv/README_machine_imx8mq-evk-viv.md diff --git a/meta-agl-bsp/conf/include/agl_imx8mq-evk-viv.inc b/meta-agl-bsp/conf/include/agl_imx8mq-evk-viv.inc deleted file mode 100644 index 3988fcd6f..000000000 --- a/meta-agl-bsp/conf/include/agl_imx8mq-evk-viv.inc +++ /dev/null @@ -1,8 +0,0 @@ -require agl_imx8mq-evk-common.inc - -IMX_DEFAULT_BSP = "nxp" - -# NOTE: -# There is some potential benefit to using the community supported -# linux-fslc-imx hybrid kernel here, but keeping the configuration -# close to upstream to ease maintenance seems worthwhile. diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston_12.0.3.imx.bbappend b/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston_12.0.3.imx.bbappend deleted file mode 100644 index ca162e28f..000000000 --- a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston_12.0.3.imx.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# Use provided hook to disable removal of wayland from PACKAGECONFIG -PACKAGECONFIG_IMX_REMOVALS = "x11" diff --git a/templates/machine/imx8mq-evk-viv/40_bblayers.conf.inc b/templates/machine/imx8mq-evk-viv/40_bblayers.conf.inc deleted file mode 100644 index edcb6a3a2..000000000 --- a/templates/machine/imx8mq-evk-viv/40_bblayers.conf.inc +++ /dev/null @@ -1,5 +0,0 @@ -# This must be parsed after qt5, etc. layers so that they are correctly -# recognized by meta-freescale/dynamic-layers -BBLAYERS =+ "\ - ${METADIR}/bsp/meta-freescale \ - " diff --git a/templates/machine/imx8mq-evk-viv/50_setup.sh b/templates/machine/imx8mq-evk-viv/50_setup.sh deleted file mode 100644 index eefd1eb7f..000000000 --- a/templates/machine/imx8mq-evk-viv/50_setup.sh +++ /dev/null @@ -1,2 +0,0 @@ -find_and_ack_eula $METADIR/bsp/meta-freescale EULA -export EULA_FLAG_NAME="ACCEPT_FSL_EULA" diff --git a/templates/machine/imx8mq-evk-viv/README_machine_imx8mq-evk-viv.md b/templates/machine/imx8mq-evk-viv/README_machine_imx8mq-evk-viv.md deleted file mode 100644 index be30e00fe..000000000 --- a/templates/machine/imx8mq-evk-viv/README_machine_imx8mq-evk-viv.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: i.MX8MQ EVK with Vivante GPU driver -authors: Scott Murray ---- - -### Machine imx8mqevk-viv - -i.MX8MQ EVK and EVKB boards with Vivante GPU driver support. - -- 2.16.6