diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-10-16 16:40:20 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-10-17 19:04:54 +0200 |
| commit | b26b680662c388c2bbdab5d546b9b41f0b5d9378 (patch) | |
| tree | ecf79d108c700a7d5cc16de1f130ced2b2d157d2 | |
| parent | a8ee1e4e3a6d74c02b9284efdc1847d83ed2475f (diff) | |
machines: colibri-imx8x and includes: cosmetic dtb clean-up
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
(cherry picked from commit 40da4d5c230785fb0fe2deff62686ebb37aeadc1)
| -rw-r--r-- | conf/machine/colibri-imx8x.conf | 4 | ||||
| -rw-r--r-- | conf/machine/include/colibri-imx6.inc | 6 | ||||
| -rw-r--r-- | conf/machine/include/colibri-imx6ull.inc | 10 | ||||
| -rw-r--r-- | conf/machine/include/colibri-imx7.inc | 7 |
4 files changed, 19 insertions, 8 deletions
diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf index b3bdb73..d9c70bb 100644 --- a/conf/machine/colibri-imx8x.conf +++ b/conf/machine/colibri-imx8x.conf @@ -24,11 +24,11 @@ LOADADDR = "" USE_VT = "0" KERNEL_DEVICETREE = " \ - freescale/imx8qxp-colibri-eval-v3.dtb \ + freescale/imx8qxp-colibri-aster.dtb \ freescale/imx8qxp-colibri-dsihdmi-eval-v3.dtb \ + freescale/imx8qxp-colibri-eval-v3.dtb \ freescale/imx8qxp-colibri-lvds-dual-eval-v3.dtb \ freescale/imx8qxp-colibri-lvds-single-eval-v3.dtb \ - freescale/imx8qxp-colibri-aster.dtb \ " KERNEL_DEVICETREE_use-mainline-bsp = "freescale/imx8qxp-colibri-eval-v3.dtb" diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc index d2f33f5..1b64dd0 100644 --- a/conf/machine/include/colibri-imx6.inc +++ b/conf/machine/include/colibri-imx6.inc @@ -10,7 +10,11 @@ MACHINE_NAME = "Colibri-iMX6" IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr" WKS_FILE_DEPENDS_append = " u-boot-distro-boot" -KERNEL_DEVICETREE += "imx6dl-colibri-iris.dtb imx6dl-colibri-iris-v2.dtb" +KERNEL_DEVICETREE += " \ + imx6dl-colibri-iris.dtb \ + imx6dl-colibri-iris-v2.dtb \ +" + PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline" diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc index d8e9c43..80acea7 100644 --- a/conf/machine/include/colibri-imx6ull.inc +++ b/conf/machine/include/colibri-imx6ull.inc @@ -24,10 +24,14 @@ UBOOT_ENTRYPOINT_colibri-imx6ull = "0x81000000" UBOOT_MAKE_TARGET_colibri-imx6ull = "u-boot.imx" KERNEL_DEVICETREE_append_use_nxp_bsp = " \ - imx6ull-colibri-aster.dtb imx6ull-colibri-wifi-aster.dtb \ - imx6ull-colibri-iris.dtb imx6ull-colibri-wifi-iris.dtb \ - imx6ull-colibri-iris-v2.dtb imx6ull-colibri-wifi-iris-v2.dtb \ + imx6ull-colibri-aster.dtb \ + imx6ull-colibri-iris.dtb \ + imx6ull-colibri-iris-v2.dtb \ + imx6ull-colibri-wifi-aster.dtb \ + imx6ull-colibri-wifi-iris.dtb \ + imx6ull-colibri-wifi-iris-v2.dtb \ " + PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline" diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc index b45f226..9c9db81 100644 --- a/conf/machine/include/colibri-imx7.inc +++ b/conf/machine/include/colibri-imx7.inc @@ -16,13 +16,16 @@ WKS_FILE_DEPENDS_append = " u-boot-distro-boot" MACHINE_FIRMWARE_remove = "firmware-imx-epdc" KERNEL_DEVICETREE_append_use-nxp-bsp += " \ - imx7d-colibri-iris.dtb imx7s-colibri-iris.dtb \ - imx7d-colibri-iris-v2.dtb imx7s-colibri-iris-v2.dtb \ + imx7d-colibri-iris.dtb \ + imx7d-colibri-iris-v2.dtb \ + imx7s-colibri-iris.dtb \ + imx7s-colibri-iris-v2.dtb \ " KERNEL_DEVICETREE_append_use-mainline-bsp = " \ imx7d-colibri-aster.dtb \ imx7s-colibri-aster.dtb \ " + PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline" |