X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fconf%2Finclude%2Fagl_cubox-i.inc;h=fc0e14b5fef078f6e3c88432f05ec8b13299c934;hb=fdafcbbfbc82a0f6935d19f1b5a3872416b83224;hp=a82c27cc133282c92eb3bf7675ea7ff302e62035;hpb=7e6f5bb94352ac0b6cd5c5cdd3035eec6c6bc559;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 a82c27cc1..fc0e14b5f 100644
--- a/meta-agl-bsp/conf/include/agl_cubox-i.inc
+++ b/meta-agl-bsp/conf/include/agl_cubox-i.inc
@@ -1,22 +1,21 @@
-DISTRO_FEATURES_append = " agl-medium-arm-compiler"
+require agl_imx6-common.inc
 
-# This disables the Freescale/NXP Vivante GPU driver and enables
-# etnaviv support.
-MACHINEOVERRIDES .= ":use-mainline-bsp"
+# Temporary fix for upstream breakage
+# Note that the :cubox-i override is needed because we're
+# overriding a definition done in the machine .conf.
+KERNEL_DEVICETREE:cubox-i = " \
+	nxp/imx/imx6dl-cubox-i.dtb \
+	nxp/imx/imx6q-cubox-i.dtb \
+	nxp/imx/imx6dl-hummingboard.dtb \
+	nxp/imx/imx6q-hummingboard.dtb \
+"
 
 # 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 = " \
+	nxp/imx/imx6dl-hummingboard-som-v15.dtb \
+	nxp/imx/imx6q-hummingboard-som-v15.dtb \
+	nxp/imx/imx6dl-hummingboard2.dtb \
+	nxp/imx/imx6q-hummingboard2.dtb \
+	nxp/imx/imx6dl-hummingboard2-som-v15.dtb \
+	nxp/imx/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"
-
-# Generate WIC image also
-AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"