aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/base-files
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-04-12 17:29:50 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-04-12 17:29:50 +0000
commitb0ad24f0d5bce342b432dd3a8bbaca7892c7b165 (patch)
treefe5ed8b7a900a0c68c4c83c2300a116ec179c0ca /target/linux/mvebu/base-files
parent2dbe131a6262a3b6d18a167e6f85d1b98c6dd285 (diff)
downloadupstream-b0ad24f0d5bce342b432dd3a8bbaca7892c7b165.tar.gz
upstream-b0ad24f0d5bce342b432dd3a8bbaca7892c7b165.tar.bz2
upstream-b0ad24f0d5bce342b432dd3a8bbaca7892c7b165.zip
mvebu: migrate mamba support to the upstreamed code
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 45400
Diffstat (limited to 'target/linux/mvebu/base-files')
-rw-r--r--target/linux/mvebu/base-files/etc/diag.sh2
-rw-r--r--target/linux/mvebu/base-files/etc/uci-defaults/01_leds2
-rw-r--r--target/linux/mvebu/base-files/etc/uci-defaults/02_network2
-rw-r--r--target/linux/mvebu/base-files/etc/uci-defaults/03_wireless2
-rwxr-xr-xtarget/linux/mvebu/base-files/lib/mvebu.sh4
-rw-r--r--target/linux/mvebu/base-files/lib/preinit/06_set_iface_mac2
-rw-r--r--target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg2
-rwxr-xr-xtarget/linux/mvebu/base-files/lib/upgrade/platform.sh4
8 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/mvebu/base-files/etc/diag.sh b/target/linux/mvebu/base-files/etc/diag.sh
index adba975ede..6534ac3f93 100644
--- a/target/linux/mvebu/base-files/etc/diag.sh
+++ b/target/linux/mvebu/base-files/etc/diag.sh
@@ -6,7 +6,7 @@
get_status_led() {
case $(mvebu_board_name) in
- armada-xp-mamba)
+ armada-xp-linksys-mamba)
status_led="mamba:white:power"
;;
esac
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 611ee2aab3..8907a4b62c 100644
--- a/target/linux/mvebu/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/mvebu/base-files/etc/uci-defaults/01_leds
@@ -9,7 +9,7 @@
board=$(mvebu_board_name)
case "$board" in
-armada-xp-mamba)
+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"
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 6485e35059..93dc515094 100644
--- a/target/linux/mvebu/base-files/etc/uci-defaults/02_network
+++ b/target/linux/mvebu/base-files/etc/uci-defaults/02_network
@@ -15,7 +15,7 @@ ucidef_set_interface_loopback
board=$(mvebu_board_name)
case "$board" in
-armada-xp-mamba)
+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"
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 ec188fb9e6..5eb3c901c2 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-xp-mamba)
+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 e8985b4664..3d50196bff 100755
--- a/target/linux/mvebu/base-files/lib/mvebu.sh
+++ b/target/linux/mvebu/base-files/lib/mvebu.sh
@@ -31,8 +31,8 @@ mvebu_board_detect() {
*"Marvell Armada XP GP Board")
name="armada-xp-gp"
;;
- *"Linksys WRT1900AC (Mamba)")
- name="armada-xp-mamba"
+ *"Linksys WRT1900AC")
+ name="armada-xp-linksys-mamba"
;;
esac
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 2b64eda822..7b77bea27f 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
@@ -9,7 +9,7 @@ preinit_set_mac_address() {
. /lib/mvebu.sh
case $(mvebu_board_name) in
- armada-xp-mamba)
+ armada-xp-linksys-mamba)
mac=$(mtd_get_mac_ascii devinfo hw_mac_addr)
mac_wan=$(macaddr_setbit_la "$mac")
ifconfig eth0 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 fdd0d1e669..d59cec3ab7 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-xp-mamba)
+ 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 f5e44c357a..55807f5f44 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-xp-mamba )
+ 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-xp-mamba)
+ armada-xp-linksys-mamba)
platform_do_upgrade_linksys "$ARGV"
;;
*)