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=c05762b781b5fb7b4f6139ea1a6d5a9b9d72de7a;hp=c3ba5fc17c49e6f789365b041ce75fd9c1776f71;hpb=48cc1b37dc363f4c59630d2307fd0d4f5d93780d;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 c3ba5fc17..fc0e14b5f 100644
--- a/meta-agl-bsp/conf/include/agl_cubox-i.inc
+++ b/meta-agl-bsp/conf/include/agl_cubox-i.inc
@@ -1,11 +1,21 @@
 require agl_imx6-common.inc
 
+# 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 \
 "