Author: jow Date: 2015-11-30 11:43:31 +0100 (Mon, 30 Nov 2015) New Revision: 47674
Added: trunk/target/linux/mvebu/base-files/etc/board.d/ trunk/target/linux/mvebu/base-files/etc/board.d/00_model trunk/target/linux/mvebu/base-files/etc/board.d/01_leds trunk/target/linux/mvebu/base-files/etc/board.d/02_network Removed: trunk/target/linux/mvebu/base-files/etc/uci-defaults/01_leds trunk/target/linux/mvebu/base-files/etc/uci-defaults/02_network Log: mvebu: switch network and led config defaults to board detection framework Signed-off-by: Jo-Philipp Wich <[email protected]> Copied: trunk/target/linux/mvebu/base-files/etc/board.d/00_model (from rev 47673, trunk/target/linux/ar71xx/base-files/etc/board.d/00_model) =================================================================== --- trunk/target/linux/mvebu/base-files/etc/board.d/00_model (rev 0) +++ trunk/target/linux/mvebu/base-files/etc/board.d/00_model 2015-11-30 10:43:31 UTC (rev 47674) @@ -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 Copied: trunk/target/linux/mvebu/base-files/etc/board.d/01_leds (from rev 47673, trunk/target/linux/mvebu/base-files/etc/uci-defaults/01_leds) =================================================================== --- trunk/target/linux/mvebu/base-files/etc/board.d/01_leds (rev 0) +++ trunk/target/linux/mvebu/base-files/etc/board.d/01_leds 2015-11-30 10:43:31 UTC (rev 47674) @@ -0,0 +1,39 @@ +#!/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 Property changes on: trunk/target/linux/mvebu/base-files/etc/board.d/01_leds ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Copied: trunk/target/linux/mvebu/base-files/etc/board.d/02_network (from rev 47673, trunk/target/linux/mvebu/base-files/etc/uci-defaults/02_network) =================================================================== --- trunk/target/linux/mvebu/base-files/etc/board.d/02_network (rev 0) +++ trunk/target/linux/mvebu/base-files/etc/board.d/02_network 2015-11-30 10:43:31 UTC (rev 47674) @@ -0,0 +1,44 @@ +#!/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_ports "switch0" \ + "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5@eth0" "4:wan" "6@eth1" + ;; +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 Property changes on: trunk/target/linux/mvebu/base-files/etc/board.d/02_network ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Deleted: trunk/target/linux/mvebu/base-files/etc/uci-defaults/01_leds =================================================================== --- trunk/target/linux/mvebu/base-files/etc/uci-defaults/01_leds 2015-11-30 10:43:18 UTC (rev 47673) +++ trunk/target/linux/mvebu/base-files/etc/uci-defaults/01_leds 2015-11-30 10:43:31 UTC (rev 47674) @@ -1,37 +0,0 @@ -#!/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 Deleted: trunk/target/linux/mvebu/base-files/etc/uci-defaults/02_network =================================================================== --- trunk/target/linux/mvebu/base-files/etc/uci-defaults/02_network 2015-11-30 10:43:18 UTC (rev 47673) +++ trunk/target/linux/mvebu/base-files/etc/uci-defaults/02_network 2015-11-30 10:43:31 UTC (rev 47674) @@ -1,46 +0,0 @@ -#!/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 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
