From: Felix Fietkau <nbd@nbd.name>
Date: Tue, 7 Jun 2016 07:42:11 +0000 (+0200)
Subject: lantiq: fix image DEVICE_DTS handling, add proper default value
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=97e3d10df90ac084f17323d6d54983e3b7b631cc;p=openwrt%2Fstaging%2Fzorun.git

lantiq: fix image DEVICE_DTS handling, add proper default value

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile
index b31ea77257..b1a6a80cb9 100644
--- a/target/linux/lantiq/image/Makefile
+++ b/target/linux/lantiq/image/Makefile
@@ -267,7 +267,7 @@ define Device/Default
   KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma
   FILESYSTEMS := squashfs
   DEVICE_PROFILE :=
-  DEVICE_DTS :=
+  DEVICE_DTS = $$(DEVICE_PROFILE)
   IMAGE_SIZE :=
   IMAGES := sysupgrade.bin
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
@@ -293,7 +293,6 @@ Image/Build/Profile/BTHOMEHUBV2B=$(call Image/BuildNAND/$(1),$(1),BTHOMEHUBV2B)
 define Device/EASY50712
   DEVICE_PROFILE := EASY50712
   IMAGE_SIZE := 3776k
-  DEVICE_DTS := EASY50712
   DEVICE_TITLE := Lantiq Danube - EASY50712
 endef
 TARGET_DEVICES += EASY50712
@@ -301,7 +300,6 @@ TARGET_DEVICES += EASY50712
 define Device/ACMP252
   DEVICE_PROFILE := ACMP252
   IMAGE_SIZE := 14848k
-  DEVICE_DTS := ACMP252
   DEVICE_TITLE := AudioCodes MediaPack MP-252
   DEVICE_PACKAGES := kmod-rt2x00-pci wpad-mini \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
@@ -313,7 +311,6 @@ TARGET_DEVICES += ACMP252
 define Device/ARV4510PW
   DEVICE_PROFILE := ARV4510PW
   IMAGE_SIZE := 15616k
-  DEVICE_DTS := ARV4510PW
   DEVICE_TITLE := Wippies, Elisa - ARV4510PW
   DEVICE_PACKAGES := kmod-ledtrig-usbdev kmod-usb2-pci kmod-usb-uhci \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
@@ -328,7 +325,6 @@ TARGET_DEVICES += ARV4510PW
 define Device/ARV4525PW
   DEVICE_PROFILE := ARV4525PW
   IMAGE_SIZE := 3776k
-  DEVICE_DTS := ARV4525PW
   DEVICE_TITLE := Speedport W502V Typ A - ARV4525PW
   DEVICE_PACKAGES := kmod-ath5k wpad-mini \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
@@ -340,7 +336,6 @@ TARGET_DEVICES += ARV4525PW
 define Device/ARV7525PW
   DEVICE_PROFILE := ARV7525PW
   IMAGE_SIZE := 3776k
-  DEVICE_DTS := ARV7525PW
   DEVICE_TITLE := Speedport W303V Typ A - ARV7525PW
   DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
@@ -352,7 +347,6 @@ TARGET_DEVICES += ARV7525PW
 define Device/ARV4518PWR01
   DEVICE_PROFILE := ARV4518PWR01
   IMAGE_SIZE := 3776k
-  DEVICE_DTS := ARV4518PWR01
   DEVICE_TITLE := ARV4518PWR01
   DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
@@ -366,7 +360,6 @@ TARGET_DEVICES += ARV4518PWR01
 define Device/ARV4518PWR01A
   DEVICE_PROFILE := ARV4518PWR01A
   IMAGE_SIZE := 3776k
-  DEVICE_DTS := ARV4518PWR01A
   DEVICE_TITLE := ARV4518PWR01A
   DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
@@ -380,7 +373,6 @@ TARGET_DEVICES += ARV4518PWR01A
 define Device/ARV4519PW
   DEVICE_PROFILE := ARV4519PW
   IMAGE_SIZE := 3776k
-  DEVICE_DTS := ARV4519PW
   DEVICE_TITLE := Vodafone, Pirelli - ARV4519PW
   DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
@@ -393,7 +385,6 @@ TARGET_DEVICES += ARV4519PW
 define Device/ARV4520PW
   DEVICE_PROFILE := ARV4520PW
   IMAGE_SIZE := 3648k
-  DEVICE_DTS := ARV4520PW
   DEVICE_TITLE := Easybox 800, WAV-281 - ARV4520PW
   DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
