From: Jo-Philipp Wich Date: Sun, 22 Nov 2015 20:52:10 +0000 (+0000) Subject: Revert "mvebu: migrate led and network setup to board detection framework" X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fc64fd8712ba1cdde56e537906859bb63dad36d4;p=openwrt%2Fstaging%2Fynezz.git Revert "mvebu: migrate led and network setup to board detection framework" Roll back the mvebu conversion to board detection code as we need to fix some strcutural issues first. Signed-off-by: Jo-Philipp Wich SVN-Revision: 47597 --- diff --git a/target/linux/mvebu/base-files/etc/board.d/01_leds b/target/linux/mvebu/base-files/etc/board.d/01_leds deleted file mode 100755 index eb245d85ae..0000000000 --- a/target/linux/mvebu/base-files/etc/board.d/01_leds +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2014-2015 OpenWrt.org -# - -. /lib/functions/uci-defaults-new.sh -. /lib/mvebu.sh - -board_config_update - -board=$(mvebu_board_name) - -case "$board" in -armada-385-linksys-caiman) - ucidef_set_led_netdev "wan" "WAN" "pca963x:caiman:white:wan" "eth0" - ucidef_set_led_usbdev "usb2" "USB2" "pca963x:caiman:white:usb2" "1-1" - ucidef_set_led_usbdev "usb3" "USB3" "pca963x:caiman:white:usb3_1" "2-1" - ;; -armada-385-linksys-cobra) - ucidef_set_led_netdev "wan" "WAN" "pca963x:cobra:white:wan" "eth0" - ucidef_set_led_usbdev "usb2" "USB2" "pca963x:cobra:white:usb2" "1-1" - ucidef_set_led_usbdev "usb3" "USB3" "pca963x:cobra:white:usb3_1" "2-1" - ;; -armada-385-linksys-shelby) - ucidef_set_led_netdev "wan" "WAN" "pca963x:shelby:white:wan" "eth0" - ucidef_set_led_usbdev "usb2" "USB2" "pca963x:shelby:white:usb2" "1-1" - ucidef_set_led_usbdev "usb3" "USB3" "pca963x:shelby:white:usb3_1" "2-1" - ;; -armada-xp-linksys-mamba) - ucidef_set_led_netdev "wan" "WAN" "mamba:white:wan" "eth1" - ucidef_set_led_usbdev "usb2" "USB2" "mamba:white:usb2" "1-1" - ucidef_set_led_usbdev "usb3" "USB3" "mamba:white:usb3_1" "2-2" - ;; - -esac - -board_config_flush - -exit 0 diff --git a/target/linux/mvebu/base-files/etc/board.d/02_network b/target/linux/mvebu/base-files/etc/board.d/02_network deleted file mode 100755 index 803a4dc768..0000000000 --- a/target/linux/mvebu/base-files/etc/board.d/02_network +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2014-2015 OpenWrt.org -# - -. /lib/functions/uci-defaults-new.sh -. /lib/mvebu.sh - -board_config_update - -ucidef_set_interface_loopback - -board=$(mvebu_board_name) - -case "$board" in -armada-385-linksys-caiman) - ucidef_set_interfaces_lan_wan "eth1" "eth0" - ;; -armada-385-linksys-cobra) - ucidef_set_interfaces_lan_wan "eth1" "eth0" - ;; -armada-385-linksys-shelby) - ucidef_set_interfaces_lan_wan "eth1" "eth0" - ;; -armada-xp-linksys-mamba) - ucidef_set_interfaces_lan_wan "eth0" "eth1" - ucidef_add_switch "switch0" "1" "1" - ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5" - ucidef_add_switch_vlan "switch0" "2" "4 6" - ;; -armada-385-db-ap) - ucidef_set_interfaces_lan_wan "eth0 eth1" "eth2" - ;; -armada-xp-gp) - ucidef_set_interface_lan "eth0 eth1 eth2 eth3" - ;; -*) - ucidef_set_interface_lan "eth0" - ;; -esac - -board_config_flush - -exit 0 diff --git a/target/linux/mvebu/base-files/etc/uci-defaults/01_leds b/target/linux/mvebu/base-files/etc/uci-defaults/01_leds new file mode 100644 index 0000000000..612f949da4 --- /dev/null +++ b/target/linux/mvebu/base-files/etc/uci-defaults/01_leds @@ -0,0 +1,37 @@ +#!/bin/sh +# +# Copyright (C) 2014 OpenWrt.org +# + +. /lib/functions/uci-defaults.sh +. /lib/mvebu.sh + +board=$(mvebu_board_name) + +case "$board" in +armada-385-linksys-caiman) + ucidef_set_led_netdev "wan" "WAN" "pca963x:caiman:white:wan" "eth0" + ucidef_set_led_usbdev "usb2" "USB2" "pca963x:caiman:white:usb2" "1-1" + ucidef_set_led_usbdev "usb3" "USB3" "pca963x:caiman:white:usb3_1" "2-1" + ;; +armada-385-linksys-cobra) + ucidef_set_led_netdev "wan" "WAN" "pca963x:cobra:white:wan" "eth0" + ucidef_set_led_usbdev "usb2" "USB2" "pca963x:cobra:white:usb2" "1-1" + ucidef_set_led_usbdev "usb3" "USB3" "pca963x:cobra:white:usb3_1" "2-1" + ;; +armada-385-linksys-shelby) + ucidef_set_led_netdev "wan" "WAN" "pca963x:shelby:white:wan" "eth0" + ucidef_set_led_usbdev "usb2" "USB2" "pca963x:shelby:white:usb2" "1-1" + ucidef_set_led_usbdev "usb3" "USB3" "pca963x:shelby:white:usb3_1" "2-1" + ;; +armada-xp-linksys-mamba) + ucidef_set_led_netdev "wan" "WAN" "mamba:white:wan" "eth1" + ucidef_set_led_usbdev "usb2" "USB2" "mamba:white:usb2" "1-1" + ucidef_set_led_usbdev "usb3" "USB3" "mamba:white:usb3_1" "2-2" + ;; + +esac + +ucidef_commit_leds + +exit 0 diff --git a/target/linux/mvebu/base-files/etc/uci-defaults/02_network b/target/linux/mvebu/base-files/etc/uci-defaults/02_network new file mode 100644 index 0000000000..d1da59fb48 --- /dev/null +++ b/target/linux/mvebu/base-files/etc/uci-defaults/02_network @@ -0,0 +1,46 @@ +#!/bin/sh +# +# Copyright (C) 2014-2015 OpenWrt.org +# + +[ -e /etc/config/network ] && exit 0 + +touch /etc/config/network + +. /lib/functions/uci-defaults.sh +. /lib/mvebu.sh + +ucidef_set_interface_loopback + +board=$(mvebu_board_name) + +case "$board" in +armada-385-linksys-caiman) + ucidef_set_interfaces_lan_wan "eth1" "eth0" + ;; +armada-385-linksys-cobra) + ucidef_set_interfaces_lan_wan "eth1" "eth0" + ;; +armada-385-linksys-shelby) + ucidef_set_interfaces_lan_wan "eth1" "eth0" + ;; +armada-xp-linksys-mamba) + ucidef_set_interfaces_lan_wan "eth0" "eth1" + ucidef_add_switch "switch0" "1" "1" + ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5" + ucidef_add_switch_vlan "switch0" "2" "4 6" + ;; +armada-385-db-ap) + ucidef_set_interfaces_lan_wan "eth0 eth1" "eth2" + ;; +armada-xp-gp) + ucidef_set_interface_lan "eth0 eth1 eth2 eth3" + ;; +*) + ucidef_set_interface_lan "eth0" + ;; +esac + +uci commit network + +exit 0