ramips: use destinct 11AC NAS board name

Use a distinct board name even if the board is near to identical to
the WeVO W2914NS v2.

To make sure that a 11AC NAS image can not be installed on a
WeVO W2914NS v2, both board need to use different names.

Signed-off-by: Mathias Kresin <dev@kresin.me>
This commit is contained in:
Mathias Kresin 2016-12-23 08:21:31 +01:00
parent a18488a0aa
commit ae3ac76e56
6 changed files with 44 additions and 30 deletions

View File

@ -17,6 +17,16 @@ board=$(ramips_board_name)
board_config_update board_config_update
case $board in case $board in
11acnas|\
all0239-3g|\
hw550-3g|\
mofi3500-3gn|\
sap-g3200u3|\
sk-wb8|\
w2914nsv2|\
wf-2881)
set_usb_led "$board:green:usb"
;;
3g150b|\ 3g150b|\
3g300m) 3g300m)
set_usb_led "$board:blue:3g" set_usb_led "$board:blue:3g"
@ -45,14 +55,6 @@ air3gii)
set_wifi_led "$board:green:wlan" set_wifi_led "$board:green:wlan"
set_usb_led "$board:green:mobile" set_usb_led "$board:green:mobile"
;; ;;
all0239-3g|\
hw550-3g|\
mofi3500-3gn|\
sap-g3200u3|\
sk-wb8|\
wf-2881)
set_usb_led "$board:green:usb"
;;
all0256n) all0256n)
ucidef_set_rssimon "wlan0" "200000" "1" ucidef_set_rssimon "wlan0" "200000" "1"
ucidef_set_led_rssi "rssilow" "RSSILOW" "$board:green:rssilow" "wlan0" "1" "40" "0" "6" ucidef_set_led_rssi "rssilow" "RSSILOW" "$board:green:rssilow" "wlan0" "1" "40" "0" "6"
@ -315,9 +317,6 @@ vocore)
ucidef_set_led_netdev "eth" "ETH" "$board:orange:eth" "eth0" ucidef_set_led_netdev "eth" "ETH" "$board:orange:eth" "eth0"
set_wifi_led "$board:green:status" set_wifi_led "$board:green:status"
;; ;;
w2914nsv2)
set_usb_led "$board:green:usb"
;;
w502u) w502u)
set_usb_led "$board:blue:usb" set_usb_led "$board:blue:usb"
set_wifi_led "rt2800pci-phy0::radio" set_wifi_led "rt2800pci-phy0::radio"

View File

@ -32,6 +32,11 @@ ramips_setup_interfaces()
local board="$1" local board="$1"
case $board in case $board in
11acnas|\
w2914nsv2)
ucidef_add_switch "switch0" \
"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan:5" "6@eth0"
;;
3g150b|\ 3g150b|\
3g300m|\ 3g300m|\
a5-v11|\ a5-v11|\
@ -251,10 +256,6 @@ ramips_setup_interfaces()
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \
"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "5@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "5@eth0"
;; ;;
w2914nsv2)
ucidef_add_switch "switch0" \
"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan:5" "6@eth0"
;;
wcr-150gn) wcr-150gn)
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \
"0:lan" "6t@eth0" "0:lan" "6t@eth0"

View File

@ -14,7 +14,7 @@ ramips_board_detect() {
case "$machine" in case "$machine" in
*"11AC NAS Router") *"11AC NAS Router")
name="w2914nsv2" name="11acnas"
;; ;;
*"3G150B") *"3G150B")
name="3g150b" name="3g150b"

View File

@ -9,4 +9,18 @@
device_type = "memory"; device_type = "memory";
reg = <0x0 0x10000000>; reg = <0x0 0x10000000>;
}; };
gpio-leds {
compatible = "gpio-leds";
// Only USB LED is connected to GPIO.
// All of other LEDs are connected directly to
// switch, WiFi chip, Vcc, so they are not controllable
// via GPIO
usb {
label = "11acnas:green:usb";
gpios = <&gpio0 27 GPIO_ACTIVE_LOW>;
};
};
}; };

View File

@ -9,4 +9,18 @@
device_type = "memory"; device_type = "memory";
reg = <0x0 0x8000000>; reg = <0x0 0x8000000>;
}; };
gpio-leds {
compatible = "gpio-leds";
// Only USB LED is connected to GPIO.
// All of other LEDs are connected directly to
// switch, WiFi chip, Vcc, so they are not controllable
// via GPIO
usb {
label = "w2914nsv2:green:usb";
gpios = <&gpio0 27 GPIO_ACTIVE_LOW>;
};
};
}; };

View File

@ -26,20 +26,6 @@
linux,code = <KEY_WPS_BUTTON>; linux,code = <KEY_WPS_BUTTON>;
}; };
}; };
gpio-leds {
compatible = "gpio-leds";
// Only USB LED is connected to GPIO.
// All of other LEDs are connected directly to
// switch, WiFi chip, Vcc, so they are not controllable
// via GPIO
usb {
label = "w2914nsv2:green:usb";
gpios = <&gpio0 27 GPIO_ACTIVE_LOW>;
};
};
}; };
&xhci { &xhci {