From 54e9bf9eda7d668df5d71dcc5974c22db5e3eecb Mon Sep 17 00:00:00 2001 From: Bechir Mghirbi Date: Fri, 22 Mar 2019 08:00:38 +0100 Subject: Fix imx6qdlsabreauto machine configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The imx6qsabreauto target was falling behind and could not be build for GG-7.0. The commit 808fff5 from 'AGL-repo' removed reference to external repos meta-freescale-3rdparty and meta-freescale-distro. However 'meta-agl' was not updated to follow up on this change which broke configuration for imx6 based targets. This patch makes the required changes to fix the imx6qsabreauto machine configuration: - removes reference to deleted layers: meta-freescale-3rdparty and meta-freescale-distro - updates MACHINE value to imx6qdlsabreauto as defined in meta-freescale layer - deletes reference to packagegroup-fscl-* not required to build AGL - add "agl-medium-arm-compiler" to DISTRO_FEATURES so DEFAULTTUNE is correctly set to 'armv7athf-neon' v2 (jsmoeller): moved board name to match MACHINE v3 (bechir.mghirbi): - remove wayland_2.0.0 as weston_4.0.0.imx is used. - use default IMAGE_FSTYPES as bitbake is complaining that no IMAGE_CMD defined for IMAGE_FSTYPES entry 'sdcard' - Add CFG80211 Kernel configuration Change-Id: Ib8b1d254972c737725247a5b13ce333e8ef9d4dc Signed-off-by: Bechir Mghirbi Signed-off-by: Jan-Simon Möller --- templates/machine/imx6qdlsabreauto/40_bblayers.conf.inc | 5 +++++ templates/machine/imx6qdlsabreauto/50_local.conf.inc | 4 ++++ templates/machine/imx6qdlsabreauto/50_setup.sh | 2 ++ templates/machine/imx6qsabreauto/40_bblayers.conf.inc | 7 ------- templates/machine/imx6qsabreauto/50_local.conf.inc | 4 ---- templates/machine/imx6qsabreauto/50_setup.sh | 2 -- 6 files changed, 11 insertions(+), 13 deletions(-) create mode 100644 templates/machine/imx6qdlsabreauto/40_bblayers.conf.inc create mode 100644 templates/machine/imx6qdlsabreauto/50_local.conf.inc create mode 100644 templates/machine/imx6qdlsabreauto/50_setup.sh delete mode 100644 templates/machine/imx6qsabreauto/40_bblayers.conf.inc delete mode 100644 templates/machine/imx6qsabreauto/50_local.conf.inc delete mode 100644 templates/machine/imx6qsabreauto/50_setup.sh (limited to 'templates') diff --git a/templates/machine/imx6qdlsabreauto/40_bblayers.conf.inc b/templates/machine/imx6qdlsabreauto/40_bblayers.conf.inc new file mode 100644 index 000000000..779006506 --- /dev/null +++ b/templates/machine/imx6qdlsabreauto/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}/meta-freescale \ + " diff --git a/templates/machine/imx6qdlsabreauto/50_local.conf.inc b/templates/machine/imx6qdlsabreauto/50_local.conf.inc new file mode 100644 index 000000000..58e3c7d02 --- /dev/null +++ b/templates/machine/imx6qdlsabreauto/50_local.conf.inc @@ -0,0 +1,4 @@ +MACHINE = "imx6qdlsabreauto" +#see meta-agl/meta-agl-bsp/conf/include/agl_imx6qsabreauto.inc +require conf/include/agl_imx6qdlsabreauto.inc + diff --git a/templates/machine/imx6qdlsabreauto/50_setup.sh b/templates/machine/imx6qdlsabreauto/50_setup.sh new file mode 100644 index 000000000..bb22790dc --- /dev/null +++ b/templates/machine/imx6qdlsabreauto/50_setup.sh @@ -0,0 +1,2 @@ +find_and_ack_eula $METADIR/meta-freescale EULA +export EULA_FLAG_NAME="ACCEPT_FSL_EULA" diff --git a/templates/machine/imx6qsabreauto/40_bblayers.conf.inc b/templates/machine/imx6qsabreauto/40_bblayers.conf.inc deleted file mode 100644 index f09144959..000000000 --- a/templates/machine/imx6qsabreauto/40_bblayers.conf.inc +++ /dev/null @@ -1,7 +0,0 @@ -# This must be parsed after qt5, etc. layers so that they are correctly -# recognized by meta-freescale/dynamic-layers -BBLAYERS =+ "\ - ${METADIR}/meta-freescale \ - ${METADIR}/meta-freescale-3rdparty \ - ${METADIR}/meta-freescale-distro \ - " diff --git a/templates/machine/imx6qsabreauto/50_local.conf.inc b/templates/machine/imx6qsabreauto/50_local.conf.inc deleted file mode 100644 index cbfda6a86..000000000 --- a/templates/machine/imx6qsabreauto/50_local.conf.inc +++ /dev/null @@ -1,4 +0,0 @@ -MACHINE = "imx6qsabreauto" -#see meta-agl/meta-agl-bsp/conf/include/agl_imx6qsabreauto.inc -require conf/include/agl_imx6qsabreauto.inc - diff --git a/templates/machine/imx6qsabreauto/50_setup.sh b/templates/machine/imx6qsabreauto/50_setup.sh deleted file mode 100644 index bb22790dc..000000000 --- a/templates/machine/imx6qsabreauto/50_setup.sh +++ /dev/null @@ -1,2 +0,0 @@ -find_and_ack_eula $METADIR/meta-freescale EULA -export EULA_FLAG_NAME="ACCEPT_FSL_EULA" -- cgit 1.2.3-korg