From 708c0212e790732c4c9107a1aec94a0134744aae Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 4 Dec 2015 12:32:36 +0000 Subject: [PATCH] brcm63xx: switch from uci-defaults to board.d Signed-off-by: Jo-Philipp Wich Acked-by: Jonas Gorski SVN-Revision: 47754 --- .../etc/{uci-defaults => board.d}/01_leds | 8 +- .../base-files/etc/board.d/02_network | 138 ++++++++++++++++ .../base-files/etc/uci-defaults/02_network | 155 ------------------ 3 files changed, 143 insertions(+), 158 deletions(-) rename target/linux/brcm63xx/base-files/etc/{uci-defaults => board.d}/01_leds (93%) mode change 100644 => 100755 create mode 100755 target/linux/brcm63xx/base-files/etc/board.d/02_network delete mode 100644 target/linux/brcm63xx/base-files/etc/uci-defaults/02_network diff --git a/target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds b/target/linux/brcm63xx/base-files/etc/board.d/01_leds old mode 100644 new mode 100755 similarity index 93% rename from target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds rename to target/linux/brcm63xx/base-files/etc/board.d/01_leds index dd40272ac520..4955efdf279d --- a/target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds +++ b/target/linux/brcm63xx/base-files/etc/board.d/01_leds @@ -1,11 +1,13 @@ #!/bin/sh # -# Copyright (C) 2013-2014 OpenWrt.org +# Copyright (C) 2013-2015 OpenWrt.org # -. /lib/functions/uci-defaults.sh +. /lib/functions/uci-defaults-new.sh . /lib/brcm63xx.sh +board_config_update + case "$(brcm63xx_board_name)" in a4001n1) ucidef_set_led_netdev "lan" "LAN" "A4001N1:green:eth" "eth0" @@ -51,6 +53,6 @@ r5010un_v2) ;; esac -ucidef_commit_leds +board_config_flush exit 0 diff --git a/target/linux/brcm63xx/base-files/etc/board.d/02_network b/target/linux/brcm63xx/base-files/etc/board.d/02_network new file mode 100755 index 000000000000..2098d988a37d --- /dev/null +++ b/target/linux/brcm63xx/base-files/etc/board.d/02_network @@ -0,0 +1,138 @@ +#!/bin/sh +# +# Copyright (C) 2012-2015 OpenWrt.org +# + +. /lib/functions/uci-defaults-new.sh +. /lib/brcm63xx.sh + +board_config_update + +case "$(brcm63xx_board_name)" in + +cvg834g |\ +rta770bw |\ +rta770w |\ +spw303v |\ +spw500v) + ucidef_set_interface_lan "eth0" + ;; + +ar1004g |\ +bcm96338gw |\ +bcm96338w |\ +cpva642 |\ +ct-5365 |\ +ct-536p_5621t |\ +ct-6373 |\ +dg834g_v4 |\ +dsl-2640b-b |\ +dsl-2640u |\ +fast2604 |\ +rta1320 |\ +v2110) + ucidef_add_switch "switch0" \ + "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5@eth0" + ;; + +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 "switch0" \ + "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5@eth1" + ;; + +dsl-274xb-c |\ +hg553 |\ +hg556a_* |\ +homehub2a) + ucidef_add_switch "switch0" \ + "0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "5t@eth0" + ;; + +dva-g3810bn |\ +hg520 |\ +neufbox4) + ucidef_set_interfaces_lan_wan "eth1.1" "eth0" + ucidef_add_switch "switch0" \ + "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth1" + ;; + +a4001n1 |\ +a4001n |\ +ar-5381u |\ +ar-5387un |\ +bcm963281tan |\ +bcm96328avng |\ +bcm96368mvngr |\ +dsl-274xb-f |\ +dsl-275xb-d |\ +fast2504n |\ +fast2704v2 |\ +hg655b |\ +p870hw-51a_v2 |\ +r5010un_v2 |\ +vr-3025un |\ +vr-3025u |\ +vr-3026e) + ucidef_add_switch "switch0" \ + "0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "8t@eth0" + ;; + +bcm96368mvwg) + ucidef_add_switch "switch0" \ + "1:lan" "2:lan" "4:lan" "5:lan" "8t@eth0" + ;; + +wap-5813n) + ucidef_add_switch "switch0" \ + "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5t@eth0" + ;; + +fast2704n |\ +dgnd3700v1_dgnd3800b) + ucidef_add_switch "switch0" \ + "1:lan:1" "2:lan:2" "3:lan:3" "4:lan:4" "0:wan" "8t@eth0" + ;; + +neufbox6) + ucidef_add_switch "switch0" \ + "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "9t@eth0" + ;; + +vg50) + ucidef_add_switch "switch0" \ + "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "8t@eth0" + ;; + +bcm963268bu_p300) + ucidef_add_switch "switch0" \ + "0:lan" "3:lan" "4:lan" "5:lan" "6:lan" "7:lan" "8t@eth0" + ;; + +*) + ucidef_set_interfaces_lan_wan "eth1" "eth0" + ;; + +esac + +board_config_flush + +exit 0 diff --git a/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network b/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network deleted file mode 100644 index 70f18cb257bf..000000000000 --- a/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network +++ /dev/null @@ -1,155 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2012 OpenWrt.org -# - -[ -e /etc/config/network ] && exit 0 - -touch /etc/config/network - -. /lib/functions/uci-defaults.sh -. /lib/brcm63xx.sh - -ucidef_set_interface_loopback - -case "$(brcm63xx_board_name)" in - -cvg834g |\ -rta770bw |\ -rta770w |\ -spw303v |\ -spw500v) - ucidef_set_interface_lan "eth0" - ;; - -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" - ;; - -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" - ;; - -dsl-274xb-c |\ -hg553 |\ -hg556a_* |\ -homehub2a) - ucidef_set_interface_lan "eth0.1" - ucidef_add_switch "eth0" "1" "1" - ucidef_add_switch_vlan "eth0" "1" "0 1 2 3 4 5t" - ;; - -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" - ;; - -a4001n1 |\ -a4001n |\ -ar-5381u |\ -ar-5387un |\ -bcm963281tan |\ -bcm96328avng |\ -bcm96368mvngr |\ -dsl-274xb-f |\ -dsl-275xb-d |\ -fast2504n |\ -fast2704v2 |\ -hg655b |\ -p870hw-51a_v2 |\ -r5010un_v2 |\ -vr-3025un |\ -vr-3025u |\ -vr-3026e) - ucidef_set_interface_lan "eth0.1" - ucidef_add_switch "eth0" "1" "1" - ucidef_add_switch_vlan "eth0" "1" "0 1 2 3 8t" - ;; - -bcm96368mvwg) - ucidef_set_interface_lan "eth0.1" - ucidef_add_switch "eth0" "1" "1" - ucidef_add_switch_vlan "eth0" "1" "1 2 4 5 8t" - ;; - -wap-5813n) - 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" - ;; - -fast2704n |\ -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" - ;; - -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" - ;; - -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" - ;; - -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" - ;; - -*) - ucidef_set_interfaces_lan_wan "eth1" "eth0" - ;; - -esac - -uci commit network - -exit 0 -- 2.30.2