From 1e4478e83a270f79f6714b46d226c29a5db9b743 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 4 Dec 2015 14:15:09 +0000 Subject: [PATCH] ath25: switch from uci-defaults to board.d Signed-off-by: Jo-Philipp Wich SVN-Revision: 47756 --- .../ath25/base-files/etc/board.d/01_leds | 13 ++++++ .../ath25/base-files/etc/board.d/02_network | 28 ++++++++++++ .../ath25/base-files/etc/uci-defaults/01_leds | 11 ----- .../base-files/etc/uci-defaults/02_network | 45 ------------------- 4 files changed, 41 insertions(+), 56 deletions(-) create mode 100755 target/linux/ath25/base-files/etc/board.d/01_leds create mode 100755 target/linux/ath25/base-files/etc/board.d/02_network delete mode 100644 target/linux/ath25/base-files/etc/uci-defaults/01_leds delete mode 100644 target/linux/ath25/base-files/etc/uci-defaults/02_network 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 <