hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ramips: apply consistent device name/compatible to ZBT-WE1026-5G 

All Zbtlink ramips devices except the ZBT-WE1026-5G include the
zbt-/ZBT- prefix in their model name.

This changes ZBT-WE1026-5G to also follow that scheme.

The patch moves some block to keep alphatical order.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
master
Adrian Schmutzler 2019-09-26 14:44:23 +02:00 committed by Daniel Golle
parent b376818f97
commit 400e56d22c
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/linux/ramips/base-files/etc/board.d/01_leds
View File

@ -445,10 +445,6 @@ youku,yk1)
set_wifi_led "$boardname:blue:air" set_wifi_led "$boardname:blue:air"
ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x10" ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x10"
;; ;;
zbtlink,we1026-5g-16m)
ucidef_set_led_netdev "lan" "LAN" "we1026-5g:green:lan" "eth0"
set_wifi_led "we1026-5g:green:wifi"
;;
zbtlink,zbt-ape522ii) zbtlink,zbt-ape522ii)
ucidef_set_led_netdev "wlan2g4" "wlan1-link" "$boardname:green:wlan2g4" "wlan1" ucidef_set_led_netdev "wlan2g4" "wlan1-link" "$boardname:green:wlan2g4" "wlan1"
ucidef_set_led_netdev "sys1" "wlan1" "$boardname:green:sys1" "wlan1" "tx rx" ucidef_set_led_netdev "sys1" "wlan1" "$boardname:green:sys1" "wlan1" "tx rx"
@ -461,6 +457,10 @@ zbtlink,zbt-we826-16m|\
zbtlink,zbt-we826-32m) zbtlink,zbt-we826-32m)
set_wifi_led "zbt-we826:green:wifi" set_wifi_led "zbt-we826:green:wifi"
;; ;;
zbtlink,zbt-we1026-5g-16m)
ucidef_set_led_netdev "lan" "LAN" "we1026-5g:green:lan" "eth0"
set_wifi_led "we1026-5g:green:wifi"
;;
zbtlink,zbt-we1226) zbtlink,zbt-we1226)
set_wifi_led "$boardname:green:wlan" set_wifi_led "$boardname:green:wlan"
ucidef_set_led_switch "lan1" "LAN1" "$boardname:green:lan1" "switch0" "0x01" ucidef_set_led_switch "lan1" "LAN1" "$boardname:green:lan1" "switch0" "0x01"

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

@ -451,7 +451,7 @@ ramips_setup_interfaces()
"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "9@eth0" "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "9@eth0"
;; ;;
sparklan,wcr-150gn|\ sparklan,wcr-150gn|\
zbtlink,we1026-5g-16m) zbtlink,zbt-we1026-5g-16m)
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \
"0:lan" "6t@eth0" "0:lan" "6t@eth0"
;; ;;

4
target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g-16m.dts → target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-5g-16m.dts
View File

@ -33,10 +33,10 @@
/dts-v1/; /dts-v1/;
#include "mt7620a_zbtlink_we1026-5g.dtsi" #include "mt7620a_zbtlink_zbt-we1026-5g.dtsi"
/ { / {
compatible = "zbtlink,we1026-5g-16m", "ralink,mt7620a-soc"; compatible = "zbtlink,zbt-we1026-5g-16m", "ralink,mt7620a-soc";
model = "Zbtlink ZBT-WE1026-5G (16M)"; model = "Zbtlink ZBT-WE1026-5G (16M)";
}; };

2
target/linux/ramips/dts/mt7620a_zbtlink_we1026-5g.dtsi → target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-5g.dtsi
View File

@ -37,7 +37,7 @@
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
/ { / {
compatible = "zbtlink,we1026-5g", "ralink,mt7620a-soc"; compatible = "zbtlink,zbt-we1026-5g", "ralink,mt7620a-soc";
chosen { chosen {
bootargs = "console=ttyS0,115200"; bootargs = "console=ttyS0,115200";

22
target/linux/ramips/image/mt7620.mk
View File

@ -943,17 +943,6 @@ define Device/yukai_bocco
endef endef
TARGET_DEVICES += yukai_bocco TARGET_DEVICES += yukai_bocco
define Device/zbtlink_we1026-5g-16m
MTK_SOC := mt7620a
IMAGE_SIZE := 16064k
DEVICE_VENDOR := Zbtlink
DEVICE_MODEL := ZBT-WE1026-5G
DEVICE_VARIANT := 16M
DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
SUPPORTED_DEVICES += we1026-5g-16m
endef
TARGET_DEVICES += zbtlink_we1026-5g-16m
define Device/zbtlink_zbt-ape522ii define Device/zbtlink_zbt-ape522ii
MTK_SOC := mt7620a MTK_SOC := mt7620a
IMAGE_SIZE := 15872k IMAGE_SIZE := 15872k
@ -984,6 +973,17 @@ define Device/zbtlink_zbt-wa05
endef endef
TARGET_DEVICES += zbtlink_zbt-wa05 TARGET_DEVICES += zbtlink_zbt-wa05
define Device/zbtlink_zbt-we1026-5g-16m
MTK_SOC := mt7620a
IMAGE_SIZE := 16064k
DEVICE_VENDOR := Zbtlink
DEVICE_MODEL := ZBT-WE1026-5G
DEVICE_VARIANT := 16M
DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
SUPPORTED_DEVICES += we1026-5g-16m zbtlink,we1026-5g-16m
endef
TARGET_DEVICES += zbtlink_zbt-we1026-5g-16m
define Device/zbtlink_zbt-we2026 define Device/zbtlink_zbt-we2026
MTK_SOC := mt7620n MTK_SOC := mt7620n
IMAGE_SIZE := 7552k IMAGE_SIZE := 7552k