From e1c362b60c45ec71295dbb64da3d743a50f4253c Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Thu, 8 Oct 2015 10:02:10 +0000 Subject: mvebu: add support for the Linksys WRT1900ACS (Shelby) Backport of r47164. Signed-off-by: Imre Kaloz git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@47165 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/mvebu/base-files/etc/init.d/linksys_recovery | 2 +- target/linux/mvebu/base-files/etc/uci-defaults/01_leds | 5 +++++ target/linux/mvebu/base-files/etc/uci-defaults/02_network | 3 +++ target/linux/mvebu/base-files/etc/uci-defaults/03_wireless | 2 +- target/linux/mvebu/base-files/lib/mvebu.sh | 3 +++ target/linux/mvebu/base-files/lib/preinit/06_set_iface_mac | 2 +- target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg | 2 +- target/linux/mvebu/base-files/lib/upgrade/platform.sh | 4 ++-- 8 files changed, 17 insertions(+), 6 deletions(-) (limited to 'target/linux/mvebu/base-files') diff --git a/target/linux/mvebu/base-files/etc/init.d/linksys_recovery b/target/linux/mvebu/base-files/etc/init.d/linksys_recovery index 60d7be0636..d9cae7b2cf 100755 --- a/target/linux/mvebu/base-files/etc/init.d/linksys_recovery +++ b/target/linux/mvebu/base-files/etc/init.d/linksys_recovery @@ -7,7 +7,7 @@ boot() { . /lib/mvebu.sh case $(mvebu_board_name) in - armada-385-linksys-caiman|armada-385-linksys-cobra|armada-xp-linksys-mamba) + armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-shelby|armada-xp-linksys-mamba) # make sure auto_recovery in uboot is always on AUTO_RECOVERY_ENA="`fw_printenv -n auto_recovery`" if [ "$AUTO_RECOVERY_ENA" != "yes" ] ; then diff --git a/target/linux/mvebu/base-files/etc/uci-defaults/01_leds b/target/linux/mvebu/base-files/etc/uci-defaults/01_leds index 50c2f8d231..612f949da4 100644 --- a/target/linux/mvebu/base-files/etc/uci-defaults/01_leds +++ b/target/linux/mvebu/base-files/etc/uci-defaults/01_leds @@ -19,6 +19,11 @@ armada-385-linksys-cobra) 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" diff --git a/target/linux/mvebu/base-files/etc/uci-defaults/02_network b/target/linux/mvebu/base-files/etc/uci-defaults/02_network index d1ead03b00..d1da59fb48 100644 --- a/target/linux/mvebu/base-files/etc/uci-defaults/02_network +++ b/target/linux/mvebu/base-files/etc/uci-defaults/02_network @@ -21,6 +21,9 @@ armada-385-linksys-caiman) 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" diff --git a/target/linux/mvebu/base-files/etc/uci-defaults/03_wireless b/target/linux/mvebu/base-files/etc/uci-defaults/03_wireless index c5d670a0ba..fcf43ee1f3 100644 --- a/target/linux/mvebu/base-files/etc/uci-defaults/03_wireless +++ b/target/linux/mvebu/base-files/etc/uci-defaults/03_wireless @@ -10,7 +10,7 @@ board=$(mvebu_board_name) case "$board" in -armada-385-linksys-caiman|armada-385-linksys-cobra|armada-xp-linksys-mamba) +armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-shelby|armada-xp-linksys-mamba) SKU=$(strings /dev/mtd3|sed -ne 's/^cert_region=//p') case "$SKU" in AP) diff --git a/target/linux/mvebu/base-files/lib/mvebu.sh b/target/linux/mvebu/base-files/lib/mvebu.sh index 3edfa6bbb4..09ebff3edc 100755 --- a/target/linux/mvebu/base-files/lib/mvebu.sh +++ b/target/linux/mvebu/base-files/lib/mvebu.sh @@ -40,6 +40,9 @@ mvebu_board_detect() { *"Linksys WRT1900ACv2") name="armada-385-linksys-cobra" ;; + *"Linksys WRT1900ACS") + name="armada-385-linksys-shelby" + ;; *"Marvell Armada 385 Access Point Development Board") name="armada-385-db-ap" ;; diff --git a/target/linux/mvebu/base-files/lib/preinit/06_set_iface_mac b/target/linux/mvebu/base-files/lib/preinit/06_set_iface_mac index 7217e93370..1cd649980f 100644 --- a/target/linux/mvebu/base-files/lib/preinit/06_set_iface_mac +++ b/target/linux/mvebu/base-files/lib/preinit/06_set_iface_mac @@ -15,7 +15,7 @@ preinit_set_mac_address() { ifconfig eth0 hw ether $mac 2>/dev/null ifconfig eth1 hw ether $mac_wan 2>/dev/null ;; - armada-385-linksys-caiman|armada-385-linksys-cobra) + armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-shelby) mac=$(mtd_get_mac_ascii devinfo hw_mac_addr) mac_wan=$(macaddr_setbit_la "$mac") ifconfig eth1 hw ether $mac 2>/dev/null diff --git a/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg b/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg index d665cb14aa..a54226f00c 100644 --- a/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg +++ b/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg @@ -8,7 +8,7 @@ preinit_mount_syscfg() { . /lib/mvebu.sh case $(mvebu_board_name) in - armada-385-linksys-caiman|armada-385-linksys-cobra|armada-xp-linksys-mamba) + armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-shelby|armada-xp-linksys-mamba) needs_recovery=0 ubiattach -m 8 || needs_recovery=1 if [ $needs_recovery -eq 1 ] diff --git a/target/linux/mvebu/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/base-files/lib/upgrade/platform.sh index 5e9c04b600..2f699a745f 100755 --- a/target/linux/mvebu/base-files/lib/upgrade/platform.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/platform.sh @@ -13,7 +13,7 @@ platform_check_image() { [ "$#" -gt 1 ] && return 1 case "$board" in - armada-385-linksys-caiman|armada-385-linksys-cobra|armada-xp-linksys-mamba) + armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-shelby|armada-xp-linksys-mamba) [ "$magic_long" != "27051956" -a "$magic_long" != "73797375" ] && { echo "Invalid image type." return 1 @@ -30,7 +30,7 @@ platform_do_upgrade() { local board=$(mvebu_board_name) case "$board" in - armada-385-linksys-caiman|armada-385-linksys-cobra|armada-xp-linksys-mamba) + armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-shelby|armada-xp-linksys-mamba) platform_do_upgrade_linksys "$ARGV" ;; *) -- cgit v1.2.3