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 <amadeus@jmu.edu.cn>
Link: https://github.com/openwrt/openwrt/pull/20190
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

diff --git a/target/linux/airoha/image/Makefile b/target/linux/airoha/image/Makefile
index dd5878bfe15ba9f34cfb04132bc0ff542f356d7d..f3547ae3304438ec53ea368f1029246b771c3e94 100644 (file)
--- a/target/linux/airoha/image/Makefile
+++ b/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

diff --git a/target/linux/airoha/image/an7581.mk b/target/linux/airoha/image/an7581.mk
index 78918879f7d595a62879fc84938c44e3052a00b3..8f187b812c11ac63d4ef71399246c8173579fdb8 100644 (file)
--- a/target/linux/airoha/image/an7581.mk
+++ b/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

diff --git a/target/linux/airoha/image/an7583.mk b/target/linux/airoha/image/an7583.mk
index 6ebec7af1bf37243933e70f28a6fc47b4ce59fb8..c8747a7913e3edc0af6e528557c4bd14c4cea0f0 100644 (file)
--- a/target/linux/airoha/image/an7583.mk
+++ b/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

diff --git a/target/linux/airoha/image/en7523.mk b/target/linux/airoha/image/en7523.mk
index aca37a9923a00815c3aa3880bbf0cdc9ac63dce5..e116ce925547936c57679f7256e6d965aac65f53 100644 (file)
--- a/target/linux/airoha/image/en7523.mk
+++ b/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
\ No newline at end of file
+TARGET_DEVICES += airoha_en7523-evb