X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fconf%2Finclude%2Fagl_nitrogen6x.inc;h=77eb9734257faedeb85f64f1ba0cf6c13aa6faea;hb=07663d068cfaddb8ba4287a1c8cf4a8456873cb6;hp=68ff823745cf4b081c186cb5b1360464c76b1406;hpb=665a605399bc8ac97b5fc078b7f95240a3f97f49;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 68ff82374..77eb97342 100644
--- a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
+++ b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
@@ -1,6 +1,20 @@
-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"
-AGL_DEFAULT_INITRAMFS_FSTYPES := "cpio.gz"
\ No newline at end of file
+# 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"
+
+#WKS_FILE = "imx-uboot.wks"
+AGL_DEFAULT_INITRAMFS_FSTYPES := ""