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=66e1a6f39ca640f8e8e909c64cf3158f8f9b7633;hp=4fa4815a4c17271490da047c2753506b1e620065;hpb=dd6fc5dcaa0a027b7651bb365d5dd0f623498f8f;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 4fa4815a4..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 \
+	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 \
 "