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>
master
Chuanhong Guo 2019-07-10 23:57:36 +08:00
parent a2c19f1d2f
commit 087e14ab59
5 changed files with 5 additions and 34 deletions

View File

@ -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|\

View File

@ -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)";
};

View File

@ -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)";
};

View File

@ -7,6 +7,7 @@
/ {
compatible = "mqmaker,witi", "mediatek,mt7621-soc";
model = "MQmaker WiTi";
chosen {
bootargs = "console=ttyS0,57600";

View File

@ -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