diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-12-04 14:15:09 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-12-04 14:15:09 +0000 |
| commit | 1e4478e83a270f79f6714b46d226c29a5db9b743 (patch) | |
| tree | 16cf7b6136d8ebdaf954cfbe9a8a56727124c6eb /target | |
| parent | 5ebc5de49dd8fa789be22798b4e6b3ebb1a52ad5 (diff) | |
| download | upstream-1e4478e83a270f79f6714b46d226c29a5db9b743.tar.gz upstream-1e4478e83a270f79f6714b46d226c29a5db9b743.tar.bz2 upstream-1e4478e83a270f79f6714b46d226c29a5db9b743.zip | |
ath25: switch from uci-defaults to board.d
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
SVN-Revision: 47756
Diffstat (limited to 'target')
4 files changed, 41 insertions, 56 deletions
diff --git a/target/linux/ath25/base-files/etc/board.d/01_leds b/target/linux/ath25/base-files/etc/board.d/01_leds new file mode 100755 index 0000000000..e28dcda23d --- /dev/null +++ b/target/linux/ath25/base-files/etc/board.d/01_leds @@ -0,0 +1,13 @@ +#!/bin/sh +# Copyright 2012-2015 OpenWrt.org +# + +. /lib/functions/uci-defaults-new.sh + +board_config_update + +ucidef_set_led_netdev "wlan" "wlan" "wlan" "wlan0" + +board_config_flush + +exit 0 diff --git a/target/linux/ath25/base-files/etc/board.d/02_network b/target/linux/ath25/base-files/etc/board.d/02_network new file mode 100755 index 0000000000..b2781bf4cb --- /dev/null +++ b/target/linux/ath25/base-files/etc/board.d/02_network @@ -0,0 +1,28 @@ +#!/bin/sh + +. /lib/functions/uci-defaults-new.sh + +board_config_update + +if [ -e "/sys/bus/mdio_bus/drivers/IC+ IP175C/0:00" -o \ + -e "/sys/bus/mdio_bus/drivers/IC+ IP17xx/0:00" ] && \ + [ -x /sbin/swconfig ]; +then + ucidef_add_switch "eth0" \ + "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0" + +elif [ -e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" -o \ + -e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/0:10" ]; +then + ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" + +elif [ -d /sys/class/net/eth1 ]; then + ucidef_set_interfaces_lan_wan "eth0" "eth1" + +else + ucidef_set_interface_lan "eth0" +fi + +board_config_flush + +exit 0 diff --git a/target/linux/ath25/base-files/etc/uci-defaults/01_leds b/target/linux/ath25/base-files/etc/uci-defaults/01_leds deleted file mode 100644 index 076a04bfdf..0000000000 --- a/target/linux/ath25/base-files/etc/uci-defaults/01_leds +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# Copyright 2012 OpenWrt.org -# - -. /lib/functions/uci-defaults.sh - -ucidef_set_led_netdev "wlan" "wlan" "wlan" "wlan0" - -ucidef_commit_leds - -exit 0 diff --git a/target/linux/ath25/base-files/etc/uci-defaults/02_network b/target/linux/ath25/base-files/etc/uci-defaults/02_network deleted file mode 100644 index 7e91e6ac2c..0000000000 --- a/target/linux/ath25/base-files/etc/uci-defaults/02_network +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -if [ -e "/sys/bus/mdio_bus/drivers/IC+ IP175C/0:00" -o \ - -e "/sys/bus/mdio_bus/drivers/IC+ IP17xx/0:00" ] && \ - [ -x /sbin/swconfig ]; -then - uci batch <<EOF -set network.eth0=switch -set network.eth0.name=eth0 -set network.eth0.reset=1 -set network.eth0.enable_vlan=1 -set network.eth0_1=switch_vlan -set network.eth0_1.device=eth0 -set network.eth0_1.vlan=1 -set network.eth0_1.ports="0 1 2 3 5t" -set network.eth0_2=switch_vlan -set network.eth0_2.device=eth0 -set network.eth0_2.vlan=2 -set network.eth0_2.ports="4 5t" -EOF - HAS_SWITCH=1 -fi - -if [ -n "$HAS_SWITCH" -o \ - -e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" -o \ - -e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/0:10" ]; then - uci batch <<EOF -set network.lan.ifname=eth0.1 -set network.wan=interface -set network.wan.ifname=eth0.2 -set network.wan.proto=dhcp -commit network -EOF - HAS_SWITCH=1 -fi - -[ -z "$HAS_SWITCH" -a -d /sys/class/net/eth1 ] && { - uci batch <<EOF -set network.wan=interface -set network.wan.ifname=eth1 -set network.wan.proto=dhcp -commit network -EOF -} - -uci commit network |