meta-agl-bsp: NXP i.MX6 and i.MX8 fixes

[AGL/meta-agl.git] / meta-agl-bsp / conf / include / agl_cubox-i.inc

diff --git a/meta-agl-bsp/conf/include/agl_cubox-i.inc b/meta-agl-bsp/conf/include/agl_cubox-i.inc
index ee5e759..fc0e14b 100644 (file)
--- 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 \
 "