X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fconf%2Finclude%2Fagl_nitrogen6x.inc;h=5864354b5bf2bc3d11e30b1cc28812b795ebccd0;hb=86f76e0578b4cbb1a3b286b6e959e317866f9c31;hp=4fb05725cbaeae7bb2baa51e1ef0d1519e2ae131;hpb=07326290221ba045e8eca8652940de67381e9574;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 4fb05725c..5864354b5 100644
--- a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
+++ b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
@@ -1,5 +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"
+
+# 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"
+
+# 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 := ""