From 098377af257c8c1d5775aff414b7e2243605e2ba Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Mon, 16 Mar 2015 11:52:42 +0000 Subject: [PATCH] brcm63xx: switch to board_name based configuration Board IDs are not unique, so in preparation for depricating them, always use board_name for any (default) configuration decisions. Signed-off-by: Jonas Gorski SVN-Revision: 44836 --- .../etc/hotplug.d/firmware/10-rt2x00-eeprom | 4 +- .../base-files/etc/uci-defaults/01_leds | 14 +- .../base-files/etc/uci-defaults/02_network | 126 +++++++++--------- .../base-files/etc/uci-defaults/09_fix_crc | 44 +++--- 4 files changed, 95 insertions(+), 93 deletions(-) diff --git a/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index 23e9b4f796..9a324eacbd 100644 --- a/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -26,12 +26,12 @@ rt2x00_eeprom_extract() { . /lib/brcm63xx.sh -board=$board_id +board=$(brcm63xx_board_name) case "$FIRMWARE" in "rt2x00.eeprom" ) case $board in - HW556_C) + hg556a_c) rt2x00_eeprom_extract "cal_data" 130560 512 ;; *) diff --git a/target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds b/target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds index 441dc68bd5..c9bf2f412d 100644 --- a/target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds +++ b/target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds @@ -6,15 +6,15 @@ . /lib/functions/uci-defaults.sh . /lib/brcm63xx.sh -case "$board_id" in -963281T_TEF) +case "$(brcm63xx_board_name)" in +a4001n1) ucidef_set_led_netdev "lan" "LAN" "A4001N1:green:eth" "eth0" ucidef_set_led_usbdev "usb" "USB" "A4001N1:green:3g" "1-1" ;; -96328dg2x2) +a4001n) ucidef_set_led_usbdev "usb" "USB" "A4001N:green:usb" "1-1" ;; -DGND3700v1_3800B) +dgnd3700v1_dgnd3800b) ucidef_set_led_netdev "lan" "LAN" "DGND3700v1_3800B:green:lan" "eth0.1" ucidef_set_led_netdev "wan" "WAN" "DGND3700v1_3800B:green:inet" "eth0.2" ucidef_set_led_netdev "wlan0" "WIFI2G" "DGND3700v1_3800B:green:wifi2g" "wlan0" @@ -22,15 +22,15 @@ DGND3700v1_3800B) ucidef_set_led_usbdev "usb1" "USB1" "DGND3700v1_3800B:green:usb-back" "1-1" ucidef_set_led_usbdev "usb2" "USB2" "DGND3700v1_3800B:green:usb-front" "1-2" ;; -'F@ST2704V2') +fast2704v2) ucidef_set_led_usbdev "usb" "USB" "F@ST2704V2:green:usb" "1-1" ;; -HW553) +hg553) ucidef_set_led_netdev "lan" "LAN" "HW553:blue:lan" "eth0" ucidef_set_led_usbdev "usb1" "USB1" "HW553:red:hspa" "1-1" ucidef_set_led_usbdev "usb2" "USB2" "HW553:blue:hspa" "1-2" ;; -HW556*) +hg556a_*) ucidef_set_led_netdev "lan" "LAN" "HW556:red:dsl" "eth0" ucidef_set_led_usbdev "usb" "USB" "HW556:red:hspa" "1-2" ;; 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 b41ee7e5f9..df4e29307b 100644 --- a/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network +++ b/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network @@ -12,124 +12,128 @@ touch /etc/config/network ucidef_set_interface_loopback -case "$board_id" in - -96348W3 |\ -96358-502V |\ -CVG834G_E15R3921 |\ -RTA770BW |\ -RTA770W |\ -SPW500V) +case "$(brcm63xx_board_name)" in + +cvg834g |\ +rta770bw |\ +rta770w |\ +spw303v |\ +spw500v) ucidef_set_interface_lan "eth0" ;; -96338GW |\ -96338W |\ -96338W2_E7T |\ -96348A-122 |\ -96348W3 |\ -AR1004G |\ -CPVA642 |\ -CT536_CT5621 |\ -CT6373-1 |\ -D-4P-W |\ -"F@ST2604" |\ -RTA1320_16M |\ -V2110) +ar1004g |\ +bcm96338gw |\ +bcm96338w |\ +cpva642 |\ +ct-5365 |\ +ct-536p_5621t |\ +ct-6373 |\ +dg834g_v4 |\ +dsl-2640b-b |\ +dsl-2640u |\ +fast2604 |\ +rta1320 |\ +v2110) ucidef_set_interface_lan "eth0" ucidef_add_switch "eth0" "1" "1" ucidef_add_switch_vlan "eth0" "1" "0 1 2 3 4 5" ;; -96348GW |\ -96348GW-10 |\ -96348GW-11 |\ -96348GW-A |\ -96358VW |\ -96358VW2 |\ -AGPF-S0 |\ -"CPVA502+" |\ -DV201AMR |\ -DWV-S0 |\ -"F@ST2404" |\ -MAGIC |\ -RTA1025W_16 |\ -V2500V_BB) +agpf-s0 |\ +bcm96348gw |\ +bcm96348gw-10 |\ +bcm96348gw-11 |\ +bcm96358vw |\ +bcm96358vw2 |\ +cpva502p |\ +dg834gt |\ +dmv-s0 |\ +dsl-2650u |\ +dv-201amr |\ +f5d7633 |\ +fast2404 |\ +magic |\ +rg100a |\ +rta1025W |\ +td-w8900gb |\ +usr9108 |\ +v2500v_bb) ucidef_set_interfaces_lan_wan "eth1" "eth0" ucidef_add_switch "eth1" "1" "1" ucidef_add_switch_vlan "eth1" "1" "0 1 2 3 4 5" ;; -AW4139 |\ -HW553 |\ -HW556*) +dsl-274xb-c |\ +hg553 |\ +hg556a_*) ucidef_set_interface_lan "eth0.1" ucidef_add_switch "eth0" "1" "1" ucidef_add_switch_vlan "eth0" "1" "0 1 2 3 4 5t" ;; -NB4-* |\ -DVG3810BN |\ -HW6358GW_B) +dva-g3810bn |\ +hg520 |\ +neufbox4) ucidef_set_interfaces_lan_wan "eth1.1" "eth0" ucidef_add_switch "eth1" "1" "1" ucidef_add_switch_vlan "eth1" "1" "0 1 2 3 4 5t" ;; -96328avng |\ -96328A-1241N |\ -96328A-1441N1 |\ -963281TAN |\ -963281T_TEF |\ -96328dg2x2 |\ -96368M-1341N |\ -96368M-1541N |\ -96368MVNgr |\ -AW4339U |\ -AW5200B |\ -"F@ST2504n" |\ -"F@ST2704V2" |\ -P870HW-51a_v2) +a4001n1 |\ +a4001n |\ +ar-5381u |\ +ar-5387un |\ +bcm963281tan |\ +bcm96328avng |\ +bcm96368mvngr |\ +dsl-274xb-f |\ +dsl-275xb-d |\ +fast2504n |\ +fast2704v2 |\ +p870hw-51a_v2 |\ +vr-3025un |\ +vr-3025u) ucidef_set_interface_lan "eth0.1" ucidef_add_switch "eth0" "1" "1" ucidef_add_switch_vlan "eth0" "1" "0 1 2 3 8t" ;; -96368MVWG) +bcm96368mvwg) ucidef_set_interface_lan "eth0.1" ucidef_add_switch "eth0" "1" "1" ucidef_add_switch_vlan "eth0" "1" "1 2 4 5 8t" ;; -96369R-1231N) +wap-5831n) ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_add_switch "eth0" "1" "1" ucidef_add_switch_vlan "eth0" "1" "0 1 2 3 5t" ucidef_add_switch_vlan "eth0" "2" "4 5t" ;; -DGND3700v1_3800B) +dgnd3700v1_dgnd3800b) ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_add_switch "eth0" "1" "1" ucidef_add_switch_vlan "eth0" "1" "1 2 3 4 8t" ucidef_add_switch_vlan "eth0" "2" "0 8t" ;; -NB6) +neufbox6) ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_add_switch "switch0" "1" "1" ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 9t" ucidef_add_switch_vlan "switch0" "2" "0 9t" ;; -VW6339GU) +vg50) ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_add_switch "switch0" "1" "1" ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 8t" ucidef_add_switch_vlan "switch0" "2" "4 8t" ;; -963268BU_P300) +bcm963268bu_p300) ucidef_set_interface_lan "eth0.1" ucidef_add_switch "switch0" "1" "1" ucidef_add_switch_vlan "switch0" "1" "0 3 4 5 6 7 8t" 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 c1c0194d33..4a167dc297 100644 --- a/target/linux/brcm63xx/base-files/etc/uci-defaults/09_fix_crc +++ b/target/linux/brcm63xx/base-files/etc/uci-defaults/09_fix_crc @@ -10,29 +10,27 @@ do_fixcrc() { mtd fixtrx linux } -brcm63xx_detect - -case "$board_id" in - 96328avng |\ - 96328A-1241N |\ - 96328A-1441N1 |\ - 963281TAN |\ - 963281T_TEF |\ - 96328dg2x2 |\ - 96358-502V |\ - 96368M-1341N |\ - 96368M-1541N |\ - 96369R-1231N |\ - AW4339U |\ - "CPVA502+" |\ - CPVA642 |\ - CT6373-1 |\ - MAGIC |\ - P870HW-51a_v2 |\ - RTA770BW |\ - RTA770W |\ - V2110 |\ - V2500V_BB) +case "$(brcm63xx_board_name)" in + a4001n |\ + a4001n1 |\ + ar-5381u |\ + ar-5387un |\ + bcm96328avng |\ + bcm963281tan |\ + cpva502p |\ + cpva642 |\ + ct-6373 |\ + dsl-274xb-f |\ + magic |\ + p870hw-51a_v2 |\ + rta770bw |\ + rta770w |\ + spw303v |\ + v2110 |\ + v2500v_bb |\ + vr-3025u |\ + vr-3025un |\ + wap-5813n) do_fixcrc ;; esac -- 2.25.1