diff options
author | Philippe Schenker <philippe.schenker@toradex.com> | 2022-09-30 17:11:46 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2022-10-04 18:57:06 +0200 |
commit | e33c9ea11bc6c6eea21926c0cb230a4d69f94af2 (patch) | |
tree | 4fd0123ae1d856e7b8321fc29a3c018fd0be5dfa /conf | |
parent | 348aaca371c16e895d6039d681fba3c4fee9076d (diff) |
machine: 32-bit eMMC machines: use bsp 6.x.y overlays
Related-to: ELB-4810
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
(cherry picked from commit ea0f4ff2de1be789e2b4e59df7f35fcb683e940d)
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/include/apalis-imx6.inc | 7 | ||||
-rw-r--r-- | conf/machine/include/colibri-imx6.inc | 11 | ||||
-rw-r--r-- | conf/machine/include/colibri-imx6ull-emmc.inc | 12 | ||||
-rw-r--r-- | conf/machine/include/colibri-imx7-emmc.inc | 9 |
4 files changed, 10 insertions, 29 deletions
diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc index 6235e01..934c95e 100644 --- a/conf/machine/include/apalis-imx6.inc +++ b/conf/machine/include/apalis-imx6.inc @@ -7,17 +7,12 @@ TORADEX_PRODUCT_IDS = "0027 0028 0029 0035" MACHINE_NAME = "Apalis-iMX6" -TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = " \ - apalis-imx6_hdmi_overlay.dtbo \ -" TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \ - apalis-imx6_parallel-rgb_overlay.dtbo \ - display-edt7_overlay.dtbo \ - apalis-imx6_stmpe-ts_overlay.dtbo \ apalis-imx6_hdmi_overlay.dtbo \ apalis-imx6_spi1_spidev_overlay.dtbo \ apalis-imx6_spi2_spidev_overlay.dtbo \ " +TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "" KERNEL_DEVICETREE += "imx6q-apalis-ixora-v1.2.dtb" KERNEL_DEVICETREE:use-mainline-bsp += " \ diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc index 6d685b2..4a3efe3 100644 --- a/conf/machine/include/colibri-imx6.inc +++ b/conf/machine/include/colibri-imx6.inc @@ -7,16 +7,11 @@ TORADEX_PRODUCT_IDS = "0014 0015 0016 0017" MACHINE_NAME = "Colibri-iMX6" -TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = " \ - colibri-imx6_lcd-vga_overlay.dtbo \ - colibri-imx6_stmpe-ts_overlay.dtbo \ -" TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \ - colibri-imx6_parallel-rgb_overlay.dtbo \ - colibri-imx6_stmpe-ts_overlay.dtbo \ - display-vga_overlay.dtbo \ - colibri-imx6_spidev_overlay.dtbo + colibri-imx6_vga-640x480_overlay.dtbo \ + colibri-imx6_spidev_overlay.dtbo \ " +TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "" KERNEL_DEVICETREE += " \ imx6dl-colibri-iris.dtb \ diff --git a/conf/machine/include/colibri-imx6ull-emmc.inc b/conf/machine/include/colibri-imx6ull-emmc.inc index b44dfc4..d368133 100644 --- a/conf/machine/include/colibri-imx6ull-emmc.inc +++ b/conf/machine/include/colibri-imx6ull-emmc.inc @@ -9,15 +9,11 @@ WIC_CREATE_EXTRA_ARGS:append = " --no-fstab-update" MACHINE_NAME = "Colibri-iMX6ULL-eMMC" -TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = " \ - colibri-imx6ull_parallel-rgb_vga_overlay.dtbo \ - colibri-imx6ull_ad7879_overlay.dtbo \ -" -TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = "colibri-imx6ull_parallel-rgb_overlay.dtbo \ - colibri-imx6ull_ad7879_overlay.dtbo \ - display-vga_overlay.dtbo \ - colibri-imx6ull_spidev_overlay.dtbo \ +TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \ + colibri-imx6ull_vga-640x480_overlay.dtbo \ + colibri-imx6ull_spidev_overlay.dtbo \ " +TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "" PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex" diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc index f17f577..2097578 100644 --- a/conf/machine/include/colibri-imx7-emmc.inc +++ b/conf/machine/include/colibri-imx7-emmc.inc @@ -7,16 +7,11 @@ TORADEX_FLASH_TYPE = "emmc" MACHINE_NAME = "Colibri-iMX7-eMMC" -TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = " \ - colibri-imx7_lcd-vga_overlay.dtbo \ - colibri-imx7_ad7879_overlay.dtbo \ -" TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \ - colibri-imx7_parallel-rgb_overlay.dtbo \ - colibri-imx7_ad7879_overlay.dtbo \ - display-vga_overlay.dtbo \ + colibri-imx7_vga-640x480_overlay.dtbo \ colibri-imx7_spidev_overlay.dtbo \ " +TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "" KERNEL_DEVICETREE:append:use-nxp-bsp = " \ imx7d-colibri-emmc-iris.dtb \ |