Enable usrmerge

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

diff --git a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
index 9f23453..cb13de7 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
+++ b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
@@ -1,10 +1 @@
-PREFERRED_PROVIDER_u-boot = "u-boot-imx6"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx6"
-PREFERRED_PROVIDER_u-boot-mxsboot-native = "u-boot-imx6"
-
-AGL_DEFAULT_IMAGE_FSTYPES = "sdcard.gz"
-
-# prevent of build errors from missing bb files
-BBMASK = "meta-boundary/recipes-(browser|mozilla)"
-
-PREFERRED_VERSION_weston_mx6_forcevariable = "2.0.0"
+require agl_imx6-common.inc