meta-agl-bsp: Update i.MX8MQ EVK support for latest dunfell

[AGL/meta-agl.git] / meta-agl-bsp / conf / include / agl_imx6qdlsabreauto.inc

diff --git a/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc b/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc
index b3658af..0d8c6f2 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc
+++ b/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc
@@ -4,6 +4,11 @@ DISTRO_FEATURES_append = " agl-medium-arm-compiler"
 # etnaviv support.
 MACHINEOVERRIDES .= ":use-mainline-bsp"
 
+# Disable meta-freescale package architecure mangling, as it causes
+# issues with AGL's explicit setting of DEFAULTTUNE.
+INHERIT_remove = "fsl-dynamic-packagearch"
+MACHINE_SOCARCH = "${TUNE_PKGARCH}"
+
 # Disable the meta-freescale weston-init bbappend as it conflicts
 # with AGL's.
 BBMASK = "meta-freescale/recipes-graphics/wayland/weston-init"
@@ -11,6 +16,4 @@ BBMASK = "meta-freescale/recipes-graphics/wayland/weston-init"
 # Set CMA size large enough to work with AGL
 UBOOT_EXTLINUX_KERNEL_ARGS_append = " cma=512M"
 
-# Generate WIC image also
-AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
 AGL_DEFAULT_INITRAMFS_FSTYPES := ""