aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-05-29 17:58:20 +0200
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-06-03 15:41:09 +0200
commit64ebf74c059f72e91cbed1030d4609b573992295 (patch)
tree587b988fbc0ae617407fdb7e57ebbc8b53665702
parent6dc01cdee8162ca5d23c67443558a051da085add (diff)
downloadupstream-64ebf74c059f72e91cbed1030d4609b573992295.tar.gz
upstream-64ebf74c059f72e91cbed1030d4609b573992295.tar.bz2
upstream-64ebf74c059f72e91cbed1030d4609b573992295.zip
treewide: drop DEVICE_TYPE when used as device variable
DEVICE_TYPE is a target/subtarget variable, and it does not have any effect when set in a device definition. It can only be set in a target's or subtarget's Makefile. Consequently, having it set anyway is misleading, so this drops all cases. This effectively reverts the following commits: 7a1497fd601d ("apm821xx: MBL: set DEVICE_TYPE to NAS") 5b4765c93a1b ("gemini: Classify Raidsonic NAS IB-4220-B as a NAS") cdc6de460bb4 ("gemini: D-Link DNS-313 is a NAS") For the following commit, the variable was set when adding device support: 27b2f0fc0fc5 ("kirkwood: add support for Iomega Storcenter ix2-200") Cc: Christian Lamparter <chunkeey@gmail.com> Cc: Sungbo Eo <mans0n@gorani.run> Cc: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
-rw-r--r--target/linux/apm821xx/image/Makefile1
-rw-r--r--target/linux/gemini/image/Makefile2
-rw-r--r--target/linux/kirkwood/image/Makefile1
3 files changed, 0 insertions, 4 deletions
diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile
index d732141c8f..c26c015751 100644
--- a/target/linux/apm821xx/image/Makefile
+++ b/target/linux/apm821xx/image/Makefile
@@ -230,7 +230,6 @@ define Device/wd_mybooklive
DEVICE_VENDOR := Western Digital
DEVICE_MODEL := My Book Live Series (Single + Duo)
DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-basic
- DEVICE_TYPE := nas
DEVICE_DTS := wd-mybooklive
SUPPORTED_DEVICES += mbl wd,mybooklive-duo
BLOCKSIZE := 1k
diff --git a/target/linux/gemini/image/Makefile b/target/linux/gemini/image/Makefile
index a155939b8c..83f3d222d9 100644
--- a/target/linux/gemini/image/Makefile
+++ b/target/linux/gemini/image/Makefile
@@ -171,7 +171,6 @@ define Device/dlink_dns-313
DEVICE_VENDOR := D-Link
DEVICE_MODEL := DNS-313 1-Bay Network Storage Enclosure
DEVICE_DTS := gemini-dlink-dns-313
- DEVICE_TYPE := nas
DEVICE_PACKAGES := $(GEMINI_NAS_PACKAGES)
BLOCKSIZE := 1k
FILESYSTEMS := ext4
@@ -204,7 +203,6 @@ define Device/raidsonic_ib-4220-b
DEVICE_VENDOR := Raidsonic
DEVICE_MODEL := NAS IB-4220-B
DEVICE_DTS := gemini-nas4220b
- DEVICE_TYPE := nas
endef
TARGET_DEVICES += raidsonic_ib-4220-b
diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile
index e69e3f125d..552ee44ee4 100644
--- a/target/linux/kirkwood/image/Makefile
+++ b/target/linux/kirkwood/image/Makefile
@@ -66,7 +66,6 @@ define Device/iom_ix2-200
DEVICE_MODEL := StorCenter ix2-200
DEVICE_DTS := kirkwood-iomega_ix2_200
DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-hwmon-lm63
- DEVICE_TYPE:=nas
PAGESIZE := 512
SUBPAGESIZE := 256
BLOCKSIZE := 16k