domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ramips: fix device name of netis WF-2881 to WF2881

Browse Source 
The correct model name of WF-2881 is WF2881 without hyphen. The former used
boardnames are not added to SUPPORTED_DEVICES, to make it explicit that the
sysupgrade-tar image, which is newly added in the previous commit, should
not be used to upgrade from older version.

Signed-off-by: Sungbo Eo <mans0n@gorani.run>
[adjust commit title]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Sungbo Eo
2019-10-08 22:21:13 +09:00
committed by Adrian Schmutzler
parent e030d162f7
commit cc89c5fe27
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
target/linux/ramips/dts/mt7621_netis_wf-2881.dts → target/linux/ramips/dts/mt7621_netis_wf2881.dts
View File

@@ -6,8 +6,8 @@
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
/ { / {
compatible = "netis,wf-2881", "mediatek,mt7621-soc"; compatible = "netis,wf2881", "mediatek,mt7621-soc";
model = "NETIS WF-2881"; model = "NETIS WF2881";
aliases { aliases {
led-boot = &led_wps; led-boot = &led_wps;
@@ -25,14 +25,14 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
usb { usb {
label = "wf-2881:green:usb"; label = "wf2881:green:usb";
gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
linux,default-trigger = "usbport"; linux,default-trigger = "usbport";
}; };
led_wps: wps { led_wps: wps {
label = "wf-2881:green:wps"; label = "wf2881:green:wps";
gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
}; };
}; };

7
target/linux/ramips/image/mt7621.mk
View File

@@ -624,7 +624,7 @@ define Device/netgear_wndr3700-v5
endef endef
TARGET_DEVICES += netgear_wndr3700-v5 TARGET_DEVICES += netgear_wndr3700-v5
define Device/netis_wf-2881 define Device/netis_wf2881
BLOCKSIZE := 128k BLOCKSIZE := 128k
PAGESIZE := 2048 PAGESIZE := 2048
FILESYSTEMS := squashfs FILESYSTEMS := squashfs
@@ -636,11 +636,10 @@ define Device/netis_wf-2881
IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | \ IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | \
check-size $$$$(IMAGE_SIZE) check-size $$$$(IMAGE_SIZE)
DEVICE_VENDOR := NETIS DEVICE_VENDOR := NETIS
DEVICE_MODEL := WF-2881 DEVICE_MODEL := WF2881
DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
SUPPORTED_DEVICES += wf-2881
endef endef
TARGET_DEVICES += netis_wf-2881 TARGET_DEVICES += netis_wf2881
define Device/phicomm_k2p define Device/phicomm_k2p
IMAGE_SIZE := 15744k IMAGE_SIZE := 15744k

4
target/linux/ramips/mt7621/base-files/etc/board.d/02_network
View File

@@ -43,7 +43,7 @@ ramips_setup_interfaces()
netgear,r6350|\ netgear,r6350|\
netgear,r6850|\ netgear,r6850|\
netgear,wndr3700-v5|\ netgear,wndr3700-v5|\
netis,wf-2881|\ netis,wf2881|\
wevo,11acnas|\ wevo,11acnas|\
wevo,w2914ns-v2|\ wevo,w2914ns-v2|\
zio,freezio) zio,freezio)
@@ -181,7 +181,7 @@ ramips_setup_macs()
elecom,wrc-1900gst|\ elecom,wrc-1900gst|\
elecom,wrc-2533gst|\ elecom,wrc-2533gst|\
lenovo,newifi-d1|\ lenovo,newifi-d1|\
netis,wf-2881|\ netis,wf2881|\
phicomm,k2p|\ phicomm,k2p|\
planex,vr500|\ planex,vr500|\
samknows,whitebox-v8|\ samknows,whitebox-v8|\

2
target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
View File

@@ -49,7 +49,7 @@ platform_do_upgrade() {
netgear,r6260|\ netgear,r6260|\
netgear,r6350|\ netgear,r6350|\
netgear,r6850|\ netgear,r6850|\
netis,wf-2881|\ netis,wf2881|\
xiaomi,mir3g|\ xiaomi,mir3g|\
xiaomi,mir3p) xiaomi,mir3p)
nand_do_upgrade "$1" nand_do_upgrade "$1"