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 --- templates/machine/imx8mq-evk/40_bblayers.conf.inc | 5 +++++ templates/machine/imx8mq-evk/50_local.conf.inc | 3 +++ templates/machine/imx8mq-evk/50_setup.sh | 2 ++ templates/machine/imx8mq-evk/README_machine_imx8mq-evk.md | 13 +++++++++++++ templates/machine/imx8mqevk-viv/40_bblayers.conf.inc | 5 ----- templates/machine/imx8mqevk-viv/50_local.conf.inc | 3 --- templates/machine/imx8mqevk-viv/50_setup.sh | 2 -- .../machine/imx8mqevk-viv/README_machine_imx8mqevk-viv.md | 9 --------- templates/machine/imx8mqevk/40_bblayers.conf.inc | 5 ----- templates/machine/imx8mqevk/50_local.conf.inc | 3 --- templates/machine/imx8mqevk/50_setup.sh | 2 -- templates/machine/imx8mqevk/README_machine_imx8mqevk.md | 13 ------------- 12 files changed, 23 insertions(+), 42 deletions(-) create mode 100644 templates/machine/imx8mq-evk/40_bblayers.conf.inc create mode 100644 templates/machine/imx8mq-evk/50_local.conf.inc create mode 100644 templates/machine/imx8mq-evk/50_setup.sh create mode 100644 templates/machine/imx8mq-evk/README_machine_imx8mq-evk.md delete mode 100644 templates/machine/imx8mqevk-viv/40_bblayers.conf.inc delete mode 100644 templates/machine/imx8mqevk-viv/50_local.conf.inc delete mode 100644 templates/machine/imx8mqevk-viv/50_setup.sh delete mode 100644 templates/machine/imx8mqevk-viv/README_machine_imx8mqevk-viv.md delete mode 100644 templates/machine/imx8mqevk/40_bblayers.conf.inc delete mode 100644 templates/machine/imx8mqevk/50_local.conf.inc delete mode 100644 templates/machine/imx8mqevk/50_setup.sh delete mode 100644 templates/machine/imx8mqevk/README_machine_imx8mqevk.md (limited to 'templates') diff --git a/templates/machine/imx8mq-evk/40_bblayers.conf.inc b/templates/machine/imx8mq-evk/40_bblayers.conf.inc new file mode 100644 index 000000000..edcb6a3a2 --- /dev/null +++ b/templates/machine/imx8mq-evk/40_bblayers.conf.inc @@ -0,0 +1,5 @@ +# 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/50_local.conf.inc b/templates/machine/imx8mq-evk/50_local.conf.inc new file mode 100644 index 000000000..8a178e28b --- /dev/null +++ b/templates/machine/imx8mq-evk/50_local.conf.inc @@ -0,0 +1,3 @@ +MACHINE = "imx8mq-evk" +#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mq-evk.inc +require conf/include/agl_imx8mq-evk.inc diff --git a/templates/machine/imx8mq-evk/50_setup.sh b/templates/machine/imx8mq-evk/50_setup.sh new file mode 100644 index 000000000..eefd1eb7f --- /dev/null +++ b/templates/machine/imx8mq-evk/50_setup.sh @@ -0,0 +1,2 @@ +find_and_ack_eula $METADIR/bsp/meta-freescale EULA +export EULA_FLAG_NAME="ACCEPT_FSL_EULA" diff --git a/templates/machine/imx8mq-evk/README_machine_imx8mq-evk.md b/templates/machine/imx8mq-evk/README_machine_imx8mq-evk.md new file mode 100644 index 000000000..ea9ddacce --- /dev/null +++ b/templates/machine/imx8mq-evk/README_machine_imx8mq-evk.md @@ -0,0 +1,13 @@ +--- +description: i.MX8MQ EVK with etnaviv GPU driver +authors: Scott Murray +--- + +### 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 imx8mq-evk-viv template using the NXP Vivante +driver may be a better choice for those not interested in etnaviv +debugging and development. + diff --git a/templates/machine/imx8mqevk-viv/40_bblayers.conf.inc b/templates/machine/imx8mqevk-viv/40_bblayers.conf.inc deleted file mode 100644 index edcb6a3a2..000000000 --- a/templates/machine/imx8mqevk-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/imx8mqevk-viv/50_local.conf.inc b/templates/machine/imx8mqevk-viv/50_local.conf.inc deleted file mode 100644 index e9668c307..000000000 --- a/templates/machine/imx8mqevk-viv/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "imx8mqevk" -#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk-viv.inc -require conf/include/agl_imx8mqevk-viv.inc diff --git a/templates/machine/imx8mqevk-viv/50_setup.sh b/templates/machine/imx8mqevk-viv/50_setup.sh deleted file mode 100644 index eefd1eb7f..000000000 --- a/templates/machine/imx8mqevk-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/imx8mqevk-viv/README_machine_imx8mqevk-viv.md b/templates/machine/imx8mqevk-viv/README_machine_imx8mqevk-viv.md deleted file mode 100644 index be30e00fe..000000000 --- a/templates/machine/imx8mqevk-viv/README_machine_imx8mqevk-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. - diff --git a/templates/machine/imx8mqevk/40_bblayers.conf.inc b/templates/machine/imx8mqevk/40_bblayers.conf.inc deleted file mode 100644 index edcb6a3a2..000000000 --- a/templates/machine/imx8mqevk/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/imx8mqevk/50_local.conf.inc b/templates/machine/imx8mqevk/50_local.conf.inc deleted file mode 100644 index 5f9b95943..000000000 --- a/templates/machine/imx8mqevk/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "imx8mqevk" -#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk.inc -require conf/include/agl_imx8mqevk.inc diff --git a/templates/machine/imx8mqevk/50_setup.sh b/templates/machine/imx8mqevk/50_setup.sh deleted file mode 100644 index eefd1eb7f..000000000 --- a/templates/machine/imx8mqevk/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/imx8mqevk/README_machine_imx8mqevk.md b/templates/machine/imx8mqevk/README_machine_imx8mqevk.md deleted file mode 100644 index 5d2bcbd37..000000000 --- a/templates/machine/imx8mqevk/README_machine_imx8mqevk.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -description: i.MX8MQ EVK with etnaviv GPU driver -authors: Scott Murray ---- - -### Machine imx8mqevk - -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 -driver may be a better choice for those not interested in etnaviv -debugging and development. - -- cgit 1.2.3-korg