X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fconf%2Finclude%2Fagl_nitrogen6x.inc;h=77eb9734257faedeb85f64f1ba0cf6c13aa6faea;hb=refs%2Ftags%2Fkoi_10.92.0;hp=782e618a2bb476e501e49acf96e01fa5b05f192e;hpb=7e6f5bb94352ac0b6cd5c5cdd3035eec6c6bc559;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
index 782e618a2..77eb97342 100644
--- a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
+++ b/meta-agl-bsp/conf/include/agl_nitrogen6x.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,7 +16,5 @@ 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
 #WKS_FILE = "imx-uboot.wks"
-AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
 AGL_DEFAULT_INITRAMFS_FSTYPES := ""