X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fconf%2Finclude%2Fagl_cubox-i.inc;h=4fa4815a4c17271490da047c2753506b1e620065;hb=4c0a25bcf26c96bde8ab2572b4ca7d1c30f69a63;hp=46464325b24645e41f8b8e91fd72d1ac1866c8f4;hpb=de577de9ed8cf40a45eaf0c35f01be633d447a63;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-bsp/conf/include/agl_cubox-i.inc b/meta-agl-bsp/conf/include/agl_cubox-i.inc
index 46464325b..4fa4815a4 100644
--- a/meta-agl-bsp/conf/include/agl_cubox-i.inc
+++ b/meta-agl-bsp/conf/include/agl_cubox-i.inc
@@ -1,24 +1,11 @@
-DISTRO_FEATURES_append = " agl-medium-arm-compiler"
-
-# 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}"
+require agl_imx6-common.inc
 
 # Include devicetrees for SOM 1.5 and Hummingboard 2 hardware
-KERNEL_DEVICETREE_append = " \
-	imx6dl-hummingboard-som-v15.dtb imx6q-hummingboard-som-v15.dtb \ 
-	imx6dl-hummingboard2.dtb imx6q-hummingboard2.dtb \
-	imx6dl-hummingboard2-som-v15.dtb imx6q-hummingboard2-som-v15.dtb \
+KERNEL_DEVICETREE:append = " \
+	imx6dl-hummingboard-som-v15.dtb \
+	imx6q-hummingboard-som-v15.dtb \
+	imx6dl-hummingboard2.dtb \
+	imx6q-hummingboard2.dtb \
+	imx6dl-hummingboard2-som-v15.dtb \
+	imx6q-hummingboard2-som-v15.dtb \
 "
-
-# 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"