@@ -407,7 +398,6 @@ TARGET_DEVICES += ARV4520PW
 define Device/ARV452CQW
   DEVICE_PROFILE := ARV452CQW
   IMAGE_SIZE := 3776k
-  DEVICE_DTS := ARV452CQW
   DEVICE_TITLE := Easybox 801 - ARV452CQW
   DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
 	kmod-ath5k wpad-mini \
@@ -421,7 +411,6 @@ TARGET_DEVICES += ARV452CQW
 define Device/ARV7510PW22
   DEVICE_PROFILE := ARV7510PW22
   IMAGE_SIZE := 31232k
-  DEVICE_DTS := ARV7510PW22
   DEVICE_TITLE := Astoria - ARV7510PW22
   DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
@@ -437,7 +426,6 @@ TARGET_DEVICES += ARV7510PW22
 define Device/ARV7518PW
   DEVICE_PROFILE := ARV7518PW
   IMAGE_SIZE := 7872k
-  DEVICE_DTS := ARV7518PW
   DEVICE_TITLE := Astoria - ARV7518PW
   DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
@@ -451,7 +439,6 @@ TARGET_DEVICES += ARV7518PW
 define Device/ARV7519PW
   DEVICE_PROFILE := ARV7519PW
   IMAGE_SIZE := 15488k
-  DEVICE_DTS := ARV7519PW
   DEVICE_TITLE := Astoria - ARV7519PW
   DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
@@ -465,7 +452,6 @@ TARGET_DEVICES += ARV7519PW
 define Device/ARV752DPW
   DEVICE_PROFILE := ARV752DPW
   IMAGE_SIZE := 7872k
-  DEVICE_DTS := ARV752DPW
   DEVICE_TITLE := Easybox 802 - ARV752DPW
   DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
@@ -480,7 +466,6 @@ TARGET_DEVICES += ARV752DPW
 define Device/ARV752DPW22
   DEVICE_PROFILE := ARV752DPW22
   IMAGE_SIZE := 7616k
-  DEVICE_DTS := ARV752DPW22
   DEVICE_TITLE := Easybox 803 - ARV752DPW22
   DEVICE_PACKAGES := kmod-usb2-pci kmod-usb-uhci kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
@@ -495,7 +480,6 @@ TARGET_DEVICES += ARV752DPW22
 define Device/ARV8539PW22
   DEVICE_PROFILE := ARV8539PW22
   IMAGE_SIZE := 7616k
-  DEVICE_DTS := ARV8539PW22
   DEVICE_TITLE := Speedport W504V Typ A - ARV8539PW22
   DEVICE_PACKAGES := kmod-ltq-hcd-danube \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
@@ -509,7 +493,6 @@ TARGET_DEVICES += ARV8539PW22
 define Device/GIGASX76X
   DEVICE_PROFILE := GIGASX76X
   IMAGE_SIZE := 7680k
-  DEVICE_DTS := GIGASX76X
   DEVICE_TITLE := Gigaset sx76x
   DEVICE_PACKAGES := kmod-ltq-hcd-danube kmod-ledtrig-usbdev \
 	kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
@@ -570,7 +553,6 @@ Image/Build/Profile/FRITZ7320=$(call Image/BuildEVA/$(1),$(1),FRITZ7320)
 define Device/GR7000
   DEVICE_PROFILE := GR7000
   IMAGE_SIZE := 7808k
-  DEVICE_DTS := GR7000
   DEVICE_TITLE := Aztech GR7000
   DEVICE_PACKAGES := kmod-ltq-deu-ar9 kmod-usb-dwc2 swconfig
 endef
@@ -579,7 +561,6 @@ TARGET_DEVICES += GR7000
 define Device/H201L
   DEVICE_PROFILE := H201L
   IMAGE_SIZE := 7808k
-  DEVICE_DTS := H201L
   DEVICE_TITLE := ZTE H201L - H201L
   DEVICE_PACKAGES := kmod-ath9k-htc wpad-mini \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
@@ -594,7 +575,6 @@ TARGET_DEVICES += H201L
 define Device/P2601HNFX
   DEVICE_PROFILE := P2601HNFX
   IMAGE_SIZE := 15616k
-  DEVICE_DTS := P2601HNFX
   DEVICE_TITLE := ZyXEL P-2601HN-Fx
   DEVICE_PACKAGES := kmod-rt2800-usb wpad-mini \
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
@@ -627,7 +607,6 @@ Image/Build/Profile/P2812HNUF3=$(call Image/BuildNAND/$(1),$(1),P2812HNUF3)
 define Device/ARV7519RW22
   DEVICE_PROFILE := ARV7519RW22
   IMAGE_SIZE := 31232k
