machine: apalis/colibri-imx6/imx6ull/imx7/-emmc: restructure

Restructure machine configuration files slightly to ease future
maintenance. Just cosmetic, no functional change at all.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
(cherry picked from commit 1c21865e978d1a9d9c48123f4d0c34502ca7537f)

6 files changed, 42 insertions, 40 deletions

diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc
index b8a6d4d..3126f80 100644
--- a/conf/machine/include/apalis-imx6.inc
+++ b/conf/machine/include/apalis-imx6.inc
@@ -1,12 +1,15 @@
 IMAGE_CLASSES:append = " image_type_tezi"
 IMAGE_FSTYPES:append = " teziimg"
-TORADEX_PRODUCT_IDS = "0027 0028 0029 0035"
 # The payload offsets are given in number of 512 byte blocks.
 OFFSET_BOOTROM_PAYLOAD = "2"
 OFFSET_SPL_PAYLOAD = "138"
+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"
+
 KERNEL_DEVICETREE += "imx6q-apalis-ixora-v1.2.dtb"
 KERNEL_DEVICETREE:use-mainline-bsp += " \
     imx6q-apalis-eval.dtb \
@@ -23,11 +26,8 @@ IMX_DEFAULT_BOOTLOADER:apalis-imx6 = "u-boot-toradex"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 UBOOT_SUFFIX = "img"
 
-UBOOT_ENTRYPOINT:apalis-imx6 = "0x11000000"
-UBOOT_DTB_LOADADDRESS:apalis-imx6 = "0x12100000"
-UBOOT_DTBO_LOADADDRESS:apalis-imx6 = "0x17000000"
-
 MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
 
-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"
+UBOOT_DTB_LOADADDRESS:apalis-imx6 = "0x12100000"
+UBOOT_DTBO_LOADADDRESS:apalis-imx6 = "0x17000000"
+UBOOT_ENTRYPOINT:apalis-imx6 = "0x11000000"
diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc
index 111e01c..2905a66 100644
--- a/conf/machine/include/colibri-imx6.inc
+++ b/conf/machine/include/colibri-imx6.inc
@@ -1,9 +1,9 @@
 IMAGE_CLASSES:append = " image_type_tezi"
 IMAGE_FSTYPES:append = " teziimg"
-TORADEX_PRODUCT_IDS = "0014 0015 0016 0017"
 # The payload offsets are given in number of 512 byte blocks.
 OFFSET_BOOTROM_PAYLOAD = "2"
 OFFSET_SPL_PAYLOAD = "138"
+TORADEX_PRODUCT_IDS = "0014 0015 0016 0017"
 
 MACHINE_NAME = "Colibri-iMX6"
 
@@ -27,6 +27,6 @@ UBOOT_SUFFIX = "img"
 
 MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
 
-UBOOT_ENTRYPOINT:colibri-imx6 = "0x11000000"
 UBOOT_DTB_LOADADDRESS:colibri-imx6 = "0x12100000"
 UBOOT_DTBO_LOADADDRESS:colibri-imx6 = "0x17000000"
+UBOOT_ENTRYPOINT:colibri-imx6 = "0x11000000"
diff --git a/conf/machine/include/colibri-imx6ull-emmc.inc b/conf/machine/include/colibri-imx6ull-emmc.inc
index cccfa8b..d71c028 100644
--- a/conf/machine/include/colibri-imx6ull-emmc.inc
+++ b/conf/machine/include/colibri-imx6ull-emmc.inc
@@ -9,14 +9,6 @@ WIC_CREATE_EXTRA_ARGS:append = " --no-fstab-update"
 
 MACHINE_NAME = "Colibri-iMX6ULL-eMMC"
 
-IMX_DEFAULT_BOOTLOADER:colibri-imx6ull-emmc = "u-boot-toradex"
-PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
-UBOOT_MAKE_TARGET:colibri-imx6ull-emmc = "u-boot.imx"
-UBOOT_SUFFIX:colibri-imx6ull-emmc = "imx"
-UBOOT_ENTRYPOINT:colibri-imx6ull-emmc = "0x81000000"
-UBOOT_DTB_LOADADDRESS:colibri-imx6ull-emmc = "0x82100000"
-UBOOT_DTBO_LOADADDRESS:colibri-imx6ull-emmc = "0x87000000"
-
 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"
 
