airoha: set default DEVICE_DTS/DEVICE_DTS_DIR

All devices under airoha use dts directory under the target,
so update the default DEVICE_DTS_DIR. Also set the default
DEVICE_DTS based on the SoC name for non-dev boards.

Signed-off-by: Chukun Pan <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/20190
Signed-off-by: Christian Marangi <[email protected]>

target/linux/airoha/image/Makefile

@@ -10,7 +10,8 @@ define Device/Default
   KERNEL_INITRAMFS = kernel-bin | lzma | \
 	fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd
   FILESYSTEMS := squashfs
-  DEVICE_DTS_DIR := $(DTS_DIR)
+  DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1)))
+  DEVICE_DTS_DIR := ../dts
   IMAGES := sysupgrade.bin
   IMAGE/sysupgrade.bin := append-kernel | pad-to 128k | append-rootfs | \
 	pad-rootfs | append-metadata

target/linux/airoha/image/an7581.mk

@@ -10,7 +10,6 @@ define Device/airoha_an7581-evb
   DEVICE_MODEL := AN7581 Evaluation Board (SNAND)
   DEVICE_PACKAGES := kmod-leds-pwm kmod-i2c-an7581 kmod-pwm-airoha kmod-input-gpio-keys-polled
   DEVICE_DTS := an7581-evb
-  DEVICE_DTS_DIR := ../dts
   DEVICE_DTS_CONFIG := config@1
   KERNEL_LOADADDR := 0x80088000
   IMAGE/sysupgrade.bin := append-kernel | pad-to 128k | append-rootfs | pad-rootfs | append-metadata
@@ -21,7 +20,6 @@ define Device/airoha_an7581-evb-emmc
   DEVICE_VENDOR := Airoha
   DEVICE_MODEL := AN7581 Evaluation Board (EMMC)
   DEVICE_DTS := an7581-evb-emmc
-  DEVICE_DTS_DIR := ../dts
   DEVICE_PACKAGES := kmod-i2c-an7581
 endef
 TARGET_DEVICES += airoha_an7581-evb-emmc

target/linux/airoha/image/an7583.mk

@@ -30,7 +30,6 @@ define Device/airoha_an7583-evb
   DEVICE_MODEL := AN7583 Evaluation Board (SNAND)
   DEVICE_PACKAGES := kmod-leds-pwm kmod-input-gpio-keys-polled
   DEVICE_DTS := an7583-evb
-  DEVICE_DTS_DIR := ../dts
   DEVICE_DTS_CONFIG := config@1
   KERNEL_LOADADDR := 0x80088000
   IMAGE/sysupgrade.bin := append-kernel | pad-to 128k | append-rootfs | pad-rootfs | append-metadata
@@ -45,7 +44,6 @@ define Device/airoha_an7583-evb-emmc
   DEVICE_VENDOR := Airoha
   DEVICE_MODEL := AN7583 Evaluation Board (EMMC)
   DEVICE_DTS := an7583-evb-emmc
-  DEVICE_DTS_DIR := ../dts
   DEVICE_PACKAGES := kmod-i2c-an7581
   ARTIFACT/preloader.bin := an7583-preloader rfb
   ARTIFACT/bl31-uboot.fip := an7583-bl31-uboot rfb

target/linux/airoha/image/en7523.mk

@@ -8,6 +8,5 @@ define Device/airoha_en7523-evb
   DEVICE_VENDOR := Airoha
   DEVICE_MODEL := EN7523 Evaluation Board
   DEVICE_DTS := en7523-evb
-  DEVICE_DTS_DIR := ../dts
 endef
-TARGET_DEVICES += airoha_en7523-evb
+TARGET_DEVICES += airoha_en7523-evb