digi: [costmetic] order KERNEL_DEVICETREE quasi-alphabetically

List first the overlays belonging to the SOM, then the
ones belonging to the DVK/SBC.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>

meta-digi-arm/conf/machine/ccimx8mm-dvk.conf

@@ -26,16 +26,16 @@ ATF_PLATFORM = "imx8mm"
 IMX_BOOT_SOC_TARGET = "iMX8MM"
 
 KERNEL_DEVICETREE ?= " \
-    digi/ccimx8mm-dvk.dtb \
+    digi/ccimx8m_bt.dtbo \
+    digi/ccimx8mm_cm4.dtbo \
+    digi/ccimx8m_mca-keypad.dtbo \
+    digi/ccimx8m_wifi.dtbo \
     digi/ccimx8m-dvk_flexspi.dtbo \
     digi/ccimx8m-dvk_gpio-watchdog.dtbo \
     digi/ccimx8m-dvk_hsd101pfw2-lvds.dtbo \
     digi/ccimx8m-dvk_lvds.dtbo \
     digi/ccimx8m-dvk_user-leds.dtbo \
-    digi/ccimx8m_bt.dtbo \
+    digi/ccimx8mm-dvk.dtb \
-    digi/ccimx8mm_cm4.dtbo \
-    digi/ccimx8m_mca-keypad.dtbo \
-    digi/ccimx8m_wifi.dtbo \
 "
 
 SERIAL_CONSOLES ?= "115200;ttymxc0"

meta-digi-arm/conf/machine/ccimx8mn-dvk.conf

@@ -25,18 +25,18 @@ ATF_PLATFORM = "imx8mn"
 IMX_BOOT_SOC_TARGET = "iMX8MN"
 
 KERNEL_DEVICETREE ?= " \
-    digi/ccimx8mn-dvk.dtb \
+    digi/ccimx8m_bt.dtbo \
+    digi/ccimx8mn_cm7.dtbo \
+    digi/ccimx8m_mca-keypad.dtbo \
+    digi/ccimx8mn_v1.dtbo \
+    digi/ccimx8m_wifi.dtbo \
     digi/ccimx8m-dvk_flexspi.dtbo \
     digi/ccimx8m-dvk_gpio-watchdog.dtbo \
     digi/ccimx8m-dvk_hsd101pfw2-lvds.dtbo \
     digi/ccimx8m-dvk_lvds.dtbo \
     digi/ccimx8m-dvk_user-leds.dtbo \
     digi/ccimx8mn-dvk_v1-v2.dtbo \
-    digi/ccimx8m_bt.dtbo \
+    digi/ccimx8mn-dvk.dtb \
-    digi/ccimx8mn_cm7.dtbo \
-    digi/ccimx8m_mca-keypad.dtbo \
-    digi/ccimx8mn_v1.dtbo \
-    digi/ccimx8m_wifi.dtbo \
 "
 
 SERIAL_CONSOLES ?= "115200;ttymxc0"

meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf

@@ -11,10 +11,10 @@ UBOOT_CONFIG[ccimx8x_sbc_express] = "ccimx8x_sbc_express_defconfig,,u-boot-dtb.$
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 KERNEL_DEVICETREE ?= " \
-    digi/ccimx8x-sbc-express.dtb \
     digi/ccimx8x_bt.dtbo \
     digi/ccimx8x_quad.dtbo \
     digi/ccimx8x_wifi.dtbo \
+    digi/ccimx8x-sbc-express.dtb \
 "
 
 SERIAL_CONSOLES ?= "115200;ttyLP2"

meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf

@@ -12,7 +12,11 @@ UBOOT_CONFIG[ccimx8x_sbc_pro] = "ccimx8x_sbc_pro_defconfig,,u-boot-dtb.${UBOOT_S
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 KERNEL_DEVICETREE ?= " \
-    digi/ccimx8x-sbc-pro.dtb \
+    digi/ccimx8x_bt.dtbo \
+    digi/ccimx8x_cm4.dtbo \
+    digi/ccimx8x_mca-keypad.dtbo \
+    digi/ccimx8x_quad.dtbo \
+    digi/ccimx8x_wifi.dtbo \
     digi/ccimx8x-sbc-pro_flexcan1.dtbo \
     digi/ccimx8x-sbc-pro_flexspi.dtbo \
     digi/ccimx8x-sbc-pro_gpio-watchdog.dtbo \
@@ -25,11 +29,7 @@ KERNEL_DEVICETREE ?= " \
     digi/ccimx8x-sbc-pro_pcie-modem.dtbo \
     digi/ccimx8x-sbc-pro_user-leds.dtbo \
     digi/ccimx8x-sbc-pro_v1-v3.dtbo \
-    digi/ccimx8x_bt.dtbo \
+    digi/ccimx8x-sbc-pro.dtb \
-    digi/ccimx8x_cm4.dtbo \
-    digi/ccimx8x_mca-keypad.dtbo \
-    digi/ccimx8x_quad.dtbo \
-    digi/ccimx8x_wifi.dtbo \
 "
 
 SERIAL_CONSOLES ?= "115200;ttyLP2"

meta-digi-arm/conf/machine/ccimx93-dvk.conf