@@ -25,3 +17,12 @@ PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
+
+IMX_DEFAULT_BOOTLOADER:colibri-imx6ull-emmc = "u-boot-toradex"
+PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
+
+UBOOT_DTB_LOADADDRESS:colibri-imx6ull-emmc = "0x82100000"
+UBOOT_DTBO_LOADADDRESS:colibri-imx6ull-emmc = "0x87000000"
+UBOOT_ENTRYPOINT:colibri-imx6ull-emmc = "0x81000000"
+UBOOT_MAKE_TARGET:colibri-imx6ull-emmc = "u-boot.imx"
+UBOOT_SUFFIX:colibri-imx6ull-emmc = "imx"
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc
index bb538a7..d8e3bd2 100644
--- a/conf/machine/include/colibri-imx6ull.inc
+++ b/conf/machine/include/colibri-imx6ull.inc
@@ -11,15 +11,6 @@ WIC_CREATE_EXTRA_ARGS:append = " --no-fstab-update"
 
 MACHINE_NAME = "Colibri-iMX6ULL"
 
-MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
-
-IMX_DEFAULT_BOOTLOADER:colibri-imx6ull = "u-boot-toradex"
-PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
-UBOOT_MAKE_TARGET:colibri-imx6ull = "u-boot.imx"
-UBOOT_ENTRYPOINT:colibri-imx6ull = "0x81000000"
-UBOOT_DTB_LOADADDRESS:colibri-imx6ull = "0x82100000"
-UBOOT_DTBO_LOADADDRESS:colibri-imx6ull = "0x87000000"
-
 KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     imx6ull-colibri-aster.dtb \
     imx6ull-colibri-iris.dtb \
@@ -34,3 +25,13 @@ PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
+
+IMX_DEFAULT_BOOTLOADER:colibri-imx6ull = "u-boot-toradex"
+PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
+
+MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
+
+UBOOT_DTB_LOADADDRESS:colibri-imx6ull = "0x82100000"
+UBOOT_DTBO_LOADADDRESS:colibri-imx6ull = "0x87000000"
+UBOOT_ENTRYPOINT:colibri-imx6ull = "0x81000000"
+UBOOT_MAKE_TARGET:colibri-imx6ull = "u-boot.imx"
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc
index 11e502d..5e534a8 100644
--- a/conf/machine/include/colibri-imx7-emmc.inc
+++ b/conf/machine/include/colibri-imx7-emmc.inc
@@ -7,8 +7,13 @@ TORADEX_FLASH_TYPE = "emmc"
 
 MACHINE_NAME = "Colibri-iMX7-eMMC"
 
-MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
-MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
+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_spidev_overlay.dtbo"
+
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
+    imx7d-colibri-emmc-iris.dtb \
+    imx7d-colibri-emmc-iris-v2.dtb \
+"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
@@ -16,16 +21,11 @@ PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
 
-KERNEL_DEVICETREE:append:use-nxp-bsp = " \
-    imx7d-colibri-emmc-iris.dtb \
-    imx7d-colibri-emmc-iris-v2.dtb \
-"
-
 IMX_DEFAULT_BOOTLOADER:colibri-imx7-emmc = "u-boot-toradex"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
-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_spidev_overlay.dtbo"
+MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
+MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
 
 UBOOT_BINARY:colibri-imx7-emmc = "u-boot.imx"
 UBOOT_DTB_LOADADDRESS:colibri-imx7-emmc = "0x82000000"
diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc
index 90abe9c..acbe9f2 100644
--- a/conf/machine/include/colibri-imx7.inc
+++ b/conf/machine/include/colibri-imx7.inc
@@ -8,9 +8,6 @@ TORADEX_FLASH_TYPE = "rawnand"
 
 MACHINE_NAME = "Colibri-iMX7"
 
-MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
-MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
-
 KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     imx7d-colibri-iris.dtb \
     imx7d-colibri-iris-v2.dtb \
@@ -31,7 +28,10 @@ PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline
 IMX_DEFAULT_BOOTLOADER:colibri-imx7 = "u-boot-toradex"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
-UBOOT_MAKE_TARGET:colibri-imx7 = "u-boot.imx"
-UBOOT_ENTRYPOINT:colibri-imx7 = "0x81000000"
+MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
+MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
+
 UBOOT_DTB_LOADADDRESS:colibri-imx7 = "0x82000000"
 UBOOT_DTBO_LOADADDRESS:colibri-imx7 = "0x87000000"
+UBOOT_ENTRYPOINT:colibri-imx7 = "0x81000000"
+UBOOT_MAKE_TARGET:colibri-imx7 = "u-boot.imx"