X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fconf%2Finclude%2Fagl_cubox-i.inc;fp=meta-agl-bsp%2Fconf%2Finclude%2Fagl_cubox-i.inc;h=fc0e14b5fef078f6e3c88432f05ec8b13299c934;hb=23841bb0e11260b7c2660be55c0de02c7d59f886;hp=ee5e759e487e9dcf553880dc827ab215e303436b;hpb=ae05f86cb03c47a6a68e0f7ef644319155435d6e;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 ee5e759e4..fc0e14b5f 100644
--- a/meta-agl-bsp/conf/include/agl_cubox-i.inc
+++ b/meta-agl-bsp/conf/include/agl_cubox-i.inc
@@ -1,15 +1,21 @@
 require agl_imx6-common.inc
 
-# Force use of the community supported LTS kernel instead of the
-# default linux-fslc
-PREFERRED_PROVIDER_virtual/kernel = "linux-fslc-lts"
+# 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 \
 "