@@ -21,18 +21,18 @@ IMXBOOT_TARGETS = "flash_singleboot flash_singleboot_a0"
 SECO_FIRMWARE_NAME:ccimx93 = "mx93??-ahab-container.img"
 
 KERNEL_DEVICETREE ?= " \
-    digi/ccimx93-dvk.dtb \
-    digi/ccimx93-dvk_dlc0200ccp04df-mipi-dsi.dtbo \
-    digi/ccimx93-dvk_lvds.dtbo \
-    digi/ccimx9-dvk_enet2.dtbo \
-    digi/ccimx9-dvk_mikroe-accel2-click.dtbo \
-    digi/ccimx9-dvk_mikroe-gyro-click.dtbo \
-    digi/ccimx9_bt.dtbo \
     digi/ccimx9_bt-dtm.dtbo \
+    digi/ccimx9_bt.dtbo \
     digi/ccimx93_emulate-ccimx91.dtbo \
     digi/ccimx93_npu.dtbo \
     digi/ccimx93_single-core-512M.dtbo \
     digi/ccimx9_wifi.dtbo \
+    digi/ccimx9-dvk_enet2.dtbo \
+    digi/ccimx9-dvk_mikroe-accel2-click.dtbo \
+    digi/ccimx9-dvk_mikroe-gyro-click.dtbo \
+    digi/ccimx93-dvk_dlc0200ccp04df-mipi-dsi.dtbo \
+    digi/ccimx93-dvk_lvds.dtbo \
+    digi/ccimx93-dvk.dtb \
     ${@bb.utils.contains('DISTRO_FEATURES', 'tsn', 'digi/ccimx9-dvk_eqos-tsn.dtbo', '', d)} \
 "
 

meta-digi-arm/conf/machine/ccmp13-dvk.conf

@@ -35,15 +35,15 @@ UBOOT_CONFIG[ccmp13-dvk] = "ccmp13-dvk_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 STM32MP_DEVICETREE ??= "ccmp13-dvk-256MB"
 # Extra DTB for board - need to specify it with .dtb ...
 STM32MP_KERNEL_DEVICETREE:ccmp13-dvk += " \
-    ccmp133-dvk.dtb \
+    ccmp13_bt_test.dtbo \
+    ccmp13_bt.dtbo \
+    ccmp13_wifi.dtbo \
     ccmp13-dvk_mikroe-accel2-click.dtbo \
     ccmp13-dvk_mikroe-gyro-click.dtbo \
     ccmp13-dvk_mikroe-i2c-to-spi-click.dtbo \
     ccmp13-dvk_pwm8.dtbo \
     ccmp13-dvk_v2.dtbo \
-    ccmp13_bt.dtbo \
+    ccmp133-dvk.dtb \
-    ccmp13_bt_test.dtbo \
-    ccmp13_wifi.dtbo \
 "
 # Set DTB load address to U-Boot fdt_addr_r
 UBOOT_DTB_LOADADDRESS = "0xc4000000"

meta-digi-arm/conf/machine/ccmp15-dvk.conf

@@ -35,7 +35,10 @@ UBOOT_CONFIG[ccmp15-dvk] = "ccmp15-dvk_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 STM32MP_DEVICETREE ??= "ccmp15-dvk-512MB ccmp15-dvk-1GB"
 # Extra DTB for board - need to specify it with .dtb ...
 STM32MP_KERNEL_DEVICETREE:ccmp15-dvk += " \
-    ccmp157-dvk.dtb \
+    ccmp15_bt_test.dtbo \
+    ccmp15_bt.dtbo \
+    ccmp15_v1.dtbo \
+    ccmp15_wifi.dtbo \
     ccmp15-dvk_can1.dtbo \
     ccmp15-dvk_can2.dtbo \
     ccmp15-dvk_dlc0200ccp04df-mipi-dsi.dtbo \
@@ -50,10 +53,7 @@ STM32MP_KERNEL_DEVICETREE:ccmp15-dvk += " \
     ccmp15-dvk_sv4e-mipi-analyzer.dtbo \
     ccmp15-dvk_v1.dtbo \
     ccmp15-dvk_v2.dtbo \
-    ccmp15_bt.dtbo \
+    ccmp157-dvk.dtb \
-    ccmp15_bt_test.dtbo \
-    ccmp15_v1.dtbo \
-    ccmp15_wifi.dtbo \
 "
 # Set DTB load address to U-Boot fdt_addr_r
 UBOOT_DTB_LOADADDRESS = "0xc4000000"

meta-digi-arm/conf/machine/ccmp25-dvk.conf

@@ -42,7 +42,8 @@ STM32MP_DT_FILES_EMMC = "ccmp25-dvk"
 
 # Extra DTB for board - need to specify it with .dtb ...
 STM32MP_KERNEL_DEVICETREE:ccmp25-dvk += " \
-    ccmp25-dvk.dtb \
+    ccmp25_bt.dtbo \
+    ccmp25_wifi.dtbo \
     ccmp25-dvk_e55rb-i-mw346-c-mipi-dsi.dtbo \
     ccmp25-dvk_g101evn010-lvds.dtbo \
     ccmp25-dvk_imx335-mipi-csi.dtbo \
@@ -53,8 +54,7 @@ STM32MP_KERNEL_DEVICETREE:ccmp25-dvk += " \
     ccmp25-dvk_n25q256a-spi-nor-flash.dtbo \
     ccmp25-dvk_nhd-3-5-640480ef-msxp-mipi-dsi.dtbo \
     ccmp25-dvk_usb-3-0-typec.dtbo \
-    ccmp25_bt.dtbo \
+    ccmp25-dvk.dtb \
-    ccmp25_wifi.dtbo \
 "
 
 # =========================================================================