aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorChuanhong Guo <gch981213@gmail.com>2019-07-10 23:57:36 +0800
committerChuanhong Guo <gch981213@gmail.com>2019-07-11 22:11:21 +0800
commit087e14ab5994986802739b57e2de227760102bf4 (patch)
tree9265c22053885c7237b182c4eaa1119851bdb127 /target
parenta2c19f1d2f658367e6d62a6bdcfc72f12f23e43e (diff)
downloadupstream-087e14ab5994986802739b57e2de227760102bf4.tar.gz
upstream-087e14ab5994986802739b57e2de227760102bf4.tar.bz2
upstream-087e14ab5994986802739b57e2de227760102bf4.zip
ramips: mt7621: merge two variants of MQmaker WiTi together
Since we can auto-detect memory now, we don't need 2 dts for two memory variants. Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
Diffstat (limited to 'target')
-rwxr-xr-xtarget/linux/ramips/base-files/etc/board.d/02_network3
-rw-r--r--target/linux/ramips/dts/mt7621_mqmaker_witi-256m.dts8
-rw-r--r--target/linux/ramips/dts/mt7621_mqmaker_witi-512m.dts8
-rw-r--r--target/linux/ramips/dts/mt7621_mqmaker_witi.dts (renamed from target/linux/ramips/dts/mt7621_mqmaker_witi.dtsi)1
-rw-r--r--target/linux/ramips/image/mt7621.mk19
5 files changed, 5 insertions, 34 deletions
diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index 090749e1ba..688ce55570 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -63,8 +63,7 @@ ramips_setup_interfaces()
mediatek,mt7621-eval-board|\
mediatek,mt7628an-eval-board|\
mercury,mac1200r-v2|\
- mqmaker,witi-256m|\
- mqmaker,witi-512m|\
+ mqmaker,witi|\
mtc,wr1201|\
netgear,r6220|\
netgear,r6350|\
diff --git a/target/linux/ramips/dts/mt7621_mqmaker_witi-256m.dts b/target/linux/ramips/dts/mt7621_mqmaker_witi-256m.dts
deleted file mode 100644
index 7d08368749..0000000000
--- a/target/linux/ramips/dts/mt7621_mqmaker_witi-256m.dts
+++ /dev/null
@@ -1,8 +0,0 @@
-/dts-v1/;
-
-#include "mt7621_mqmaker_witi.dtsi"
-
-/ {
- compatible = "mqmaker,witi-256m", "mqmaker,witi", "mediatek,mt7621-soc";
- model = "MQmaker WiTi (256MB RAM)";
-};
diff --git a/target/linux/ramips/dts/mt7621_mqmaker_witi-512m.dts b/target/linux/ramips/dts/mt7621_mqmaker_witi-512m.dts
deleted file mode 100644
index 5391c32131..0000000000
--- a/target/linux/ramips/dts/mt7621_mqmaker_witi-512m.dts
+++ /dev/null
@@ -1,8 +0,0 @@
-/dts-v1/;
-
-#include "mt7621_mqmaker_witi.dtsi"
-
-/ {
- compatible = "mqmaker,witi-512m", "mqmaker,witi", "mediatek,mt7621-soc";
- model = "MQmaker WiTi (512MB RAM)";
-};
diff --git a/target/linux/ramips/dts/mt7621_mqmaker_witi.dtsi b/target/linux/ramips/dts/mt7621_mqmaker_witi.dts
index 6e474e90bb..803b35f8c2 100644
--- a/target/linux/ramips/dts/mt7621_mqmaker_witi.dtsi
+++ b/target/linux/ramips/dts/mt7621_mqmaker_witi.dts
@@ -7,6 +7,7 @@
/ {
compatible = "mqmaker,witi", "mediatek,mt7621-soc";
+ model = "MQmaker WiTi";
chosen {
bootargs = "console=ttyS0,57600";
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index 1b3b132b36..1cd9092b14 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -344,30 +344,17 @@ define Device/mikrotik_rbm33g
endef
TARGET_DEVICES += mikrotik_rbm33g
-define Device/mqmaker_witi-256m
+define Device/mqmaker_witi
MTK_SOC := mt7621
IMAGE_SIZE := $(ralink_default_fw_size_16M)
DEVICE_VENDOR := MQmaker
DEVICE_MODEL := WiTi
- DEVICE_VARIANT := 256MB RAM
DEVICE_PACKAGES := \
kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-sdhci-mt7620 kmod-usb3 \
kmod-usb-ledtrig-usbport wpad-basic
- SUPPORTED_DEVICES += witi
+ SUPPORTED_DEVICES += witi mqmaker,witi-256m mqmaker,witi-512m
endef
-TARGET_DEVICES += mqmaker_witi-256m
-
-define Device/mqmaker_witi-512m
- MTK_SOC := mt7621
- IMAGE_SIZE := $(ralink_default_fw_size_16M)
- DEVICE_VENDOR := MQmaker
- DEVICE_MODEL := WiTi
- DEVICE_VARIANT := 512MB RAM
- DEVICE_PACKAGES := \
- kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-sdhci-mt7620 kmod-usb3 \
- kmod-usb-ledtrig-usbport wpad-basic
-endef
-TARGET_DEVICES += mqmaker_witi-512m
+TARGET_DEVICES += mqmaker_witi
define Device/mtc_wr1201
MTK_SOC := mt7621