summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianling Shen2025-09-18 14:26:51 +0000
committerHauke Mehrtens2025-10-02 20:42:34 +0000
commit5c724939c396e63ca4643f14ae0b138f2d9c08ad (patch)
tree56e24272491216ff8b1c7e9f540372dcc927778a
parent272a392fe19e662ac0746172e63e8a99b988eb75 (diff)
downloadopenwrt-5c724939c396e63ca4643f14ae0b138f2d9c08ad.tar.gz
rockchip: add DEVICE_DTS_DIR definition
Avoid duplicating `rockchip/` prefix when specifying dts path. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org> Link: https://github.com/openwrt/openwrt/pull/20041 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--target/linux/rockchip/image/Makefile3
-rw-r--r--target/linux/rockchip/image/armv8.mk20
2 files changed, 12 insertions, 11 deletions
diff --git a/target/linux/rockchip/image/Makefile b/target/linux/rockchip/image/Makefile
index 5d90ef8cf8..3d50601c23 100644
--- a/target/linux/rockchip/image/Makefile
+++ b/target/linux/rockchip/image/Makefile
@@ -50,7 +50,8 @@ define Device/Default
BOOT_SCRIPT :=
IMAGES := sysupgrade.img.gz
IMAGE/sysupgrade.img.gz = boot-common | boot-script $$(BOOT_SCRIPT) | pine64-img | gzip | append-metadata
- DEVICE_DTS = rockchip/$$(SOC)-$(lastword $(subst _, ,$(1)))
+ DEVICE_DTS_DIR = $$(DTS_DIR)/rockchip
+ DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1)))
UBOOT_DEVICE_NAME = $(lastword $(subst _, ,$(1)))-$$(SOC)
endef
diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk
index 53881b97ac..3135d4c5b7 100644
--- a/target/linux/rockchip/image/armv8.mk
+++ b/target/linux/rockchip/image/armv8.mk
@@ -11,7 +11,7 @@ define Device/armsom_sige7
DEVICE_ALT0_VENDOR := Bananapi
DEVICE_ALT0_MODEL := BPi-M7
SOC := rk3588
- DEVICE_DTS := rockchip/rk3588-armsom-sige7
+ DEVICE_DTS := rk3588-armsom-sige7
DEVICE_PACKAGES := kmod-r8169
endef
TARGET_DEVICES += armsom_sige7
@@ -20,7 +20,7 @@ define Device/firefly_roc-rk3328-cc
DEVICE_VENDOR := Firefly
DEVICE_MODEL := ROC-RK3328-CC
SOC := rk3328
- DEVICE_DTS := rockchip/rk3328-roc-cc
+ DEVICE_DTS := rk3328-roc-cc
UBOOT_DEVICE_NAME := roc-cc-rk3328
endef
TARGET_DEVICES += firefly_roc-rk3328-cc
@@ -151,7 +151,7 @@ define Device/radxa_cm3-io
DEVICE_VENDOR := Radxa
DEVICE_MODEL := CM3 IO
SOC := rk3566
- DEVICE_DTS := rockchip/rk3566-radxa-cm3-io
+ DEVICE_DTS := rk3566-radxa-cm3-io
UBOOT_DEVICE_NAME := radxa-cm3-io-rk3566
endef
TARGET_DEVICES += radxa_cm3-io
@@ -160,7 +160,7 @@ define Device/radxa_e25
DEVICE_VENDOR := Radxa
DEVICE_MODEL := E25
SOC := rk3568
- DEVICE_DTS := rockchip/rk3568-radxa-e25
+ DEVICE_DTS := rk3568-radxa-e25
BOOT_SCRIPT := radxa-e25
UBOOT_DEVICE_NAME := radxa-e25-rk3568
DEVICE_PACKAGES := kmod-r8169 kmod-ata-ahci-dwc
@@ -172,7 +172,7 @@ define Device/radxa_e52c
DEVICE_MODEL := E52C
SOC := rk3582
UBOOT_DEVICE_NAME := generic-rk3588
- DEVICE_DTS := rockchip/rk3582-radxa-e52c
+ DEVICE_DTS := rk3582-radxa-e52c
DEVICE_PACKAGES := blkdiscard kmod-r8169
endef
TARGET_DEVICES += radxa_e52c
@@ -247,7 +247,7 @@ define Device/radxa_rock-5b-plus
DEVICE_MODEL := ROCK 5B+
SOC := rk3588
UBOOT_DEVICE_NAME := generic-rk3588
- DEVICE_DTS := rockchip/rk3588-rock-5b-plus
+ DEVICE_DTS := rk3588-rock-5b-plus
DEVICE_PACKAGES := blkdiscard block-mount kmod-hwmon-pwmfan kmod-nvme kmod-r8169 kmod-rtw89-8852be wpad-basic-mbedtls
endef
TARGET_DEVICES += radxa_rock-5b-plus
@@ -265,7 +265,7 @@ define Device/radxa_rock-5t
DEVICE_MODEL := ROCK 5T
SOC := rk3588
UBOOT_DEVICE_NAME := generic-rk3588
- DEVICE_DTS := rockchip/rk3588-rock-5t
+ DEVICE_DTS := rk3588-rock-5t
DEVICE_PACKAGES := blkdiscard block-mount iwlwifi-firmware-ax210 kmod-hwmon-pwmfan kmod-iwlwifi kmod-nvme kmod-r8169 wpad-basic-mbedtls
endef
TARGET_DEVICES += radxa_rock-5t
@@ -290,7 +290,7 @@ define Device/radxa_rock-pi-e-v3
DEVICE_VENDOR := Radxa
DEVICE_MODEL := ROCK Pi E v3.0
SOC := rk3328
- DEVICE_DTS := rockchip/rk3328-rock-pi-e
+ DEVICE_DTS := rk3328-rock-pi-e
DEVICE_PACKAGES := kmod-rtw88-8723du kmod-rtw88-8821cu kmod-usb-net-cdc-ncm kmod-usb-net-rndis wpad-basic-mbedtls
endef
TARGET_DEVICES += radxa_rock-pi-e-v3
@@ -309,7 +309,7 @@ define Device/radxa_zero-3e
DEVICE_VENDOR := Radxa
DEVICE_MODEL := ZERO 3E
SOC := rk3566
- DEVICE_DTS := rockchip/rk3566-radxa-zero-3e
+ DEVICE_DTS := rk3566-radxa-zero-3e
UBOOT_DEVICE_NAME := radxa-zero-3-rk3566
DEVICE_PACKAGES := kmod-usb-net-cdc-ncm kmod-usb-net-rndis
endef
@@ -319,7 +319,7 @@ define Device/radxa_zero-3w
DEVICE_VENDOR := Radxa
DEVICE_MODEL := ZERO 3W
SOC := rk3566
- DEVICE_DTS := rockchip/rk3566-radxa-zero-3w
+ DEVICE_DTS := rk3566-radxa-zero-3w
UBOOT_DEVICE_NAME := radxa-zero-3-rk3566
DEVICE_PACKAGES := kmod-usb-net-cdc-ncm kmod-usb-net-rndis
endef