ipq806x: switch from uci-defaults to board.d

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 47730
This commit is contained in:
Jo-Philipp Wich 2015-12-03 21:13:12 +00:00
parent b3f8340a5e
commit 4615944c71
4 changed files with 52 additions and 42 deletions

View file

@ -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

View file

@ -3,9 +3,11 @@
# Copyright (C) 2015 OpenWrt.org # Copyright (C) 2015 OpenWrt.org
# #
. /lib/functions/uci-defaults.sh . /lib/functions/uci-defaults-new.sh
. /lib/ipq806x.sh . /lib/ipq806x.sh
board_config_update
board=$(ipq806x_board_name) board=$(ipq806x_board_name)
case "$board" in case "$board" in
@ -13,7 +15,7 @@ r7500)
ucidef_set_led_usbdev "usb1" "USB 1" "r7500:white:usb1" "1-1" 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_usbdev "usb2" "USB 2" "r7500:white:usb3" "3-1"
ucidef_set_led_netdev "wan" "WAN" "r7500:white:wan" "eth0" 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 "wps" "WPS" "r7500:white:wps" "0"
ucidef_set_led_default "rfkill" "rfkill" "r7500:white:rfkill" "0" ucidef_set_led_default "rfkill" "rfkill" "r7500:white:rfkill" "0"
;; ;;
@ -21,6 +23,6 @@ r7500)
;; ;;
esac esac
ucidef_commit_leds board_config_flush
exit 0 exit 0

View file

@ -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

View file

@ -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