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>

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 090749e1baa110e1f0a424b6e023cddb1168ee44..688ce555706260182a03d1cbe9570e9589a2567d 100755 (executable)
--- 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 (file)
index 7d08368..0000000
--- 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 (file)
index 5391c32..0000000
--- 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
similarity index 98%
rename from target/linux/ramips/dts/mt7621_mqmaker_witi.dtsi
rename to target/linux/ramips/dts/mt7621_mqmaker_witi.dts
index 6e474e90bbcdb960ea83f20c9df960d8ede16522..803b35f8c2db3df2748f1cc21a9d1f026e72f050 100644 (file)
--- 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 1b3b132b36961adaa21fea2c0ce2036d0943ce19..1cd9092b141ee3f6d2a0f973b24797438374fe2b 100644 (file)
--- 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