From 4615944c71dcf8e21d8e90ea48ce6a6ba00a7b4c Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 3 Dec 2015 21:13:12 +0000 Subject: [PATCH] ipq806x: switch from uci-defaults to board.d Signed-off-by: Jo-Philipp Wich SVN-Revision: 47730 --- .../ipq806x/base-files/etc/board.d/00_model | 13 +++++++ .../{uci-defaults/leds => board.d/01_leds} | 8 ++-- .../ipq806x/base-files/etc/board.d/02_network | 34 ++++++++++++++++ .../base-files/etc/uci-defaults/network | 39 ------------------- 4 files changed, 52 insertions(+), 42 deletions(-) create mode 100644 target/linux/ipq806x/base-files/etc/board.d/00_model rename target/linux/ipq806x/base-files/etc/{uci-defaults/leds => board.d/01_leds} (77%) create mode 100644 target/linux/ipq806x/base-files/etc/board.d/02_network delete mode 100755 target/linux/ipq806x/base-files/etc/uci-defaults/network diff --git a/target/linux/ipq806x/base-files/etc/board.d/00_model b/target/linux/ipq806x/base-files/etc/board.d/00_model new file mode 100644 index 0000000000..ec07709e0c --- /dev/null +++ b/target/linux/ipq806x/base-files/etc/board.d/00_model @@ -0,0 +1,13 @@ +#!/bin/sh +# Copyright (C) 2015 OpenWrt.org + +. /lib/functions/uci-defaults-new.sh + +board_config_update + +ucidef_set_board_id "$(cat /tmp/sysinfo/board_name)" +ucidef_set_model_name "$(cat /tmp/sysinfo/model)" + +board_config_flush + +exit 0 diff --git a/target/linux/ipq806x/base-files/etc/uci-defaults/leds b/target/linux/ipq806x/base-files/etc/board.d/01_leds similarity index 77% rename from target/linux/ipq806x/base-files/etc/uci-defaults/leds rename to target/linux/ipq806x/base-files/etc/board.d/01_leds index 362c5b6742..b2356c072a 100644 --- a/target/linux/ipq806x/base-files/etc/uci-defaults/leds +++ b/target/linux/ipq806x/base-files/etc/board.d/01_leds @@ -3,9 +3,11 @@ # Copyright (C) 2015 OpenWrt.org # -. /lib/functions/uci-defaults.sh +. /lib/functions/uci-defaults-new.sh . /lib/ipq806x.sh +board_config_update + board=$(ipq806x_board_name) case "$board" in @@ -13,7 +15,7 @@ r7500) ucidef_set_led_usbdev "usb1" "USB 1" "r7500:white:usb1" "1-1" ucidef_set_led_usbdev "usb2" "USB 2" "r7500:white:usb3" "3-1" ucidef_set_led_netdev "wan" "WAN" "r7500:white:wan" "eth0" - ucidef_set_led_ide_disk "esata" "eSATA" "r7500:amber:esata" + ucidef_set_led_ide "esata" "eSATA" "r7500:amber:esata" ucidef_set_led_default "wps" "WPS" "r7500:white:wps" "0" ucidef_set_led_default "rfkill" "rfkill" "r7500:white:rfkill" "0" ;; @@ -21,6 +23,6 @@ r7500) ;; esac -ucidef_commit_leds +board_config_flush exit 0 diff --git a/target/linux/ipq806x/base-files/etc/board.d/02_network b/target/linux/ipq806x/base-files/etc/board.d/02_network new file mode 100644 index 0000000000..ffa3b28d14 --- /dev/null +++ b/target/linux/ipq806x/base-files/etc/board.d/02_network @@ -0,0 +1,34 @@ +#!/bin/sh +# +# Copyright (c) 2015 The Linux Foundation. All rights reserved. +# Copyright (c) 2011-2015 OpenWrt.org +# + +. /lib/functions/uci-defaults-new.sh +. /lib/ipq806x.sh + +board_config_update + +ucidef_set_interface_loopback + +board=$(ipq806x_board_name) + +case "$board" in +ap148 |\ +r7500) + ucidef_add_switch "switch0" \ + "1:lan" "2:lan" "3:lan" "4:lan" "6@eth1" "5:wan" "0@eth0" + ;; +db149) + ucidef_set_interface_lan "eth1 eth2 eth3" + ucidef_add_switch "switch0" \ + "1:lan" "2:lan" "3:lan" "4:lan" "6@eth1" "5:wan" "0@eth0" + ;; +*) + echo "Unsupported hardware. Network interfaces not intialized" + ;; +esac + +board_config_flush + +exit 0 diff --git a/target/linux/ipq806x/base-files/etc/uci-defaults/network b/target/linux/ipq806x/base-files/etc/uci-defaults/network deleted file mode 100755 index 7742b7301d..0000000000 --- a/target/linux/ipq806x/base-files/etc/uci-defaults/network +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2015 The Linux Foundation. All rights reserved. -# Copyright (C) 2011 OpenWrt.org -# - -[ -e /etc/config/network ] && exit 0 - -touch /etc/config/network - -. /lib/functions/uci-defaults.sh -. /lib/ipq806x.sh - -ucidef_set_interface_loopback - -board=$(ipq806x_board_name) - -case "$board" in -ap148 |\ -r7500) - ucidef_set_interfaces_lan_wan "eth1" "eth0" - ucidef_add_switch "switch0" "1" "1" - ucidef_add_switch_vlan "switch0" "1" "6 1 2 3 4" - ucidef_add_switch_vlan "switch0" "2" "0 5" - ;; -db149) - ucidef_set_interfaces_lan_wan "eth1 eth2 eth3" "eth0" - ucidef_add_switch "switch0" "1" "1" - ucidef_add_switch_vlan "switch0" "1" "6 1 2 3 4" - ucidef_add_switch_vlan "switch0" "2" "0 5" - ;; -*) - echo "Unsupported hardware. Network interfaces not intialized" - ;; -esac - -uci commit network - -exit 0 -- 2.30.2