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 5d25cdba966..2c92a6a93b3 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -113,7 +113,8 @@ ramips_setup_interfaces() vr500|\ wf-2881|\ whr-g300n|\ - witi|\ + mqmaker,witi-256m|\ + mqmaker,witi-512m|\ wl-wn575a3|\ wndr3700v5|\ youku-yk1|\ diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index d84bdff3a75..6a51778726a 100644 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -279,7 +279,8 @@ get_status_led() { status_led="$boardname:green:status" ;; w306r-v20|\ - witi|\ + mqmaker,witi-256m|\ + mqmaker,witi-512m|\ zbt-wr8305rt) status_led="$boardname:green:sys" ;; diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 75474fbc6d0..8c151552dca 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -577,9 +577,6 @@ ramips_board_detect() { *"WHR-G300N") name="whr-g300n" ;; - *"WiTi") - name="witi" - ;; *"WIZARD 8800") name="wizard8800" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index ff73d6474b8..e90b560731a 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -173,7 +173,8 @@ platform_check_image() { whr-g300n|\ widora,neo-16m|\ widora,neo-32m|\ - witi|\ + mqmaker,witi-256m|\ + mqmaker,witi-512m|\ wizfi630a|\ wl-330n|\ wl-330n3g|\ diff --git a/target/linux/ramips/base-files/sbin/fixup-mac-address b/target/linux/ramips/base-files/sbin/fixup-mac-address index 98264c082e7..309db8ce45d 100755 --- a/target/linux/ramips/base-files/sbin/fixup-mac-address +++ b/target/linux/ramips/base-files/sbin/fixup-mac-address @@ -9,7 +9,8 @@ YES= board=$(board_name) case $board in - witi) + mqmaker,witi-256m|\ + mqmaker,witi-512m) partname=factory offset=$((0xe000)) ;; diff --git a/target/linux/ramips/dts/WITI-256M.dts b/target/linux/ramips/dts/WITI-256M.dts new file mode 100644 index 00000000000..4c12d8c3b5b --- /dev/null +++ b/target/linux/ramips/dts/WITI-256M.dts @@ -0,0 +1,13 @@ +/dts-v1/; + +#include "WITI.dtsi" + +/ { + compatible = "mqmaker,witi-256m", "mqmaker,witi", "mediatek,mt7621-soc"; + model = "MQmaker WiTi (256MB RAM)"; + + memory@0 { + device_type = "memory"; + reg = <0x0 0x10000000>; + }; +}; diff --git a/target/linux/ramips/dts/WITI-512M.dts b/target/linux/ramips/dts/WITI-512M.dts new file mode 100644 index 00000000000..b2490755340 --- /dev/null +++ b/target/linux/ramips/dts/WITI-512M.dts @@ -0,0 +1,13 @@ +/dts-v1/; + +#include "WITI.dtsi" + +/ { + compatible = "mqmaker,witi-512m", "mqmaker,witi", "mediatek,mt7621-soc"; + model = "MQmaker WiTi (512MB RAM)"; + + memory@0 { + device_type = "memory"; + reg = <0x0 0x1c000000>, <0x20000000 0x4000000>; + }; +}; diff --git a/target/linux/ramips/dts/WITI.dts b/target/linux/ramips/dts/WITI.dtsi similarity index 95% rename from target/linux/ramips/dts/WITI.dts rename to target/linux/ramips/dts/WITI.dtsi index 097c8163ff2..767ea03ff0b 100644 --- a/target/linux/ramips/dts/WITI.dts +++ b/target/linux/ramips/dts/WITI.dtsi @@ -7,12 +7,6 @@ / { compatible = "mqmaker,witi", "mediatek,mt7621-soc"; - model = "MQmaker WiTi"; - - memory@0 { - device_type = "memory"; - reg = <0x0 0x10000000>; - }; chosen { bootargs = "console=ttyS0,57600"; diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index d78175cf74d..b84b74a5b0f 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -310,15 +310,26 @@ define Device/wf-2881 endef TARGET_DEVICES += wf-2881 -define Device/witi - DTS := WITI +define Device/mqmaker_witi-256m + DTS := WITI-256M IMAGE_SIZE := $(ralink_default_fw_size_16M) - DEVICE_TITLE := MQmaker WiTi + DEVICE_TITLE := MQmaker WiTi (256MB RAM) + DEVICE_PACKAGES := \ + kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-sdhci-mt7620 kmod-usb3 \ + kmod-usb-ledtrig-usbport wpad-mini + SUPPORTED_DEVICES += witi +endef +TARGET_DEVICES += mqmaker_witi-256m + +define Device/mqmaker_witi-512m + DTS := WITI-512M + IMAGE_SIZE := $(ralink_default_fw_size_16M) + DEVICE_TITLE := MQmaker WiTi (512MB RAM) DEVICE_PACKAGES := \ kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-sdhci-mt7620 kmod-usb3 \ kmod-usb-ledtrig-usbport wpad-mini endef -TARGET_DEVICES += witi +TARGET_DEVICES += mqmaker_witi-512m define Device/wndr3700v5 DTS := WNDR3700V5