ramips: fix Zbtlink ZBT-WR8305RT board name

There is another Zbtlink board (ZBT-WA05) supported in ramips target, so use the same naming scheme for ZBT-WR8305RT board and its dts file.

Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>

SVN-Revision: 46614
owl
John Crispin 2015-08-17 05:57:41 +00:00
parent 553fea9f19
commit f38db77707
7 changed files with 17 additions and 17 deletions

View File

@ -245,10 +245,10 @@ case $board in
ucidef_set_led_default "power" "power" "oy:green:power" "1" ucidef_set_led_default "power" "power" "oy:green:power" "1"
set_wifi_led "oy:green:wifi" set_wifi_led "oy:green:wifi"
;; ;;
wr8305rt) zbt-wr8305rt)
ucidef_set_led_default "power" "power" "wr8305rt:sys" "1" ucidef_set_led_default "power" "power" "zbt-wr8305rt:sys" "1"
set_usb_led "wr8305rt:usb" set_usb_led "zbt-wr8305rt:usb"
set_wifi_led "wr8305rt:wifi" set_wifi_led "zbt-wr8305rt:wifi"
;; ;;
wt1520) wt1520)
set_wifi_led "rt2800pci-phy0::radio" set_wifi_led "rt2800pci-phy0::radio"

View File

@ -228,7 +228,7 @@ ramips_setup_interfaces()
ucidef_add_switch_vlan "switch0" "2" "6t" ucidef_add_switch_vlan "switch0" "2" "6t"
;; ;;
wr8305rt) zbt-wr8305rt)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
ucidef_add_switch "switch0" "1" "1" ucidef_add_switch "switch0" "1" "1"
ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4 6t" ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4 6t"

View File

@ -196,8 +196,8 @@ get_status_led() {
wr512-3gn) wr512-3gn)
status_led="wr512:green:wps" status_led="wr512:green:wps"
;; ;;
wr8305rt) zbt-wr8305rt)
status_led="wr8305rt:sys" status_led="zbt-wr8305rt:sys"
;; ;;
whr-300hp2 | \ whr-300hp2 | \
whr-600d | \ whr-600d | \

View File

@ -406,8 +406,8 @@ ramips_board_detect() {
*"OY-0001") *"OY-0001")
name="oy-0001" name="oy-0001"
;; ;;
*"ZBT WR8305RT") *"Zbtlink ZBT-WR8305RT")
name="wr8305rt" name="zbt-wr8305rt"
;; ;;
*"ZTE Q7") *"ZTE Q7")
name="zte-q7" name="zte-q7"

View File