-  DEVICE_DTS := ARV7519RW22
   DEVICE_TITLE := Livebox Astoria ARV7519RW22
   DEVICE_PACKAGES := kmod-usb-dwc2
 endef
@@ -643,7 +622,6 @@ Image/Build/Profile/BTHOMEHUBV5A=$(call Image/BuildNAND/$(1),$(1),BTHOMEHUBV5A)
 define Device/EASY80920NAND
   DEVICE_PROFILE := EASY80920NAND
   IMAGE_SIZE := 64512k
-  DEVICE_DTS := EASY80920NAND
   DEVICE_TITLE := Lantiq VR9 - EASY80920NAND
   DEVICE_PACKAGES := kmod-ath9k wpad-mini kmod-usb-dwc2
 endef
@@ -652,7 +630,6 @@ TARGET_DEVICES += EASY80920NAND
 define Device/EASY80920NOR
   DEVICE_PROFILE := EASY80920NOR
   IMAGE_SIZE := 7936k
-  DEVICE_DTS := EASY80920NOR
   DEVICE_TITLE := Lantiq VR9 - EASY80920NOR
   DEVICE_PACKAGES := kmod-ath9k wpad-mini kmod-usb-dwc2
 endef
@@ -673,7 +650,6 @@ include tp-link.mk
 define Device/VGV7510KW22NOR
   DEVICE_PROFILE := VGV7510KW22NOR
   IMAGE_SIZE := 15232k
-  DEVICE_DTS := VGV7510KW22NOR
   DEVICE_TITLE := o2 Box 6431 / Arcadyan VGV7510KW22 (NOR)
   DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini kmod-usb-dwc2
 endef
@@ -682,7 +658,6 @@ TARGET_DEVICES += VGV7510KW22NOR
 define Device/VGV7510KW22BRN
   $(Device/lantiqBrnImage)
   DEVICE_PROFILE := VGV7510KW22BRN
-  DEVICE_DTS := VGV7510KW22BRN
   IMAGE_SIZE := 7168k
   SIGNATURE := 5D00008000
   MAGIC := 0x12345678
@@ -695,7 +670,6 @@ TARGET_DEVICES += VGV7510KW22BRN
 define Device/VGV7519NOR
   DEVICE_PROFILE := VGV7519NOR
   IMAGE_SIZE := 15360k
-  DEVICE_DTS := VGV7519NOR
   DEVICE_TITLE := Experiabox 8 VGV7519
   DEVICE_PACKAGES := kmod-rt2800-pci wpad-mini kmod-usb-dwc2
 endef
@@ -704,7 +678,6 @@ TARGET_DEVICES += VGV7519NOR
 define Device/VGV7519BRN
   $(Device/lantiqBrnImage)
   DEVICE_PROFILE := VGV7519BRN
-  DEVICE_DTS := VGV7519BRN
   IMAGE_SIZE := 7168k
   SIGNATURE := 5D00008000
   MAGIC := 0x12345678
diff --git a/target/linux/lantiq/image/tp-link.mk b/target/linux/lantiq/image/tp-link.mk
index bce617eb51..554419185f 100644
--- a/target/linux/lantiq/image/tp-link.mk
+++ b/target/linux/lantiq/image/tp-link.mk
@@ -21,7 +21,6 @@ endef
 define Device/TDW8970
   $(Device/lantiqTpLink)
   DEVICE_PROFILE := TDW8970
-  DEVICE_DTS = $(DEVICE_PROFILE)
   BOARD_ID := TD-W8970v1
   IMAGE_SIZE := 7680k
   DEVICE_TITLE := TP-LINK TD-W8970
@@ -31,7 +30,6 @@ endef
 define Device/TDW8980
   $(Device/lantiqTpLink)
   DEVICE_PROFILE := TDW8980
-  DEVICE_DTS = $(DEVICE_PROFILE)
   BOARD_ID := TD-W8980v1
   IMAGE_SIZE := 7680k
   DEVICE_TITLE := TP-LINK TD-W8980
@@ -41,7 +39,6 @@ endef
 define Device/VR200v
   $(Device/lantiqTpLink)
   DEVICE_PROFILE := VR200v
-  DEVICE_DTS = $(DEVICE_PROFILE)
   BOARD_ID := ArcherVR200V
   IMAGE_SIZE := 15808k
   DEVICE_TITLE := TP-LINK Archer VR200v