From 6661431271efc2b38e278d48131bf60b4582fc74 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Sat, 12 Jul 2014 12:31:45 +0000 Subject: [PATCH] brcm63xx: base-files: order board names alphabetically Restore alphatetical order in uci-defaults scripts and brcm63xx.sh Signed-off-by: Jonas Gorski git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41590 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../base-files/etc/uci-defaults/02_network | 4 +- .../base-files/etc/uci-defaults/09_fix_crc | 4 +- .../linux/brcm63xx/base-files/lib/brcm63xx.sh | 138 +++++++++--------- 3 files changed, 73 insertions(+), 73 deletions(-) diff --git a/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network b/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network index ffd2a1eead..a04f4a50bd 100755 --- a/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network +++ b/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network @@ -14,11 +14,11 @@ ucidef_set_interface_loopback case "$board_name" in +96348W3 |\ +96358-502V |\ CVG834G_E15R3921 |\ RTA770BW |\ RTA770W |\ -96348W3 |\ -96358-502V |\ SPW500V) ucidef_set_interface_lan "eth0" ;; diff --git a/target/linux/brcm63xx/base-files/etc/uci-defaults/09_fix_crc b/target/linux/brcm63xx/base-files/etc/uci-defaults/09_fix_crc index a2c02137b9..2f5e09b0b7 100755 --- a/target/linux/brcm63xx/base-files/etc/uci-defaults/09_fix_crc +++ b/target/linux/brcm63xx/base-files/etc/uci-defaults/09_fix_crc @@ -20,14 +20,14 @@ case "$board_name" in 963281T_TEF |\ 96358-502V |\ 96369R-1231N |\ - "CPVA502+" |\ AW4339U |\ + "CPVA502+" |\ CPVA642 |\ CT6373-1 |\ MAGIC |\ - V2110 |\ RTA770BW |\ RTA770W |\ + V2110 |\ V2500V_BB) do_fixcrc ;; diff --git a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh index 97998a10ae..fcd9281256 100755 --- a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh +++ b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh @@ -19,35 +19,6 @@ brcm63xx_detect() { fi case "$board_name" in - 96328avng) - status_led="96328avng::power" - ifname=eth0 - ;; - 96328A-1241N) - brcm63xx_has_reset_button="true" - status_led="AR-5381u:green:power" - ifname=eth0 - ;; - 96369R-1231N) - brcm63xx_has_reset_button="true" - status_led="WAP-5813n:green:power" - ifname="eth0" - ;; - RTA770BW) - brcm63xx_has_reset_button="true" - status_led="RTA770BW:green:diag" - ifname=eth0 - ;; - RTA770W) - brcm63xx_has_reset_button="true" - status_led="RTA770W:green:diag" - ifname=eth0 - ;; - 96328A-1441N1) - brcm63xx_has_reset_button="true" - status_led="AR-5387un:green:power" - ifname=eth0 - ;; 963281TAN) status_led="963281TAN::power" ifname=eth0 @@ -57,19 +28,79 @@ brcm63xx_detect() { status_led="A4001N1:green:power" ifname=eth0 ;; + 96328avng) + status_led="96328avng::power" + ifname=eth0 + ;; + 96328A-1241N) + brcm63xx_has_reset_button="true" + status_led="AR-5381u:green:power" + ifname=eth0 + ;; + 96328A-1441N1) + brcm63xx_has_reset_button="true" + status_led="AR-5387un:green:power" + ifname=eth0 + ;; 96348GW) status_led="96348GW:green:power" brcm63xx_has_reset_button="true" ifname=eth1 ;; + 96348GW-11) + status_led="96348GW-11:green:power" + brcm63xx_has_reset_button="true" + ifname=eth1 + ;; + 96358-502V) + status_led="spw303v:green:power+adsl" + brcm63xx_has_reset_button="true" + ifname=eth0 + ;; + 96369R-1231N) + brcm63xx_has_reset_button="true" + status_led="WAP-5813n:green:power" + ifname="eth0" + ;; AR1004G) status_led="AR1004G:green:power" brcm63xx_has_reset_button="true" ;; + AW4139 |\ + AW4339U) + status_led="dsl-274xb:green:power" + brcm63xx_has_reset_button="true" + ifname=eth0 + ;; + CPVA642) + status_led="CPVA642:green:power:" + brcm63xx_has_reset_button="true" + ifname=eth0 + ;; + CT536_CT5621) + status_led="CT536_CT5621:green:power" + brcm63xx_has_reset_button="true" + ifname=eth0 + ;; CVG834G_E15R3921) status_led="CVG834G:green:power" ifname=eth0 ;; + D-4P-W) + status_led="D-4P-W:green:power" + brcm63xx_has_reset_button="true" + ifname=eth0 + ;; + "F@ST2504n") + status_led="fast2504n:green:ok" + brcm63xx_has_reset_button="true" + ifname=eth0 + ;; + 'F@ST2704V2') + status_led="F@ST2704V2:green:power" + brcm63xx_has_reset_button="true" + ifname=eth0 + ;; GW6000) brcm63xx_has_reset_button="true" ifname=eth1 @@ -90,14 +121,18 @@ brcm63xx_detect() { brcm63xx_has_reset_button="true" ifname=eth0 ;; - 96348GW-11) - status_led="96348GW-11:green:power" + NB6) brcm63xx_has_reset_button="true" - ifname=eth1 + ifname=eth0 ;; - CT536_CT5621) - status_led="CT536_CT5621:green:power" + RTA770BW) brcm63xx_has_reset_button="true" + status_led="RTA770BW:green:diag" + ifname=eth0 + ;; + RTA770W) + brcm63xx_has_reset_button="true" + status_led="RTA770W:green:diag" ifname=eth0 ;; SPW500V) @@ -105,46 +140,11 @@ brcm63xx_detect() { brcm63xx_has_reset_button="true" ifname=eth0 ;; - AW4139 |\ - AW4339U) - status_led="dsl-274xb:green:power" - brcm63xx_has_reset_button="true" - ifname=eth0 - ;; - 96358-502V) - status_led="spw303v:green:power+adsl" - brcm63xx_has_reset_button="true" - ifname=eth0 - ;; V2110) status_led="V2110:power:green" brcm63xx_has_reset_button="true" ifname=eth0 ;; - CPVA642) - status_led="CPVA642:green:power:" - brcm63xx_has_reset_button="true" - ifname=eth0 - ;; - D-4P-W) - status_led="D-4P-W:green:power" - brcm63xx_has_reset_button="true" - ifname=eth0 - ;; - NB6) - brcm63xx_has_reset_button="true" - ifname=eth0 - ;; - "F@ST2504n") - status_led="fast2504n:green:ok" - brcm63xx_has_reset_button="true" - ifname=eth0 - ;; - 'F@ST2704V2') - status_led="F@ST2704V2:green:power" - brcm63xx_has_reset_button="true" - ifname=eth0 - ;; *) ;; esac