[PATCH v2] bcm4908: automatically set DEVICE_DTS from device name

Adrian Schmutzler freifunk at adrianschmutzler.de
Fri Feb 12 10:47:20 EST 2021


This sets the DTS paths automatically based on their device definition
name. Devices where this is not possible may still be served by simply
overwriting DEVICE_DTS in their respective definition.

Cc: Rafał Miłecki <rafal at milecki.pl>

Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
I don't have time to investigate the fully magic solution anytime soon.

I'd thus be happy to merge this for now.

Would you give it a try, as I cannot test it?
---
 target/linux/bcm4908/image/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/target/linux/bcm4908/image/Makefile b/target/linux/bcm4908/image/Makefile
index 8a40a1e6a9..559f60faf1 100644
--- a/target/linux/bcm4908/image/Makefile
+++ b/target/linux/bcm4908/image/Makefile
@@ -37,6 +37,8 @@ define Build/bcm4908lzma
 	mv $@.new $@
 endef
 
+DTS_DIR := $(DTS_DIR)/broadcom/bcm4908
+
 define Device/Default
   KERNEL := kernel-bin | bcm4908lzma | bcm4908kernel
   KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
@@ -44,15 +46,16 @@ define Device/Default
   KERNEL_INITRAMFS := kernel-bin | bcm4908lzma | bcm4908kernel
   FILESYSTEMS := squashfs
   KERNEL_NAME := Image
+  DEVICE_DTS = $$(SOC)-$(subst _,-,$(1))
   IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1).$$(2)
   BLOCKSIZE := 128k
   PAGESIZE := 2048
 endef
 
 define Device/asus_gt-ac5300
+  SOC := bcm4908
   DEVICE_VENDOR := Asus
   DEVICE_MODEL := GT-AC5300
-  DEVICE_DTS := broadcom/bcm4908/bcm4908-asus-gt-ac5300
   IMAGES := bin
   IMAGE/bin := append-ubi | bcm4908img | bcm4908asus
   ASUS_PRODUCTID := GT-AC5300
@@ -63,9 +66,9 @@ endef
 TARGET_DEVICES += asus_gt-ac5300
 
 define Device/netgear_r8000p
+  SOC := bcm4906
   DEVICE_VENDOR := Netgear
   DEVICE_MODEL := R8000P
-  DEVICE_DTS := broadcom/bcm4908/bcm4906-netgear-r8000p
   IMAGES := bin
   IMAGE/bin := append-ubi | bcm4908img
 endef
-- 
2.20.1




More information about the openwrt-devel mailing list