X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=meta-agl-bsp%2Fconf%2Finclude%2Fagl_nitrogen6x.inc;h=5864354b5bf2bc3d11e30b1cc28812b795ebccd0;hb=e32b0ddf6130dc5b62f86f1f588e6d1fa3b2d07a;hp=9f23453302cc2d1e6719590dbcfa6c9b634e53ca;hpb=08a721eea2cb480e6879a7de15dea68e5a236570;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 9f2345330..5864354b5 100644
--- a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
+++ b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
@@ -1,10 +1,22 @@
-PREFERRED_PROVIDER_u-boot = "u-boot-imx6"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx6"
-PREFERRED_PROVIDER_u-boot-mxsboot-native = "u-boot-imx6"
+DISTRO_FEATURES_append = " agl-medium-arm-compiler"
 
-AGL_DEFAULT_IMAGE_FSTYPES = "sdcard.gz"
+# This disables the Freescale/NXP Vivante GPU driver and enables
+# etnaviv support.
+MACHINEOVERRIDES .= ":use-mainline-bsp"
 
-# prevent of build errors from missing bb files
-BBMASK = "meta-boundary/recipes-(browser|mozilla)"
+# 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}"
 
-PREFERRED_VERSION_weston_mx6_forcevariable = "2.0.0"
+# Disable the meta-freescale weston-init bbappend as it conflicts
+# with AGL's.
+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 := ""