aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/layer.conf2
-rw-r--r--conf/machine/imx6qdlsabresd.conf25
-rw-r--r--conf/machine/imx6sxsabreauto.conf2
-rw-r--r--conf/machine/imx6ulevk.conf13
-rw-r--r--conf/machine/imx6ullevk.conf11
-rw-r--r--conf/machine/imx7dsabresd.conf16
-rw-r--r--conf/machine/imx7ulpevk.conf19
-rw-r--r--conf/machine/imx8mmevk.conf23
-rw-r--r--conf/machine/imx8mnevk.conf18
-rw-r--r--conf/machine/imx8mqevk.conf33
-rw-r--r--conf/machine/imx8qmmek.conf31
-rw-r--r--conf/machine/imx8qxpmek.conf32
-rw-r--r--conf/machine/include/imx-base.inc76
-rw-r--r--conf/machine/include/qoriq-base.inc9
-rw-r--r--conf/machine/include/utilities.inc5
-rw-r--r--conf/machine/ls1028ardb.conf3
-rw-r--r--conf/machine/ls1043ardb.conf11
-rw-r--r--conf/machine/ls1046afrwy.conf4
-rw-r--r--conf/machine/ls1046ardb.conf6
-rw-r--r--conf/machine/lx2160ardb.conf3
-rw-r--r--conf/machine/mpc8548cds.conf2
-rw-r--r--conf/machine/p1020rdb.conf2
-rw-r--r--conf/machine/p2020rdb.conf2
-rw-r--r--conf/machine/p2041rdb.conf2
-rw-r--r--conf/machine/p3041ds.conf2
-rw-r--r--conf/machine/p4080ds.conf2
-rw-r--r--conf/machine/p5040ds-64b.conf2
-rw-r--r--conf/machine/p5040ds.conf2
-rw-r--r--conf/machine/t1024rdb-64b.conf2
-rw-r--r--conf/machine/t1024rdb.conf2
-rw-r--r--conf/machine/t1042d4rdb-64b.conf2
-rw-r--r--conf/machine/t1042d4rdb.conf2
-rw-r--r--conf/machine/t2080rdb-64b.conf2
-rw-r--r--conf/machine/t2080rdb.conf2
-rw-r--r--conf/machine/t4240rdb-64b.conf2
-rw-r--r--conf/machine/t4240rdb.conf2
36 files changed, 256 insertions, 118 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index f350ef0a..1a22e024 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -16,14 +16,12 @@ LICENSE_PATH += "${LAYERDIR}/custom-licenses"
FSL_EULA_FILE = "${LAYERDIR}/EULA"
IMX_MIRROR ?= "https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/"
-QORIQ_MIRROR ?= "http://git.freescale.com/source/"
# FIXME: set this to avoid changing all the recipes that use it
FSL_MIRROR ?= "${IMX_MIRROR}"
MIRRORS += " \
${IMX_MIRROR} http://download.ossystems.com.br/bsp/freescale/source/ \n \
-${QORIQ_MIRROR} http://download.ossystems.com.br/bsp/freescale/source/ \n \
"
BBFILES_DYNAMIC += " \
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index ec43e464..2fe95dc6 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -17,14 +17,23 @@ require conf/machine/include/imx-base.inc
require conf/machine/include/tune-cortexa9.inc
KERNEL_DEVICETREE = " \
- imx6qp-sabresd.dtb imx6qp-sabresd-btwifi.dtb imx6qp-sabresd-hdcp.dtb \
- imx6qp-sabresd-ldo.dtb imx6qp-sabresd-ldo-pcie-cert.dtb \
- \
- imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \
- imx6q-sabresd-enetirq.dtb imx6q-sabresd-btwifi.dtb \
- \
- imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \
- imx6dl-sabresd-enetirq.dtb imx6dl-sabresd-btwifi.dtb \
+ imx6qp-sabresd-btwifi.dtb \
+ imx6qp-sabresd.dtb \
+ imx6qp-sabresd-hdcp.dtb \
+ imx6qp-sabresd-ldo.dtb \
+ \
+ imx6q-sabresd-btwifi.dtb \
+ imx6q-sabresd.dtb \
+ imx6q-sabresd-enetirq.dtb \
+ imx6q-sabresd-hdcp.dtb \
+ imx6q-sabresd-ldo.dtb \
+ imx6q-sabresd-uart.dtb \
+ \
+ imx6dl-sabresd-btwifi.dtb \
+ imx6dl-sabresd.dtb \
+ imx6dl-sabresd-enetirq.dtb \
+ imx6dl-sabresd-hdcp.dtb \
+ imx6dl-sabresd-ldo.dtb \
"
KERNEL_DEVICETREE_use-mainline-bsp = " \
imx6qp-sabresd.dtb \
diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf
index b26605d4..1bdb1080 100644
--- a/conf/machine/imx6sxsabreauto.conf
+++ b/conf/machine/imx6sxsabreauto.conf
@@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx6:mx6sx:"
require conf/machine/include/imx-base.inc
require conf/machine/include/tune-cortexa9.inc
-KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb imx6sx-sabreauto-m4.dtb"
+KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb"
KERNEL_DEVICETREE_use-mainline-bsp = "imx6sx-sabreauto.dtb"
PREFERRED_PROVIDER_u-boot = "u-boot-imx"
diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index fa786b0d..18b6b04b 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -11,9 +11,16 @@ include conf/machine/include/tune-cortexa7.inc
MACHINE_FEATURES += " pci wifi bluetooth"
-KERNEL_DEVICETREE = "imx6ul-14x14-evk.dtb imx6ul-14x14-evk-csi.dtb imx6ul-14x14-evk-btwifi.dtb \
- imx6ul-14x14-evk-gpmi-weim.dtb imx6ul-14x14-evk-usb-certi.dtb \
- imx6ul-14x14-evk-emmc.dtb "
+KERNEL_DEVICETREE = " \
+ imx6ul-14x14-evk-btwifi.dtb \
+ imx6ul-14x14-evk-btwifi-oob.dtb \
+ imx6ul-14x14-evk-csi.dtb \
+ imx6ul-14x14-evk.dtb \
+ imx6ul-14x14-evk-ecspi.dtb \
+ imx6ul-14x14-evk-ecspi-slave.dtb \
+ imx6ul-14x14-evk-emmc.dtb \
+ imx6ul-14x14-evk-gpmi-weim.dtb \
+"
KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb"
# Use fslc u-boot by default. See also imx-base.inc.
diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf
index 7931b5a4..9351954f 100644
--- a/conf/machine/imx6ullevk.conf
+++ b/conf/machine/imx6ullevk.conf
@@ -9,9 +9,14 @@ MACHINEOVERRIDES =. "mx6:mx6ull:"
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa7.inc
-KERNEL_DEVICETREE = "imx6ull-14x14-evk.dtb imx6ull-14x14-evk-btwifi.dtb \
- imx6ull-14x14-evk-btwifi-oob.dtb imx6ull-14x14-evk-emmc.dtb \
- imx6ull-14x14-evk-gpmi-weim.dtb imx6ull-14x14-evk-usb-certi.dtb"
+KERNEL_DEVICETREE = " \
+ imx6ull-14x14-evk-btwifi.dtb \
+ imx6ull-14x14-evk-btwifi-oob.dtb \
+ imx6ull-14x14-evk.dtb \
+ imx6ull-14x14-evk-emmc.dtb \
+ imx6ull-14x14-evk-gpmi-weim.dtb \
+"
+
UBOOT_CONFIG ??= "sd"
UBOOT_CONFIG[sd] = "mx6ull_14x14_evk_config,sdcard"
UBOOT_CONFIG[mfgtool] = "mx6ull_14x14_evk_config"
diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index 2a4f8e6c..84de3862 100644
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -11,11 +11,17 @@ require conf/machine/include/tune-cortexa7.inc
MACHINE_FEATURES += " pci wifi bluetooth"
-KERNEL_DEVICETREE = "imx7d-sdb.dtb imx7d-sdb-epdc.dtb imx7d-sdb-gpmi-weim.dtb \
- imx7d-sdb-m4.dtb imx7d-sdb-mipi-dsi.dtb imx7d-sdb-qspi.dtb \
- imx7d-sdb-reva.dtb imx7d-sdb-reva-epdc.dtb imx7d-sdb-reva-gpmi-weim.dtb \
- imx7d-sdb-reva-hdmi-audio.dtb imx7d-sdb-reva-m4.dtb imx7d-sdb-reva-qspi.dtb \
- imx7d-sdb-reva-touch.dtb imx7d-sdb-reva-wm8960.dtb"
+KERNEL_DEVICETREE = " \
+ imx7d-sdb.dtb \
+ imx7d-sdb-epdc.dtb \
+ imx7d-sdb-gpmi-weim.dtb \
+ imx7d-sdb-m4.dtb \
+ imx7d-sdb-mipi-dsi.dtb \
+ imx7d-sdb-qspi.dtb \
+ imx7d-sdb-reva.dtb \
+ imx7d-sdb-sht11.dtb \
+"
+
KERNEL_DEVICETREE_use-mainline-bsp = "imx7d-sdb.dtb"
UBOOT_CONFIG ??= "sd"
diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf
index 31b88c2c..d9d2a559 100644
--- a/conf/machine/imx7ulpevk.conf
+++ b/conf/machine/imx7ulpevk.conf
@@ -11,11 +11,20 @@ require conf/machine/include/tune-cortexa7.inc
MACHINE_FEATURES += " pci wifi bluetooth qca9377"
-KERNEL_DEVICETREE = "imx7ulp-evk.dtb imx7ulp-evkb-emmc.dtb imx7ulp-evk-emmc-qspi.dtb imx7ulp-evk-ft5416.dtb imx7ulp-evk-mipi.dtb \
- imx7ulp-evkb-lpuart.dtb imx7ulp-evk-qspi.dtb imx7ulp-evkb-sd1.dtb imx7ulp-evkb-sensors-to-i2c5.dtb \
- imx7ulp-evkb-spi-slave.dtb imx7ulp-evk-wm8960.dtb \
- imx7ulp-evkb.dtb imx7ulp-evkb-mipi.dtb \
- imx7ulp-evkb-rm68200-wxga.dtb imx7ulp-evkb-rm68191-qhd.dtb"
+KERNEL_DEVICETREE = " \
+ imx7ulp-evkb.dtb \
+ imx7ulp-evkb-emmc.dtb \
+ imx7ulp-evkb-lpuart.dtb \
+ imx7ulp-evkb-mipi.dtb \
+ imx7ulp-evkb-rm68191-qhd.dtb \
+ imx7ulp-evkb-rm68200-wxga.dtb \
+ imx7ulp-evkb-sd1.dtb \
+ imx7ulp-evkb-sensors-to-i2c5.dtb \
+ imx7ulp-evkb-spi-slave.dtb \
+ imx7ulp-evk.dtb \
+ imx7ulp-evk-ft5416.dtb \
+ imx7ulp-evk-mipi.dtb \
+"
UBOOT_CONFIG ??= "sd"
UBOOT_CONFIG[sd] = "mx7ulp_evk_config,sdcard"
diff --git a/conf/machine/imx8mmevk.conf b/conf/machine/imx8mmevk.conf
index a648db9d..2a2893e6 100644
--- a/conf/machine/imx8mmevk.conf
+++ b/conf/machine/imx8mmevk.conf
@@ -9,14 +9,25 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:"
require conf/machine/include/imx-base.inc
require conf/machine/include/tune-cortexa53.inc
+IMX_DEFAULT_BSP = "nxp"
+
MACHINE_FEATURES += " pci wifi bluetooth optee qca9377"
-KERNEL_DEVICETREE = "freescale/fsl-imx8mm-evk.dtb \
- freescale/fsl-imx8mm-evk-ak4497.dtb freescale/fsl-imx8mm-evk-ak5558.dtb \
- freescale/fsl-imx8mm-evk-audio-tdm.dtb freescale/fsl-imx8mm-evk-inmate.dtb \
- freescale/fsl-imx8mm-evk-m4.dtb freescale/fsl-imx8mm-evk-rm67191.dtb \
- freescale/fsl-imx8mm-ddr4-evk.dtb freescale/fsl-imx8mm-ddr4-evk-rm67191.dtb \
- freescale/fsl-imx8mm-ddr4-qca9377-evk.dtb freescale/fsl-imx8mm-evk-root.dtb"
+KERNEL_DEVICETREE = " \
+ freescale/imx8mm-ddr4-evk.dtb \
+ freescale/imx8mm-ddr4-evk-revb.dtb \
+ freescale/imx8mm-ddr4-evk-revb-rm67191.dtb \
+ freescale/imx8mm-ddr4-evk-rm67191.dtb \
+ freescale/imx8mm-evk-ak4497.dtb \
+ freescale/imx8mm-evk-ak5558.dtb \
+ freescale/imx8mm-evk-audio-tdm.dtb \
+ freescale/imx8mm-evk.dtb \
+ freescale/imx8mm-evk-inmate.dtb \
+ freescale/imx8mm-evk-revb.dtb \
+ freescale/imx8mm-evk-rm67191.dtb \
+ freescale/imx8mm-evk-root.dtb \
+ freescale/imx8mm-evk-rpmsg.dtb \
+"
UBOOT_CONFIG ??= "sd"
UBOOT_CONFIG[sd] = "imx8mm_evk_config,sdcard"
diff --git a/conf/machine/imx8mnevk.conf b/conf/machine/imx8mnevk.conf
index b74805d2..adf80ea8 100644
--- a/conf/machine/imx8mnevk.conf
+++ b/conf/machine/imx8mnevk.conf
@@ -9,14 +9,20 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mn:"
require conf/machine/include/imx-base.inc
require conf/machine/include/tune-cortexa53.inc
+IMX_DEFAULT_BSP = "nxp"
+
MACHINE_FEATURES += "wifi bluetooth optee bcm43455"
-KERNEL_DEVICETREE = "freescale/fsl-imx8mn-ddr4-evk-ak5558.dtb \
- freescale/fsl-imx8mn-ddr4-evk-inmate.dtb \
- freescale/fsl-imx8mn-ddr4-evk.dtb \
- freescale/fsl-imx8mn-ddr4-evk-rm67191.dtb \
- freescale/fsl-imx8mn-ddr4-evk-rpmsg.dtb \
- freescale/fsl-imx8mn-ddr4-evk-root.dtb"
+KERNEL_DEVICETREE = " \
+ freescale/imx8mn-ddr4-evk-ak5558.dtb \
+ freescale/imx8mn-ddr4-evk.dtb \
+ freescale/imx8mn-ddr4-evk-inmate.dtb \
+ freescale/imx8mn-ddr4-evk-rm67191.dtb \
+ freescale/imx8mn-ddr4-evk-root.dtb \
+ freescale/imx8mn-ddr4-evk-rpmsg.dtb \
+ freescale/imx8mn-evk.dtb \
+ freescale/imx8mn-evk-rm67191.dtb \
+"
UBOOT_CONFIG ??= "sd"
UBOOT_CONFIG[sd] = "imx8mn_ddr4_evk_defconfig,sdcard"
diff --git a/conf/machine/imx8mqevk.conf b/conf/machine/imx8mqevk.conf
index d52e576d..40794c35 100644
--- a/conf/machine/imx8mqevk.conf
+++ b/conf/machine/imx8mqevk.conf
@@ -7,25 +7,30 @@
MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:"
require conf/machine/include/imx-base.inc
-require conf/machine/include/arm/arch-arm64.inc
+require conf/machine/include/tune-cortexa53.inc
+
+IMX_DEFAULT_BSP = "nxp"
MACHINE_FEATURES += "pci wifi bluetooth optee qca6174"
MACHINE_SOCARCH_FILTER_append_mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d"
-KERNEL_DEVICETREE = "freescale/fsl-imx8mq-evk.dtb freescale/fsl-imx8mq-evk-ak4497.dtb \
- freescale/fsl-imx8mq-evk-audio-tdm.dtb freescale/fsl-imx8mq-evk-b3.dtb \
- freescale/fsl-imx8mq-evk-dcss-adv7535.dtb freescale/fsl-imx8mq-evk-dcss-rm67191.dtb \
- freescale/fsl-imx8mq-evk-dcss-adv7535-b3.dtb freescale/fsl-imx8mq-evk-dcss-rm67191-b3.dtb \
- freescale/fsl-imx8mq-evk-dual-display-b3.dtb \
- freescale/fsl-imx8mq-evk-dual-display.dtb freescale/fsl-imx8mq-evk-drm.dtb \
- freescale/fsl-imx8mq-evk-dp.dtb freescale/fsl-imx8mq-evk-edp.dtb \
- freescale/fsl-imx8mq-evk-inmate.dtb \
- freescale/fsl-imx8mq-evk-lcdif-adv7535.dtb \
- freescale/fsl-imx8mq-evk-lcdif-adv7535-b3.dtb \
- freescale/fsl-imx8mq-evk-m4.dtb freescale/fsl-imx8mq-evk-mipi-csi2.dtb \
- freescale/fsl-imx8mq-evk-pcie1-m2.dtb freescale/fsl-imx8mq-evk-pdm.dtb \
- freescale/fsl-imx8mq-evk-root.dtb"
+KERNEL_DEVICETREE = " \
+ freescale/imx8mq-evk-ak4497.dtb \
+ freescale/imx8mq-evk-audio-tdm.dtb \
+ freescale/imx8mq-evk-dcss-adv7535.dtb \
+ freescale/imx8mq-evk-dcss-rm67191.dtb \
+ freescale/imx8mq-evk-dp.dtb \
+ freescale/imx8mq-evk.dtb \
+ freescale/imx8mq-evk-dual-display.dtb \
+ freescale/imx8mq-evk-inmate.dtb \
+ freescale/imx8mq-evk-lcdif-adv7535.dtb \
+ freescale/imx8mq-evk-lcdif-rm67191.dtb \
+ freescale/imx8mq-evk-pcie1-m2.dtb \
+ freescale/imx8mq-evk-pdm.dtb \
+ freescale/imx8mq-evk-root.dtb \
+ freescale/imx8mq-evk-rpmsg.dtb \
+"
UBOOT_CONFIG ??= "sd"
UBOOT_CONFIG[sd] = "imx8mq_evk_config,sdcard"
diff --git a/conf/machine/imx8qmmek.conf b/conf/machine/imx8qmmek.conf
index 01d92009..c92e5fd2 100644
--- a/conf/machine/imx8qmmek.conf
+++ b/conf/machine/imx8qmmek.conf
@@ -8,6 +8,8 @@ MACHINEOVERRIDES =. "mx8:mx8qm:"
require conf/machine/include/imx-base.inc
require conf/machine/include/tune-cortexa72-cortexa53.inc
+IMX_DEFAULT_BSP = "nxp"
+
MACHINE_FEATURES_append = " qca6174"
# Don't include kernels in standard images
@@ -22,19 +24,22 @@ SERIAL_CONSOLES = "115200;ttyAMA0"
# auto-serial-console there
USE_VT = "0"
-KERNEL_DEVICETREE = "freescale/fsl-imx8qm-mek.dtb \
- freescale/fsl-imx8qm-mek_ca53.dtb freescale/fsl-imx8qm-mek_ca72.dtb \
- freescale/fsl-imx8qm-mek-dom0.dtb freescale/fsl-imx8qm-mek-dom0-dpu2.dtb \
- freescale/fsl-imx8qm-mek-domu-car.dtb \
- freescale/fsl-imx8qm-mek-domu-dpu1.dtb freescale/fsl-imx8qm-mek-domu-dpu1-hdmi.dtb \
- freescale/fsl-imx8qm-mek-domu.dtb \
- freescale/fsl-imx8qm-mek-dsi-rm67191.dtb freescale/fsl-imx8qm-mek-dsp.dtb \
- freescale/fsl-imx8qm-mek-enet2-tja1100.dtb \
- freescale/fsl-imx8qm-mek-hdmi.dtb freescale/fsl-imx8qm-mek-hdmi-in.dtb \
- freescale/fsl-imx8qm-mek-inmate.dtb freescale/fsl-imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \
- freescale/fsl-imx8qm-mek-ov5640.dtb \
- freescale/fsl-imx8qm-mek-root.dtb \
- freescale/fsl-imx8qm-mek-rpmsg.dtb "
+KERNEL_DEVICETREE = " \
+ freescale/imx8qm-mek-ca53.dtb \
+ freescale/imx8qm-mek-ca72.dtb \
+ freescale/imx8qm-mek-dom0.dtb \
+ freescale/imx8qm-mek-domu.dtb \
+ freescale/imx8qm-mek-dsi-rm67191.dtb \
+ freescale/imx8qm-mek-dsp.dtb \
+ freescale/imx8qm-mek.dtb \
+ freescale/imx8qm-mek-enet2-tja1100.dtb \
+ freescale/imx8qm-mek-hdmi.dtb \
+ freescale/imx8qm-mek-inmate.dtb \
+ freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \
+ freescale/imx8qm-mek-ov5640.dtb \
+ freescale/imx8qm-mek-root.dtb \
+ freescale/imx8qm-mek-rpmsg.dtb \
+"
UBOOT_MAKE_TARGET = "u-boot.bin"
UBOOT_SUFFIX = "bin"
diff --git a/conf/machine/imx8qxpmek.conf b/conf/machine/imx8qxpmek.conf
index 80da6e2d..bdce4b68 100644
--- a/conf/machine/imx8qxpmek.conf
+++ b/conf/machine/imx8qxpmek.conf
@@ -6,7 +6,9 @@
MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:"
require conf/machine/include/imx-base.inc
-require conf/machine/include/arm/arch-arm64.inc
+require conf/machine/include/tune-cortexa35.inc
+
+IMX_DEFAULT_BSP = "nxp"
MACHINE_FEATURES_append = " qca6174"
@@ -22,15 +24,25 @@ SERIAL_CONSOLES = "115200;ttyAMA0"
# auto-serial-console there
USE_VT = "0"
-KERNEL_DEVICETREE = "freescale/fsl-imx8qxp-mek.dtb freescale/fsl-imx8qxp-mek-dom0.dtb \
- freescale/fsl-imx8qxp-mek-dsi-rm67191.dtb freescale/fsl-imx8qxp-mek-dsp.dtb \
- freescale/fsl-imx8qxp-mek-enet2.dtb freescale/fsl-imx8qxp-mek-enet2-tja1100.dtb \
- freescale/fsl-imx8qxp-mek-it6263-lvds0-dual-channel.dtb freescale/fsl-imx8qxp-mek-it6263-lvds1-dual-channel.dtb \
- freescale/fsl-imx8qxp-mek-inmate.dtb \
- freescale/fsl-imx8qxp-mek-lcdif.dtb \
- freescale/fsl-imx8qxp-mek-jdi-wuxga-lvds1-panel.dtb freescale/fsl-imx8qxp-mek-jdi-wuxga-lvds0-panel.dtb \
- freescale/fsl-imx8qxp-mek-ov5640.dtb \
- freescale/fsl-imx8qxp-mek-rpmsg.dtb freescale/fsl-imx8qxp-mek-root.dtb"
+KERNEL_DEVICETREE = " \
+ freescale/imx8qxp-mek-a0.dtb \
+ freescale/imx8qxp-mek-dom0.dtb \
+ freescale/imx8qxp-mek-dsi-rm67191.dtb \
+ freescale/imx8qxp-mek-dsp.dtb \
+ freescale/imx8qxp-mek.dtb \
+ freescale/imx8qxp-mek-enet2.dtb \
+ freescale/imx8qxp-mek-enet2-tja1100.dtb \
+ freescale/imx8qxp-mek-inmate.dtb \
+ freescale/imx8qxp-mek-it6263-lvds0-dual-channel.dtb \
+ freescale/imx8qxp-mek-it6263-lvds1-dual-channel.dtb \
+ freescale/imx8qxp-mek-jdi-wuxga-lvds0-panel.dtb \
+ freescale/imx8qxp-mek-jdi-wuxga-lvds1-panel.dtb \
+ freescale/imx8qxp-mek-ov5640.dtb \
+ freescale/imx8qxp-mek-root.dtb \
+ freescale/imx8qxp-mek-rpmsg.dtb \
+ freescale/imx8qxp-mek-sof-cs42888.dtb \
+ freescale/imx8qxp-mek-sof-wm8960.dtb \
+"
UBOOT_MAKE_TARGET = "u-boot.bin"
UBOOT_SUFFIX = "bin"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 2edb9a31..4be14fb1 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -9,7 +9,24 @@ require conf/machine/include/utilities.inc
IMX_DEFAULT_BOOTLOADER = "u-boot-fslc"
IMX_DEFAULT_BOOTLOADER_mx8 = "u-boot-imx"
+# Machines or distros can define which BSP it should use by default. We are
+# intending to default for mainline BSP by default and specific machines or
+# DISTROs might change it if need.
+#
+# Two values are considered valid: mainline, nxp
+IMX_DEFAULT_BSP ?= "mainline"
+
+# Those are SoC families we'd like to force the use of mainline BSP.
+IMX_DEFAULT_BSP_mxs ?= "mainline"
+IMX_DEFAULT_BSP_mx5 ?= "mainline"
+
+MACHINEOVERRIDES =. "use-${IMX_DEFAULT_BSP}-bsp:"
+
PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}"
+PREFERRED_PROVIDER_u-boot-tools-native ??= "${IMX_DEFAULT_BOOTLOADER}-tools-native"
+PREFERRED_PROVIDER_nativesdk-u-boot-tools ??= "nativesdk-${IMX_DEFAULT_BOOTLOADER}-tools"
+PREFERRED_PROVIDER_u-boot-mkimage-native ??= "${IMX_DEFAULT_BOOTLOADER}-tools-native"
+PREFERRED_PROVIDER_nativesdk-u-boot-mkimage ??= "nativesdk-${IMX_DEFAULT_BOOTLOADER}-tools"
PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}"
PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native"
@@ -59,14 +76,17 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
# handled by software
# DEFAULTTUNE_mx6 ?= "cortexa9t-neon"
# handled by hardware
-DEFAULTTUNE_mx6 ?= "cortexa9thf-neon"
-DEFAULTTUNE_mx6ul ?= "cortexa7thf-neon"
+DEFAULTTUNE_mx6 ?= "cortexa9thf-neon"
+DEFAULTTUNE_mx6ul ?= "cortexa7thf-neon"
DEFAULTTUNE_mx6ull ?= "cortexa7thf-neon"
-DEFAULTTUNE_mx7 ?= "cortexa7thf-neon"
-DEFAULTTUNE_vf ?= "cortexa5thf-neon"
-DEFAULTTUNE_mx8mm ?= "cortexa53-crypto"
-DEFAULTTUNE_mx8mn ?= "cortexa53-crypto"
-DEFAULTTUNE_mx8qm ?= "cortexa72-cortexa53-crypto"
+DEFAULTTUNE_mx7 ?= "cortexa7thf-neon"
+DEFAULTTUNE_vf ?= "cortexa5thf-neon"
+
+DEFAULTTUNE_mx8mm ?= "cortexa53-crypto"
+DEFAULTTUNE_mx8mn ?= "cortexa53-crypto"
+DEFAULTTUNE_mx8mq ?= "cortexa53-crypto"
+DEFAULTTUNE_mx8qm ?= "cortexa72-cortexa53-crypto"
+DEFAULTTUNE_mx8qxp ?= "cortexa35-crypto"
INHERIT += "machine-overrides-extender"
@@ -87,6 +107,8 @@ MACHINEOVERRIDES_EXTENDER_mx8mq = "imxdrm:imxvpu:imxgpu:imxgpu3d"
MACHINEOVERRIDES_EXTENDER_mx8qxp = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d"
MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \
+ imx \
+ \
mx6 \
mx6q \
mx6dl \
@@ -110,10 +132,6 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \
# Sub-architecture support
MACHINE_SOCARCH_SUFFIX ?= ""
-MACHINE_SOCARCH_SUFFIX_mx23 = "-mxs"
-MACHINE_SOCARCH_SUFFIX_mx28 = "-mxs"
-MACHINE_SOCARCH_SUFFIX_mx51 = "-mx5"
-MACHINE_SOCARCH_SUFFIX_mx53 = "-mx5"
MACHINE_SOCARCH_SUFFIX_mx6q = "-mx6qdl"
MACHINE_SOCARCH_SUFFIX_mx6dl = "-mx6qdl"
MACHINE_SOCARCH_SUFFIX_mx6sx = "-mx6sx"
@@ -217,9 +235,11 @@ MACHINE_FIRMWARE_append_use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux
MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"
# Extra audio support
-MACHINE_EXTRA_RRECOMMENDS_append_mx6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}"
-MACHINE_EXTRA_RRECOMMENDS_append_mx7 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}"
-MACHINE_EXTRA_RRECOMMENDS_append_mx8 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}"
+IMX_ALSA_EXTRA = ""
+IMX_ALSA_EXTRA_use-nxp-bsp = "imx-alsa-plugins"
+MACHINE_EXTRA_RRECOMMENDS_append_mx6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}"
+MACHINE_EXTRA_RRECOMMENDS_append_mx7 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}"
+MACHINE_EXTRA_RRECOMMENDS_append_mx8 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}"
# Extra Cypress Wi-Fi and BTW firmware (Murata)
MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4339', 'linux-firmware-bcm4339', '', d)}"
@@ -235,6 +255,11 @@ MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'q
# Extra udev rules
MACHINE_EXTRA_RRECOMMENDS += "udev-rules-imx"
+# Jailhouse
+MACHINE_EXTRA_RRECOMMENDS += " \
+ ${@bb.utils.contains('COMBINED_FEATURES', 'jailhouse', 'jailhouse', '', d)} \
+"
+
# GStreamer 1.0 plugins
MACHINE_GSTREAMER_1_0_PLUGIN ?= ""
MACHINE_GSTREAMER_1_0_PLUGIN_mx6dl ?= "gstreamer1.0-plugins-imx-meta"
@@ -267,15 +292,17 @@ PREFERRED_PROVIDER_virtual/libgles2_imxgpu3d ?= "imx-gpu-viv"
PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d"
PREFERRED_PROVIDER_virtual/libg2d_imxdpu ?= "imx-dpu-g2d"
-PREFERRED_VERSION_weston_imx ?= "6.0.1.imx"
+PREFERRED_VERSION_weston_imx ?= "8.0.0.imx"
PREFERRED_VERSION_weston_use-mainline-bsp = ""
-PREFERRED_VERSION_wayland-protocols_mx6 ?= "1.17.imx"
-PREFERRED_VERSION_wayland-protocols_mx7 ?= "1.17.imx"
-PREFERRED_VERSION_wayland-protocols_mx8 ?= "1.17.imx"
+PREFERRED_VERSION_wayland-protocols_mx6 ?= "1.18.imx"
+PREFERRED_VERSION_wayland-protocols_mx7 ?= "1.18.imx"
+PREFERRED_VERSION_wayland-protocols_mx8 ?= "1.18.imx"
# Use i.MX libdrm Version
-PREFERRED_VERSION_libdrm_imx ?= "2.4.99.imx"
+PREFERRED_VERSION_libdrm_mx6 ?= "2.4.99.imx"
+PREFERRED_VERSION_libdrm_mx7 ?= "2.4.99.imx"
+PREFERRED_VERSION_libdrm_mx8 ?= "2.4.99.imx"
# Use i.MX optee Version
PREFERRED_VERSION_optee-os_mx8 ?= "3.2.0.imx"
@@ -286,13 +313,13 @@ PREFERRED_VERSION_optee-test_mx8 ?= "3.2.0.imx"
IMX_DEFAULT_KERNEL = "linux-imx"
IMX_DEFAULT_KERNEL_mxs = "linux-fslc"
IMX_DEFAULT_KERNEL_mx5 = "linux-fslc"
-IMX_DEFAULT_KERNEL_mx6 = "linux-fslc-imx"
-IMX_DEFAULT_KERNEL_mx7 = "linux-fslc-imx"
+IMX_DEFAULT_KERNEL_mx6 = "linux-imx"
+IMX_DEFAULT_KERNEL_mx7 = "linux-imx"
IMX_DEFAULT_KERNEL_mx8 = "linux-imx"
IMX_DEFAULT_KERNEL_mx7ulp = "linux-imx"
IMX_DEFAULT_KERNEL_mx6sll = "linux-imx"
-IMX_DEFAULT_KERNEL_mx6ul = "linux-fslc-imx"
-IMX_DEFAULT_KERNEL_mx6ull = "linux-fslc-imx"
+IMX_DEFAULT_KERNEL_mx6ul = "linux-imx"
+IMX_DEFAULT_KERNEL_mx6ull = "linux-imx"
IMX_DEFAULT_KERNEL_use-mainline-bsp = "linux-fslc"
PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"
@@ -354,6 +381,9 @@ KERNEL_IMAGETYPE_aarch64 = "Image"
MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
+SOC_MACHINE_FEATURES_BACKFILL_mx8m = "jailhouse"
+MACHINE_FEATURES_BACKFILL_append = " ${SOC_MACHINE_FEATURES_BACKFILL}"
+
# Add the ability to specify _imx machines
MACHINEOVERRIDES =. "imx:"
diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
index 6166cb2a..1eb8d1b0 100644
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-base.inc
@@ -20,6 +20,15 @@ EXTRA_IMAGEDEPENDS += "u-boot cst-native"
MACHINEOVERRIDES =. "qoriq:"
+# Machines or distros can define which BSP it should use by default. We are
+# intending to default for nxp BSP by default and specific machines or
+# DISTROs might change it if need.
+#
+# Two values are considered valid: mainline, nxp
+QORIQ_DEFAULT_BSP ?= "nxp"
+
+MACHINEOVERRIDES =. "use-${QORIQ_DEFAULT_BSP}-bsp:"
+
# Sub-architecture support
MACHINE_SOCARCH_SUFFIX ?= ""
MACHINE_SOCARCH_SUFFIX_qoriq = "-qoriq"
diff --git a/conf/machine/include/utilities.inc b/conf/machine/include/utilities.inc
index 164d77f4..e9695bde 100644
--- a/conf/machine/include/utilities.inc
+++ b/conf/machine/include/utilities.inc
@@ -6,6 +6,11 @@ def make_dtb_boot_files(d):
# Use only the basename for dtb files:
alldtbs = d.getVar('KERNEL_DEVICETREE')
+
+ # DTBs may be built out of kernel with devicetree.bbclass
+ if not alldtbs:
+ return ''
+
def transform(dtb):
if not (dtb.endswith('dtb') or dtb.endswith('dtbo')):
# eg: whatever/bcm2708-rpi-b.dtb has:
diff --git a/conf/machine/ls1028ardb.conf b/conf/machine/ls1028ardb.conf
index 9d324e72..b0bbc5b8 100644
--- a/conf/machine/ls1028ardb.conf
+++ b/conf/machine/ls1028ardb.conf
@@ -22,6 +22,9 @@ UBOOT_CONFIG[tfa-secure-boot] = "ls1028ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dt
UBOOT_CONFIG[tfa] = "ls1028ardb_tfa_defconfig,,u-boot-dtb.bin"
KERNEL_DEVICETREE ?= "freescale/fsl-ls1028a-rdb.dtb freescale/fsl-ls1028a-qds.dtb"
+KERNEL_DEVICETREE_append_use-nxp-bsp = "\
+ freescale/fsl-ls1028a-rdb-dpdk.dtb \
+"
KERNEL_DEFCONFIG ?= "defconfig"
SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0"
diff --git a/conf/machine/ls1043ardb.conf b/conf/machine/ls1043ardb.conf
index ee961cc3..6f1f7ea4 100644
--- a/conf/machine/ls1043ardb.conf
+++ b/conf/machine/ls1043ardb.conf
@@ -22,7 +22,16 @@ UBOOT_CONFIG ??= "tfa-secure-boot tfa"
UBOOT_CONFIG[tfa] = "ls1043ardb_tfa_defconfig,,u-boot-dtb.bin"
UBOOT_CONFIG[tfa-secure-boot] = "ls1043ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
-KERNEL_DEVICETREE ?= "freescale/fsl-ls1043a-rdb-sdk.dtb freescale/fsl-ls1043a-rdb-usdpaa.dtb freescale/fsl-ls1043a-qds.dtb freescale/fsl-ls1043a-qds-sdk.dtb"
+KERNEL_DEVICETREE ?= "\
+ freescale/fsl-ls1043a-rdb.dtb \
+ freescale/fsl-ls1043a-qds.dtb \
+"
+# usdpaa dtb is used for dpdk. TODO: rename in kernel
+KERNEL_DEVICETREE_append_use-nxp-bsp = "\
+ freescale/fsl-ls1043a-rdb-sdk.dtb \
+ freescale/fsl-ls1043a-rdb-usdpaa.dtb \
+ freescale/fsl-ls1043a-qds-sdk.dtb \
+"
KERNEL_DEFCONFIG ?= "defconfig"
UEFI_NORBOOT ?= "LS1043ARDB_EFI_NORBOOT.fd"
diff --git a/conf/machine/ls1046afrwy.conf b/conf/machine/ls1046afrwy.conf
index e685c141..884f7666 100644
--- a/conf/machine/ls1046afrwy.conf
+++ b/conf/machine/ls1046afrwy.conf
@@ -22,6 +22,10 @@ UBOOT_CONFIG[tfa] = "ls1046afrwy_tfa_defconfig,,u-boot-dtb.bin"
UBOOT_CONFIG[tfa-secure-boot] = "ls1046afrwy_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
KERNEL_DEVICETREE ?= "\
+ freescale/fsl-ls1046a-frwy.dtb \
+"
+# usdpaa dtb is used for dpdk. TODO: rename in kernel
+KERNEL_DEVICETREE_append_use-nxp-bsp = "\
freescale/fsl-ls1046a-frwy-sdk.dtb \
freescale/fsl-ls1046a-frwy-usdpaa.dtb \
"
diff --git a/conf/machine/ls1046ardb.conf b/conf/machine/ls1046ardb.conf
index 7efb91f1..e8773366 100644
--- a/conf/machine/ls1046ardb.conf
+++ b/conf/machine/ls1046ardb.conf
@@ -22,9 +22,13 @@ UBOOT_CONFIG[tfa] = "ls1046ardb_tfa_defconfig,,u-boot-dtb.bin"
UBOOT_CONFIG[tfa-secure-boot] = "ls1046ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
KERNEL_DEVICETREE ?= "\
+ freescale/fsl-ls1046a-rdb.dtb \
+ freescale/fsl-ls1046a-qds.dtb \
+"
+# usdpaa dtb is used for dpdk. TODO: rename in kernel
+KERNEL_DEVICETREE_append_use-nxp-bsp = "\
freescale/fsl-ls1046a-rdb-sdk.dtb \
freescale/fsl-ls1046a-rdb-usdpaa.dtb \
- freescale/fsl-ls1046a-qds.dtb \
freescale/fsl-ls1046a-qds-sdk.dtb \
"
KERNEL_DEFCONFIG ?= "defconfig"
diff --git a/conf/machine/lx2160ardb.conf b/conf/machine/lx2160ardb.conf
index 6bdb2510..a8bbdbda 100644
--- a/conf/machine/lx2160ardb.conf
+++ b/conf/machine/lx2160ardb.conf
@@ -29,7 +29,8 @@ SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
UEFI_XSPIBOOT ?= "LX2160ARDB_EFI_NORBOOT.fd"
RCWXSPI ?= "XGGFF_PP_HHHH_RR_19_5_2/rcw_2000_700_2900_19_5_2"
-RCWSD ?= "XGGFF_PP_HHHH_RR_19_5_2/rcw_2000_700_2900_19_5_2_sd"
+RCWSD ?= "XGGFF_PP_HHHH_RR_19_5_2/rcw_2000_700_2900_19_5_2"
+RCWEMMC ?= "XGGFF_PP_HHHH_RR_19_5_2/rcw_2000_700_2900_19_5_2"
EXTRA_IMAGEDEPENDS += "management-complex mc-utils rcw ls2-phy ddr-phy uefi atf inphi"
USE_VT = "0"
diff --git a/conf/machine/mpc8548cds.conf b/conf/machine/mpc8548cds.conf
index 7ed06faf..c7c49ddc 100644
--- a/conf/machine/mpc8548cds.conf
+++ b/conf/machine/mpc8548cds.conf
@@ -8,7 +8,7 @@ require conf/machine/include/e500v2.inc
UBOOT_CONFIG ??= "nor"
UBOOT_CONFIG[nor] = "MPC8548CDS_defconfig,,u-boot-with-dtb.bin"
-KERNEL_DEVICETREE = "mpc8548cds_32b.dtb"
+KERNEL_DEVICETREE = "fsl/mpc8548cds_32b.dtb"
KERNEL_DEFCONFIG = "mpc85xx_defconfig"
USE_VT ?= "0"
diff --git a/conf/machine/p1020rdb.conf b/conf/machine/p1020rdb.conf
index ee73beb5..974213c1 100644
--- a/conf/machine/p1020rdb.conf
+++ b/conf/machine/p1020rdb.conf
@@ -20,7 +20,7 @@ UBOOT_SOURCE_NAND = "u-boot-with-spl.bin"
UBOOT_SOURCE_SPI = "u-boot-with-spl.bin"
UBOOT_SOURCE_SD = "u-boot-with-spl.bin"
-KERNEL_DEVICETREE ?= "p1020rdb-pd.dtb"
+KERNEL_DEVICETREE ?= "fsl/p1020rdb-pd.dtb"
KERNEL_DEFCONFIG ?= "mpc85xx_smp_defconfig"
JFFS2_ERASEBLOCK = "0x20000"
diff --git a/conf/machine/p2020rdb.conf b/conf/machine/p2020rdb.conf
index b3303629..40e279d2 100644
--- a/conf/machine/p2020rdb.conf
+++ b/conf/machine/p2020rdb.conf
@@ -20,7 +20,7 @@ UBOOT_CONFIG[36bit-spi] = "P2020RDB-PC_36BIT_SPIFLASH_config,,u-boot-with-spl.bi
UBOOT_CONFIG[36bit-nand] = "P2020RDB-PC_36BIT_NAND_config,,u-boot-with-spl.bin"
UBOOT_CONFIG[36bit-sdcard] = "P2020RDB-PC_36BIT_SDCARD_config,,u-boot-with-spl.bin"
-KERNEL_DEVICETREE ?= "p2020rdb-pc_32b.dtb"
+KERNEL_DEVICETREE ?= "fsl/p2020rdb-pc_32b.dtb"
KERNEL_DEFCONFIG ?= "mpc85xx_smp_defconfig"
JFFS2_ERASEBLOCK = "0x20000"
diff --git a/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf
index c35c84a4..685d327c 100644
--- a/conf/machine/p2041rdb.conf
+++ b/conf/machine/p2041rdb.conf
@@ -18,7 +18,7 @@ UBOOT_CONFIG[spi] = "P2041RDB_SPIFLASH_config,,u-boot.pbl"
HV_CFG_M = "p2041rdb"
-KERNEL_DEVICETREE ?= "p2041rdb.dtb"
+KERNEL_DEVICETREE ?= "fsl/p2041rdb.dtb"
KERNEL_DEFCONFIG ?= "corenet32_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
diff --git a/conf/machine/p3041ds.conf b/conf/machine/p3041ds.conf
index 1b828ac4..2fbe0f66 100644
--- a/conf/machine/p3041ds.conf
+++ b/conf/machine/p3041ds.conf
@@ -18,7 +18,7 @@ UBOOT_CONFIG[spi] = "P3041DS_SPIFLASH_config,,u-boot.pbl"
HV_CFG_M = "p3041ds"
-KERNEL_DEVICETREE ?= "p3041ds.dtb"
+KERNEL_DEVICETREE ?= "fsl/p3041ds.dtb"
KERNEL_DEFCONFIG ?= "corenet32_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
diff --git a/conf/machine/p4080ds.conf b/conf/machine/p4080ds.conf
index b3b012ca..d2f133a0 100644
--- a/conf/machine/p4080ds.conf
+++ b/conf/machine/p4080ds.conf
@@ -17,7 +17,7 @@ UBOOT_CONFIG[spi] = "P4080DS_SPIFLASH_config,,u-boot.pbl"
HV_CFG_M = "p4080ds"
-KERNEL_DEVICETREE ?= "p4080ds.dtb"
+KERNEL_DEVICETREE ?= "fsl/p4080ds.dtb"
KERNEL_DEFCONFIG ?= "corenet32_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf
index 31bb333a..4dc9030c 100644
--- a/conf/machine/p5040ds-64b.conf
+++ b/conf/machine/p5040ds-64b.conf
@@ -18,7 +18,7 @@ UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config,,u-boot.pbl"
HV_CFG_M = "p5040ds"
-KERNEL_DEVICETREE ?= "p5040ds.dtb"
+KERNEL_DEVICETREE ?= "fsl/p5040ds.dtb"
KERNEL_DEFCONFIG ?= "corenet64_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
diff --git a/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf
index 078ef3c2..8ab15ae2 100644
--- a/conf/machine/p5040ds.conf
+++ b/conf/machine/p5040ds.conf
@@ -18,7 +18,7 @@ UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config,,u-boot.pbl"
HV_CFG_M = "p5040ds"
-KERNEL_DEVICETREE ?= "p5040ds.dtb"
+KERNEL_DEVICETREE ?= "fsl/p5040ds.dtb"
KERNEL_DEFCONFIG ?= "corenet32_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
diff --git a/conf/machine/t1024rdb-64b.conf b/conf/machine/t1024rdb-64b.conf
index 5b72f91e..19b8d0be 100644
--- a/conf/machine/t1024rdb-64b.conf
+++ b/conf/machine/t1024rdb-64b.conf
@@ -18,7 +18,7 @@ UBOOT_CONFIG[secure-boot] = "T1024RDB_SECURE_BOOT_config"
HV_CFG_M = "t1024rdb"
-KERNEL_DEVICETREE ?= "t1024rdb.dtb"
+KERNEL_DEVICETREE ?= "fsl/t1024rdb.dtb"
KERNEL_DEFCONFIG ?= "corenet64_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
diff --git a/conf/machine/t1024rdb.conf b/conf/machine/t1024rdb.conf
index e93db6b6..0665463f 100644
--- a/conf/machine/t1024rdb.conf
+++ b/conf/machine/t1024rdb.conf
@@ -18,7 +18,7 @@ UBOOT_CONFIG[secure-boot] = "T1024RDB_SECURE_BOOT_config"
HV_CFG_M = "t1024rdb"
-KERNEL_DEVICETREE ?= "t1024rdb.dtb"
+KERNEL_DEVICETREE ?= "fsl/t1024rdb.dtb"
KERNEL_DEFCONFIG ?= "corenet32_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
diff --git a/conf/machine/t1042d4rdb-64b.conf b/conf/machine/t1042d4rdb-64b.conf
index 71d68ccc..0e2bed55 100644
--- a/conf/machine/t1042d4rdb-64b.conf
+++ b/conf/machine/t1042d4rdb-64b.conf
@@ -18,7 +18,7 @@ UBOOT_CONFIG[secure-boot] = "T1042D4RDB_SECURE_BOOT_config,,u-boot.bin"
HV_CFG_M = "t1040rdb"
-KERNEL_DEVICETREE ?= "t1042d4rdb.dtb"
+KERNEL_DEVICETREE ?= "fsl/t1042d4rdb.dtb"
KERNEL_DEFCONFIG ?= "corenet64_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
diff --git a/conf/machine/t1042d4rdb.conf b/conf/machine/t1042d4rdb.conf
index e5dff42d..a27f2b5e 100644
--- a/conf/machine/t1042d4rdb.conf
+++ b/conf/machine/t1042d4rdb.conf
@@ -18,7 +18,7 @@ UBOOT_CONFIG[secure-boot] = "T1042D4RDB_SECURE_BOOT_config,,u-boot.bin"
HV_CFG_M = "t1040rdb"
-KERNEL_DEVICETREE ?= "t1042d4rdb.dtb"
+KERNEL_DEVICETREE ?= "fsl/t1042d4rdb.dtb"
KERNEL_DEFCONFIG ?= "corenet32_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
diff --git a/conf/machine/t2080rdb-64b.conf b/conf/machine/t2080rdb-64b.conf
index 0b7bc903..e0e7f477 100644
--- a/conf/machine/t2080rdb-64b.conf
+++ b/conf/machine/t2080rdb-64b.conf
@@ -19,7 +19,7 @@ UBOOT_CONFIG[secure-boot] = "T2080RDB_SECURE_BOOT_config"
HV_CFG_M = "t2080rdb"
-KERNEL_DEVICETREE ?= "t2080rdb.dtb"
+KERNEL_DEVICETREE ?= "fsl/t2080rdb.dtb"
KERNEL_DEFCONFIG ?= "corenet64_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
diff --git a/conf/machine/t2080rdb.conf b/conf/machine/t2080rdb.conf
index dbfa393e..bb3db687 100644
--- a/conf/machine/t2080rdb.conf
+++ b/conf/machine/t2080rdb.conf
@@ -19,7 +19,7 @@ UBOOT_CONFIG[secure-boot] = "T2080RDB_SECURE_BOOT_config"
HV_CFG_M = "t2080rdb"
-KERNEL_DEVICETREE ?= "t2080rdb.dtb"
+KERNEL_DEVICETREE ?= "fsl/t2080rdb.dtb"
KERNEL_DEFCONFIG ?= "corenet64_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
diff --git a/conf/machine/t4240rdb-64b.conf b/conf/machine/t4240rdb-64b.conf
index 14e1aa1a..7073e2a9 100644
--- a/conf/machine/t4240rdb-64b.conf
+++ b/conf/machine/t4240rdb-64b.conf
@@ -14,7 +14,7 @@ UBOOT_CONFIG[nor] = "T4240RDB_config,,u-boot-with-dtb.bin"
HV_CFG_M = "t4240rdb"
-KERNEL_DEVICETREE ?= "t4240rdb.dtb"
+KERNEL_DEVICETREE ?= "fsl/t4240rdb.dtb"
KERNEL_DEFCONFIG ?= "corenet64_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
diff --git a/conf/machine/t4240rdb.conf b/conf/machine/t4240rdb.conf
index 2d58a692..1f8cb83c 100644
--- a/conf/machine/t4240rdb.conf
+++ b/conf/machine/t4240rdb.conf
@@ -14,7 +14,7 @@ UBOOT_CONFIG[nor] = "T4240RDB_config,,u-boot-with-dtb.bin"
HV_CFG_M = "t4240rdb"
-KERNEL_DEVICETREE ?= "t4240rdb.dtb"
+KERNEL_DEVICETREE ?= "fsl/t4240rdb.dtb"
KERNEL_DEFCONFIG ?= "corenet64_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"