@ -116,7 +116,7 @@ platform_check_image() {
wnce2001 | \ wnce2001 | \
wr512-3gn |\ wr512-3gn |\
wr6202 |\ wr6202 |\
wr8305rt |\ zbt-wr8305rt |\
wrtnode |\ wrtnode |\
oy-0001 |\ oy-0001 |\
wt1520 |\ wt1520 |\

View File

@ -3,8 +3,8 @@
/include/ "mt7620n.dtsi" /include/ "mt7620n.dtsi"
/ { / {
compatible = "wr8305rt", "ralink,mt7620n-soc"; compatible = "zbtlink,zbt-wr8305rt", "ralink,mt7620n-soc";
model = "ZBT WR8305RT"; model = "Zbtlink ZBT-WR8305RT";
palmbus@10000000 { palmbus@10000000 {
gpio1: gpio@638 { gpio1: gpio@638 {
@ -87,17 +87,17 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
sys { sys {
label = "wr8305rt:sys"; label = "zbt-wr8305rt:sys";
gpios = <&gpio1 14 1>; gpios = <&gpio1 14 1>;
}; };
lan { lan {
label = "wr8305rt:usb"; label = "zbt-wr8305rt:usb";
gpios = <&gpio1 15 1>; gpios = <&gpio1 15 1>;
}; };
wifi { wifi {
label = "wr8305rt:wifi"; label = "zbt-wr8305rt:wifi";
gpios = <&gpio3 0 1>; gpios = <&gpio3 0 1>;
}; };
}; };

View File

@ -876,12 +876,12 @@ Image/Build/Profile/MLW221=$(call BuildFirmware/Default16M/$(1),$(1),mlw221,MLW2
Image/Build/Profile/MLWG2=$(call BuildFirmware/Default16M/$(1),$(1),mlwg2,MLWG2) Image/Build/Profile/MLWG2=$(call BuildFirmware/Default16M/$(1),$(1),mlwg2,MLWG2)
Image/Build/Profile/WMR300=$(call BuildFirmware/Default8M/$(1),$(1),wmr-300,WMR300) Image/Build/Profile/WMR300=$(call BuildFirmware/Default8M/$(1),$(1),wmr-300,WMR300)
Image/Build/Profile/RT-N14U=$(call BuildFirmware/Default8M/$(1),$(1),rt-n14u,RT-N14U) Image/Build/Profile/RT-N14U=$(call BuildFirmware/Default8M/$(1),$(1),rt-n14u,RT-N14U)
Image/Build/Profile/WR8305RT=$(call BuildFirmware/Default8M/$(1),$(1),wr8305rt,WR8305RT)
Image/Build/Profile/WRTNODE=$(call BuildFirmware/Default16M/$(1),$(1),wrtnode,WRTNODE) Image/Build/Profile/WRTNODE=$(call BuildFirmware/Default16M/$(1),$(1),wrtnode,WRTNODE)
Image/Build/Profile/WT3020=$(call BuildFirmware/PorayDualSize/$(1),$(1),wt3020,WT3020) Image/Build/Profile/WT3020=$(call BuildFirmware/PorayDualSize/$(1),$(1),wt3020,WT3020)
Image/Build/Profile/XIAOMI-MIWIFI-MINI=$(call BuildFirmware/Default16M/$(1),$(1),xiaomi-miwifi-mini,XIAOMI-MIWIFI-MINI) Image/Build/Profile/XIAOMI-MIWIFI-MINI=$(call BuildFirmware/Default16M/$(1),$(1),xiaomi-miwifi-mini,XIAOMI-MIWIFI-MINI)
Image/Build/Profile/ZTE-Q7=$(call BuildFirmware/Default8M/$(1),$(1),zte-q7,ZTE-Q7) Image/Build/Profile/ZTE-Q7=$(call BuildFirmware/Default8M/$(1),$(1),zte-q7,ZTE-Q7)
Image/Build/Profile/ZBT-WA05=$(call BuildFirmware/Default8M/$(1),$(1),zbt-wa05,ZBT-WA05) Image/Build/Profile/ZBT-WA05=$(call BuildFirmware/Default8M/$(1),$(1),zbt-wa05,ZBT-WA05)
Image/Build/Profile/ZBT-WR8305RT=$(call BuildFirmware/Default8M/$(1),$(1),zbt-wr8305rt,ZBT-WR8305RT)
Image/Build/Profile/ArcherC20i=$(call BuildFirmware/Tplink/$(1),$(1),ArcherC20i,ArcherC20i) Image/Build/Profile/ArcherC20i=$(call BuildFirmware/Tplink/$(1),$(1),ArcherC20i,ArcherC20i)
microwrt_mtd_size=16515072 microwrt_mtd_size=16515072
Image/Build/Profile/MicroWRT=$(call BuildFirmware/CustomFlash/$(1),$(1),microwrt,MicroWRT,$(microwrt_mtd_size)) Image/Build/Profile/MicroWRT=$(call BuildFirmware/CustomFlash/$(1),$(1),microwrt,MicroWRT,$(microwrt_mtd_size))
@ -910,12 +910,12 @@ define Image/Build/Profile/Default
$(call Image/Build/Profile/MLWG2,$(1)) $(call Image/Build/Profile/MLWG2,$(1))
$(call Image/Build/Profile/WMR300,$(1)) $(call Image/Build/Profile/WMR300,$(1))
$(call Image/Build/Profile/RT-N14U,$(1)) $(call Image/Build/Profile/RT-N14U,$(1))
$(call Image/Build/Profile/WR8305RT,$(1))
$(call Image/Build/Profile/WRTNODE,$(1)) $(call Image/Build/Profile/WRTNODE,$(1))
$(call Image/Build/Profile/WT3020,$(1)) $(call Image/Build/Profile/WT3020,$(1))
$(call Image/Build/Profile/XIAOMI-MIWIFI-MINI,$(1)) $(call Image/Build/Profile/XIAOMI-MIWIFI-MINI,$(1))
$(call Image/Build/Profile/ZTE-Q7,$(1)) $(call Image/Build/Profile/ZTE-Q7,$(1))
$(call Image/Build/Profile/ZBT-WA05,$(1)) $(call Image/Build/Profile/ZBT-WA05,$(1))
$(call Image/Build/Profile/ZBT-WR8305RT,$(1))
$(call Image/Build/Profile/ArcherC20i,$(1)) $(call Image/Build/Profile/ArcherC20i,$(1))
$(call Image/Build/Profile/MicroWRT,$(1)) $(call Image/Build/Profile/MicroWRT,$(1))
endef endef