From 18d6fa365511069dc5cb54274497319afed99439 Mon Sep 17 00:00:00 2001 From: blogic Date: Mon, 10 Dec 2012 14:13:01 +0000 Subject: [ramips] add support for Hauppauge Broadway This patch introduces OpenWRT support for the base Hauppauge/PCTV Broadway platform. It doesn't deal with the TV tuner or transcoder at this point, but the core functionality is working (Ethernet, wireless, USB, buttons, LEDs, etc). Signed-off-by: Devin Heitmueller git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34595 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom | 1 + target/linux/ramips/base-files/etc/uci-defaults/leds | 4 ++++ target/linux/ramips/base-files/etc/uci-defaults/network | 4 +++- target/linux/ramips/base-files/lib/preinit/06_set_iface_mac | 1 + target/linux/ramips/base-files/lib/ramips.sh | 3 +++ target/linux/ramips/base-files/lib/upgrade/platform.sh | 1 + 6 files changed, 13 insertions(+), 1 deletion(-) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index d02b1e0b4..32c97fce4 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -59,6 +59,7 @@ case "$FIRMWARE" in all5002 | \ argus-atp52b | \ bc2 | \ + broadway | \ carambola | \ dir-615-h1 | \ dir-620-a1 | \ diff --git a/target/linux/ramips/base-files/etc/uci-defaults/leds b/target/linux/ramips/base-files/etc/uci-defaults/leds index 81d9c44ea..e444db7ce 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/leds +++ b/target/linux/ramips/base-files/etc/uci-defaults/leds @@ -28,6 +28,10 @@ case $board in bc2) set_usb_led "bc2:blue:usb" ;; + broadway) + set_usb_led "red:diskmounted" + set_wifi_led "red:wps_active" + ;; dir-300-b1|\ dir-600-b1|\ dir-600-b2|\ diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network index dff0fd66f..5d49923bb 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/network +++ b/target/linux/ramips/base-files/etc/uci-defaults/network @@ -43,7 +43,8 @@ ramips_setup_interfaces() case $board in all0256n | \ - all5002) + all5002 | \ + broadway) ucidef_set_interface_lan "eth0" ;; @@ -141,6 +142,7 @@ ramips_setup_macs() 3g-6200n | \ argus-atp52b | \ bc2 | \ + broadway | \ f5d8235-v1 | \ nw718 | \ psr-680w | \ diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac index 379f74dd5..b04ec7744 100644 --- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac +++ b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac @@ -13,6 +13,7 @@ preinit_set_mac_address() { ifconfig eth0 hw ether $mac 2>/dev/null ;; bc2 |\ + broadway |\ dir-620-a1 |\ esr-9753 |\ freestation5 |\ diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index abefdc520..2d8a7e65d 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -110,6 +110,9 @@ ramips_board_name() { *"F5D8235 v2") name="f5d8235-v2" ;; + *"Hauppauge Broadway") + name="broadway" + ;; *"La Fonera 2.0N") name="fonera20n" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 1acbbffa4..2ec4749f9 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -19,6 +19,7 @@ platform_check_image() { all0256n | \ all5002 | \ bc2 | \ + broadway | \ carambola | \ dir-300-b1 | \ dir-600-b1 | \ -- cgit v1.2.3 From 8fedcbdf7f42cd48ebdac13f7f32e32cc3256c88 Mon Sep 17 00:00:00 2001 From: mirko Date: Wed, 19 Dec 2012 16:07:50 +0000 Subject: Do not use deprecated path to functions.sh (/etc/functions.sh -> /lib/functions.sh) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34793 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom | 2 +- target/linux/ramips/base-files/etc/uci-defaults/network | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index 32c97fce4..21c9f5f88 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -11,7 +11,7 @@ rt2x00_eeprom_extract() { local count=$3 local mtd - . /etc/functions.sh + . /lib/functions.sh mtd=$(find_mtd_part $part) [ -n "$mtd" ] || \ diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network index 5d49923bb..dadb95bcb 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/network +++ b/target/linux/ramips/base-files/etc/uci-defaults/network @@ -1,6 +1,6 @@ #!/bin/sh -. /etc/functions.sh +. /lib/functions.sh . /lib/ramips.sh . /lib/functions/uci-defaults.sh -- cgit v1.2.3 From 9798fec0b32330703361d944e234492b071cbe0a Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 22 Dec 2012 16:09:03 +0000 Subject: ramips: unify eeprom file name for the built-in wireless MAC Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34860 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index 21c9f5f88..ace4c1acd 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -28,9 +28,7 @@ rt2x00_eeprom_extract() { board=$(ramips_board_name) case "$FIRMWARE" in -"RT288X.eeprom" | \ -"RT305X.eeprom" | \ -"RT3883.eeprom") +"soc_wmac.eeprom") case $board in dir-300-b1 | \ dir-600-b1 | \ -- cgit v1.2.3 From e6076b9d37b039c355f41a38b1c07df29120d90e Mon Sep 17 00:00:00 2001 From: juhosg Date: Mon, 24 Dec 2012 06:52:38 +0000 Subject: ramips: fix wifi EEPROM extraction on DIR-615-Dx models Patch from #12636. Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34876 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index ace4c1acd..5989f791d 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -32,7 +32,8 @@ case "$FIRMWARE" in case $board in dir-300-b1 | \ dir-600-b1 | \ - dir-600-b2) + dir-600-b2 | \ + dir-615-d) rt2x00_eeprom_extract "devdata" 16384 272 ;; @@ -40,7 +41,6 @@ case "$FIRMWARE" in rt2x00_eeprom_extract "devdata" 0 272 ;; - dir-615-d | \ rt-n10-plus | \ rt-g32-b1) rt2x00_eeprom_extract "devconf" 0 272 -- cgit v1.2.3 From d3ca1d22b3c6358720aefccd0abca71a037fcc8c Mon Sep 17 00:00:00 2001 From: juhosg Date: Mon, 24 Dec 2012 06:52:41 +0000 Subject: ramips: fix ASUS WL-330N3G MAC address The ASUS WL-330N and WL-330N3G has the MAC address stored at offset 4, not 40. This is verified by reading original ASUS firmware GPL_WL-330N3G_source.1028/user/rc/common_ex.c and GPL_WL-330N_source.1021/user/rc/common_ex.c. Tested on WL-330N3G, it now gets the same MAC as is printed on the label on the router. Signed-off-by: Jan Kardell Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34877 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/lib/preinit/06_set_iface_mac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac index b04ec7744..7e2bac454 100644 --- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac +++ b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac @@ -8,7 +8,9 @@ preinit_set_mac_address() { . /lib/ramips.sh case $(ramips_board_name) in - 3g-6200n) + 3g-6200n |\ + wl-330n |\ + wl-330n3g) mac=$(ramips_get_mac_binary factory 4) ifconfig eth0 hw ether $mac 2>/dev/null ;; @@ -54,8 +56,6 @@ preinit_set_mac_address() { tew-692gr |\ w306r-v20 |\ w502u |\ - wl-330n |\ - wl-330n3g |\ wr6202 |\ xdxrn502j) mac=$(ramips_get_mac_binary factory 40) -- cgit v1.2.3 From 5a1856bd3812e53582786a2d49ea8593cf754c3c Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 29 Dec 2012 17:50:32 +0000 Subject: ramips: add user-space support for Airlive AIR3GII Signed-off-by: Cezary Jackiewicz Patchwork: http://patchwork.openwrt.org/patch/2913/ Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34923 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom | 1 + target/linux/ramips/base-files/etc/uci-defaults/leds | 4 ++++ target/linux/ramips/base-files/etc/uci-defaults/network | 1 + target/linux/ramips/base-files/lib/ramips.sh | 3 +++ target/linux/ramips/base-files/lib/upgrade/platform.sh | 1 + 5 files changed, 10 insertions(+) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index 5989f791d..1a04e5af6 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -52,6 +52,7 @@ case "$FIRMWARE" in ;; 3g-6200n | \ + air3gii | \ all0239-3g | \ all0256n | \ all5002 | \ diff --git a/target/linux/ramips/base-files/etc/uci-defaults/leds b/target/linux/ramips/base-files/etc/uci-defaults/leds index e444db7ce..a37901743 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/leds +++ b/target/linux/ramips/base-files/etc/uci-defaults/leds @@ -18,6 +18,10 @@ case $board in set_wifi_led "edimax:amber:wlan" set_usb_led "edimax:blue:3g" ;; + air3gii) + set_wifi_led "airlive:green:wlan" + set_usb_led "airlive:green:mobile" + ;; all0256n) ucidef_set_rssimon "wlan0" "40000" "1" ucidef_set_led_rssi "rssilow" "RSSILOW" "all0256n:green:rssilow" "wlan0" "1" "40" "0" "6" diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network index dadb95bcb..5ab89e9d9 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/network +++ b/target/linux/ramips/base-files/etc/uci-defaults/network @@ -140,6 +140,7 @@ ramips_setup_macs() lan_mac=$(ramips_get_mac_binary factory 40) ;; 3g-6200n | \ + air3gii | \ argus-atp52b | \ bc2 | \ broadway | \ diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 2d8a7e65d..42fcb646c 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -53,6 +53,9 @@ ramips_board_name() { *"Edimax 3g-6200n") name="3g-6200n" ;; + *"AirLive Air3GII") + name="air3gii" + ;; *"Allnet ALL0239-3G") name="all0239-3g" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 2ec4749f9..d1ccf7eac 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -15,6 +15,7 @@ platform_check_image() { case "$board" in 3g-6200n | \ + air3gii | \ all0239-3g | \ all0256n | \ all5002 | \ -- cgit v1.2.3 From 334c572cd25a960e1ffc1f3f6889e8b66e0abd0b Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 29 Dec 2012 17:50:38 +0000 Subject: ramips: add user-space support for the Planex MZK-W300NH2 Router MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Samir Ibradžić Patchwork: http://patchwork.openwrt.org/patch/3077/ Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34926 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/etc/diag.sh | 3 +++ .../ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom | 1 + target/linux/ramips/base-files/etc/uci-defaults/leds | 3 +++ target/linux/ramips/base-files/etc/uci-defaults/network | 8 ++++++++ target/linux/ramips/base-files/lib/preinit/06_set_iface_mac | 1 + target/linux/ramips/base-files/lib/ramips.sh | 3 +++ target/linux/ramips/base-files/lib/upgrade/platform.sh | 1 + 7 files changed, 20 insertions(+) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index d189db518..af05acede 100755 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -122,6 +122,9 @@ get_status_led() { wr512-3gn) status_led="wr512:green:wps" ;; + mzk-w300nh2) + status_led="mzkw300nh2:green:power" + ;; ur-336un) status_led="ur336:green:wps" ;; diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index 1a04e5af6..be6975c80 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -88,6 +88,7 @@ case "$FIRMWARE" in wli-tx4-ag300n | \ wr512-3gn | \ wr6202 | \ + mzk-w300nh2 | \ ur-336un | \ xdxrn502j) rt2x00_eeprom_extract "factory" 0 272 diff --git a/target/linux/ramips/base-files/etc/uci-defaults/leds b/target/linux/ramips/base-files/etc/uci-defaults/leds index a37901743..b4dcdd194 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/leds +++ b/target/linux/ramips/base-files/etc/uci-defaults/leds @@ -69,6 +69,9 @@ case $board in mofi3500-3gn) set_usb_led "mofi3500-3gn:green:usb" ;; + mzk-w300nh2) + set_wifi_led "mzkw300nh2:amber:wlan" + ;; nw718) set_usb_led "nw718:amber:usb" ;; diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network index 5ab89e9d9..598074bb1 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/network +++ b/target/linux/ramips/base-files/etc/uci-defaults/network @@ -71,6 +71,13 @@ ramips_setup_interfaces() ucidef_add_switch_vlan "switch0" "2" "0 6t" ;; + mzk-w300nh2) + ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" + ucidef_add_switch "switch0" "1" "1" + ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 6t" + ucidef_add_switch_vlan "switch0" "2" "4 6t" + ;; + f5d8235-v1 | \ f5d8235-v2 | \ ur-336un) @@ -145,6 +152,7 @@ ramips_setup_macs() bc2 | \ broadway | \ f5d8235-v1 | \ + mzk-w300nh2 | \ nw718 | \ psr-680w | \ rt-n15 | \ diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac index 7e2bac454..f411ab1fd 100644 --- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac +++ b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac @@ -9,6 +9,7 @@ preinit_set_mac_address() { case $(ramips_board_name) in 3g-6200n |\ + mzk-w300nh2 |\ wl-330n |\ wl-330n3g) mac=$(ramips_get_mac_binary factory 4) diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 42fcb646c..0128717e3 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -140,6 +140,9 @@ ramips_board_name() { *"Petatel PSR-680W"*) name="psr-680w" ;; + *"Planex MZK-W300NH2"*) + name="mzk-w300nh2" + ;; *"PWH2004") name="pwh2004" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index d1ccf7eac..584e16410 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -35,6 +35,7 @@ platform_check_image() { freestation5 | \ hw550-3g | \ mofi3500-3gn | \ + mzk-w300nh2 | \ nbg-419n | \ nw718 | \ omni-emb | \ -- cgit v1.2.3 From 902a5cfce0812236e4b632fe54cddaa752fbad28 Mon Sep 17 00:00:00 2001 From: blogic Date: Sun, 6 Jan 2013 11:11:42 +0000 Subject: [ramips] adds support for Edimax BR-6524N fixes #12754 Signed-off-by: git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35020 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/etc/diag.sh | 3 +++ target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom | 1 + target/linux/ramips/base-files/etc/uci-defaults/leds | 3 +++ target/linux/ramips/base-files/etc/uci-defaults/network | 1 + target/linux/ramips/base-files/lib/ramips.sh | 3 +++ 5 files changed, 11 insertions(+) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index af05acede..d8b913fca 100755 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -36,6 +36,9 @@ get_status_led() { argus-atp52b) status_led="argus-atp52b:green:run" ;; + br6524n) + status_led="edimax:blue:power" + ;; dir-300-b1 | dir-600-b1 | dir-600-b2 | dir-615-h1 | dir-615-d | dir-620-a1) status_led="d-link:green:status" ;; diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index be6975c80..6bd2c922c 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -59,6 +59,7 @@ case "$FIRMWARE" in argus-atp52b | \ bc2 | \ broadway | \ + br6524n | \ carambola | \ dir-615-h1 | \ dir-620-a1 | \ diff --git a/target/linux/ramips/base-files/etc/uci-defaults/leds b/target/linux/ramips/base-files/etc/uci-defaults/leds index b4dcdd194..fa9c4f0ab 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/leds +++ b/target/linux/ramips/base-files/etc/uci-defaults/leds @@ -36,6 +36,9 @@ case $board in set_usb_led "red:diskmounted" set_wifi_led "red:wps_active" ;; + br6524n) + set_wifi_led "edimax:blue:wlan" + ;; dir-300-b1|\ dir-600-b1|\ dir-600-b2|\ diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network index 598074bb1..bbcdf6fde 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/network +++ b/target/linux/ramips/base-files/etc/uci-defaults/network @@ -84,6 +84,7 @@ ramips_setup_interfaces() ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ;; + br6524n | \ v11st-fe) ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_add_switch "switch0" "1" "1" diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 0128717e3..03b49e8f3 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -71,6 +71,9 @@ ramips_board_name() { *"Argus ATP-52B") name="argus-atp52b" ;; + *"BR6524N") + name="br6524n" + ;; *"Asus WL-330N") name="wl-330n" ;; -- cgit v1.2.3 From 560c530e279fb8ed2a4a23ba371a83870aacb71a Mon Sep 17 00:00:00 2001 From: jow Date: Fri, 18 Jan 2013 12:42:53 +0000 Subject: all targets: use numerically prefixed uci-defaults file names to better control order of execution git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35217 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../ramips/base-files/etc/uci-defaults/01_leds | 101 ++++++++ .../ramips/base-files/etc/uci-defaults/02_network | 260 +++++++++++++++++++++ .../etc/uci-defaults/09_fix-seama-header | 20 ++ .../ramips/base-files/etc/uci-defaults/fixseama | 20 -- .../linux/ramips/base-files/etc/uci-defaults/leds | 101 -------- .../ramips/base-files/etc/uci-defaults/network | 260 --------------------- 6 files changed, 381 insertions(+), 381 deletions(-) create mode 100755 target/linux/ramips/base-files/etc/uci-defaults/01_leds create mode 100755 target/linux/ramips/base-files/etc/uci-defaults/02_network create mode 100755 target/linux/ramips/base-files/etc/uci-defaults/09_fix-seama-header delete mode 100755 target/linux/ramips/base-files/etc/uci-defaults/fixseama delete mode 100755 target/linux/ramips/base-files/etc/uci-defaults/leds delete mode 100755 target/linux/ramips/base-files/etc/uci-defaults/network (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/uci-defaults/01_leds b/target/linux/ramips/base-files/etc/uci-defaults/01_leds new file mode 100755 index 000000000..fa9c4f0ab --- /dev/null +++ b/target/linux/ramips/base-files/etc/uci-defaults/01_leds @@ -0,0 +1,101 @@ +#!/bin/sh + +. /lib/functions/uci-defaults.sh +. /lib/ramips.sh + +set_usb_led() { + ucidef_set_led_usbdev "usb" "USB" "$1" "1-1" +} + +set_wifi_led() { + ucidef_set_led_netdev "wifi_led" "wifi" "$1" "wlan0" +} + +board=$(ramips_board_name) + +case $board in + 3g-6200n) + set_wifi_led "edimax:amber:wlan" + set_usb_led "edimax:blue:3g" + ;; + air3gii) + set_wifi_led "airlive:green:wlan" + set_usb_led "airlive:green:mobile" + ;; + all0256n) + ucidef_set_rssimon "wlan0" "40000" "1" + ucidef_set_led_rssi "rssilow" "RSSILOW" "all0256n:green:rssilow" "wlan0" "1" "40" "0" "6" + ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "all0256n:green:rssimed" "wlan0" "30" "80" "-29" "5" + ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "all0256n:green:rssihigh" "wlan0" "70" "100" "-69" "8" + set_wifi_led "rt2800pci-phy0::radio" + ;; + bc2) + set_usb_led "bc2:blue:usb" + ;; + broadway) + set_usb_led "red:diskmounted" + set_wifi_led "red:wps_active" + ;; + br6524n) + set_wifi_led "edimax:blue:wlan" + ;; + dir-300-b1|\ + dir-600-b1|\ + dir-600-b2|\ + dir-620-a1) + # ANDed with vlan switch port 4 led state + ucidef_set_led_default "wan" "WAN LED (amber)" "d-link:amber:wan" "1" + set_wifi_led "rt2800pci-phy0::radio" + ;; + dir-615-d|\ + dir-615-h1) + ucidef_set_led_default "status" "Status LED (amber)" "d-link:amber:status" "0" + set_wifi_led "rt2800pci-phy0::radio" + ;; + esr-9753) + set_wifi_led "rt2800pci-phy0::radio" + ;; + f5d8235-v1) + set_usb_led "f5d8235-v1:blue:storage" + ;; + f5d8235-v2) + set_usb_led "f5d8235v2:blue:storage" + ;; + fonera20n) + set_usb_led "fonera20n:orange:usb" + set_wifi_led "fonera20n:orange:wifi" + ;; + all0239-3g|\ + hw550-3g) + set_usb_led "hw550-3g:green:usb" + ;; + mofi3500-3gn) + set_usb_led "mofi3500-3gn:green:usb" + ;; + mzk-w300nh2) + set_wifi_led "mzkw300nh2:amber:wlan" + ;; + nw718) + set_usb_led "nw718:amber:usb" + ;; + sl-r7205) + set_wifi_led "rt2800pci-phy0::radio" + ;; + v11st-fe) + set_wifi_led "rt2800pci-phy0::radio" + ;; + w306r-v20) + set_wifi_led "rt2800pci-phy0::radio" + ;; + w502u) + set_usb_led "alfa:blue:usb" + set_wifi_led "rt2800pci-phy0::radio" + ;; + wcr-150gn) + set_usb_led "wcr150gn:amber:user" + ;; +esac + +ucidef_commit_leds + +exit 0 diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network new file mode 100755 index 000000000..bbcdf6fde --- /dev/null +++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network @@ -0,0 +1,260 @@ +#!/bin/sh + +. /lib/functions.sh +. /lib/ramips.sh +. /lib/functions/uci-defaults.sh + +if [ ! -x /usr/sbin/maccalc ]; then + echo "$0: maccalc not found!" + return +fi + +ramips_setup_rt3x5x_vlans() +{ + if [ ! -x /sbin/swconfig ]; then + # legacy default + ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" + return + fi + local wanports="" + local lanports="" + swconfig dev rt305x set reset 1 + for port in 5 4 3 2 1 0; do + if [ `swconfig dev rt305x port $port get disable` = "1" ]; then + continue + fi + if [ `swconfig dev rt305x port $port get lan` = "0" ]; then + wanports="$port $wanports" + else + lanports="$port $lanports" + fi + done + ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" + ucidef_add_switch "rt305x" "1" "1" + ucidef_add_switch_vlan "rt305x" "1" "$lanports 6t" + ucidef_add_switch_vlan "rt305x" "2" "$wanports 6t" +} + +ramips_setup_interfaces() +{ + local board="$1" + + ucidef_set_interface_loopback + + case $board in + all0256n | \ + all5002 | \ + broadway) + ucidef_set_interface_lan "eth0" + ;; + + dir-615-h1 | \ + wl-330n) + ucidef_set_interface_lan "eth0.1" + ;; + + 3g-6200n | \ + argus-atp52b | \ + b2c | \ + nw718 | \ + psr-680w | \ + sl-r7205 | \ + w502u | \ + wr6202) + ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" + ;; + + dir-645) + ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" + ucidef_add_switch "switch0" "1" "1" + ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 6t" + ucidef_add_switch_vlan "switch0" "2" "0 6t" + ;; + + mzk-w300nh2) + ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" + ucidef_add_switch "switch0" "1" "1" + ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 6t" + ucidef_add_switch_vlan "switch0" "2" "4 6t" + ;; + + f5d8235-v1 | \ + f5d8235-v2 | \ + ur-336un) + ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" + ;; + + br6524n | \ + v11st-fe) + ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" + ucidef_add_switch "switch0" "1" "1" + ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 5t" + ucidef_add_switch_vlan "switch0" "2" "0 5t" + ;; + + rt-n15 | \ + wl-351) + ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" + ucidef_add_switch "switch0" "1" "1" + ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t" + ucidef_add_switch_vlan "switch0" "2" "4 5t" + ;; + + rt-n56u) + ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" + ucidef_add_switch "switch0" "1" "1" + ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 8t" + ucidef_add_switch_vlan "switch0" "2" "4 8t" + ;; + + tew-691gr|\ + tew-692gr) + ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" + ucidef_add_switch "switch0" "1" "1" + ucidef_add_switch_vlan "switch0" "1" "0t 1 2 3 4" + ucidef_add_switch_vlan "switch0" "2" "0t 5" + ;; + + freestation5 | \ + wcr-150gn) + ucidef_set_interfaces_lan_wan "eth0.2" "eth0.1" + ;; + + wli-tx4-ag300n) + ucidef_set_interface_lan "eth0" + ;; + + *) + RT3X5X=`cat /proc/cpuinfo | egrep "(RT3.5|RT5350)"` + if [ -n "${RT3X5X}" ]; then + ramips_setup_rt3x5x_vlans + else + ucidef_set_interfaces_lan_wan "eth0" "eth1" + fi + ;; + esac +} + +ramips_setup_macs() +{ + local board="$1" + local lan_mac="" + local wan_mac="" + + case $board in + all0256n | \ + all5002 | \ + dir-615-h1) + lan_mac=$(ramips_get_mac_binary factory 40) + ;; + 3g-6200n | \ + air3gii | \ + argus-atp52b | \ + bc2 | \ + broadway | \ + f5d8235-v1 | \ + mzk-w300nh2 | \ + nw718 | \ + psr-680w | \ + rt-n15 | \ + sl-r7205 | \ + wl-351) + lan_mac=$(ramips_get_mac_binary factory 4) + wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) + ;; + + w306r-v20) + lan_mac=$(ramips_get_mac_binary factory 4) + wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 5) + ;; + + rt-n13u | \ + fonera20n) + lan_mac=$(ramips_get_mac_binary factory 40) + wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) + ;; + + dir-300-b1 |\ + dir-300-b2 |\ + dir-600-b1) + lan_mac=$(ramips_get_mac_binary devdata 16388) + wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) + ;; + + dir-620-a1) + lan_mac=$(ramips_get_mac_binary factory 4) + lan_mac=$(maccalc or "$lan_mac" "02:00:00:00:00:00") + wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) + ;; + + dir-645) + lan_mac=$(ramips_get_mac_nvram nvram lanmac) + wan_mac=$(ramips_get_mac_nvram nvram wanmac) + ;; + + esr-9753 | \ + ur-336un) + lan_mac=$(ramips_get_mac_binary devdata 16388) + wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) + ;; + + nbg-419n | \ + wcr-150gn) + lan_mac=$(ramips_get_mac_binary factory 4) + wan_mac=$(ramips_get_mac_binary factory 40) + ;; + + f5d8235-v2) + lan_mac=$(ramips_get_mac_binary "u-boot" 262148) + wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) + ;; + + rt-n56u) + lan_mac=$(ramips_get_mac_binary factory 4) + wan_mac=$(ramips_get_mac_binary factory 32772) + ;; + + tew-691gr) + lan_mac=$(ramips_get_mac_binary factory 40) + wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 3) + ;; + + tew-692gr) + lan_mac=$(ramips_get_mac_binary factory 40) + wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 4) + ;; + + all0239-3g | \ + carambola | \ + w502u) + lan_mac=$(ramips_get_mac_binary factory 40) + wan_mac=$(ramips_get_mac_binary factory 46) + ;; + + wl341v3) + lan_mac=$(ramips_get_mac_binary board-nvram 65440) + wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) + ;; + + wli-tx4-ag300n) + lan_mac=$(ramips_get_mac_binary factory 4) + ;; + + esac + + [ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan $lan_mac + [ -n "$wan_mac" ] && ucidef_set_interface_macaddr wan $wan_mac +} + +[ -e /etc/config/network ] && exit 0 + +touch /etc/config/network + +board=$(ramips_board_name) + +ramips_setup_interfaces $board +ramips_setup_macs $board + +uci commit network + +exit 0 diff --git a/target/linux/ramips/base-files/etc/uci-defaults/09_fix-seama-header b/target/linux/ramips/base-files/etc/uci-defaults/09_fix-seama-header new file mode 100755 index 000000000..d8bed7951 --- /dev/null +++ b/target/linux/ramips/base-files/etc/uci-defaults/09_fix-seama-header @@ -0,0 +1,20 @@ +#!/bin/sh +# +# Copyright (C) 2012 OpenWrt.org +# + +. /lib/ramips.sh + +fix_seama_header() { + local part=$1 + + mtd fixseama $part +} + +board=$(ramips_board_name) + +case "$board" in +dir-645) + fix_seama_header kernel + ;; +esac diff --git a/target/linux/ramips/base-files/etc/uci-defaults/fixseama b/target/linux/ramips/base-files/etc/uci-defaults/fixseama deleted file mode 100755 index d8bed7951..000000000 --- a/target/linux/ramips/base-files/etc/uci-defaults/fixseama +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2012 OpenWrt.org -# - -. /lib/ramips.sh - -fix_seama_header() { - local part=$1 - - mtd fixseama $part -} - -board=$(ramips_board_name) - -case "$board" in -dir-645) - fix_seama_header kernel - ;; -esac diff --git a/target/linux/ramips/base-files/etc/uci-defaults/leds b/target/linux/ramips/base-files/etc/uci-defaults/leds deleted file mode 100755 index fa9c4f0ab..000000000 --- a/target/linux/ramips/base-files/etc/uci-defaults/leds +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh - -. /lib/functions/uci-defaults.sh -. /lib/ramips.sh - -set_usb_led() { - ucidef_set_led_usbdev "usb" "USB" "$1" "1-1" -} - -set_wifi_led() { - ucidef_set_led_netdev "wifi_led" "wifi" "$1" "wlan0" -} - -board=$(ramips_board_name) - -case $board in - 3g-6200n) - set_wifi_led "edimax:amber:wlan" - set_usb_led "edimax:blue:3g" - ;; - air3gii) - set_wifi_led "airlive:green:wlan" - set_usb_led "airlive:green:mobile" - ;; - all0256n) - ucidef_set_rssimon "wlan0" "40000" "1" - ucidef_set_led_rssi "rssilow" "RSSILOW" "all0256n:green:rssilow" "wlan0" "1" "40" "0" "6" - ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "all0256n:green:rssimed" "wlan0" "30" "80" "-29" "5" - ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "all0256n:green:rssihigh" "wlan0" "70" "100" "-69" "8" - set_wifi_led "rt2800pci-phy0::radio" - ;; - bc2) - set_usb_led "bc2:blue:usb" - ;; - broadway) - set_usb_led "red:diskmounted" - set_wifi_led "red:wps_active" - ;; - br6524n) - set_wifi_led "edimax:blue:wlan" - ;; - dir-300-b1|\ - dir-600-b1|\ - dir-600-b2|\ - dir-620-a1) - # ANDed with vlan switch port 4 led state - ucidef_set_led_default "wan" "WAN LED (amber)" "d-link:amber:wan" "1" - set_wifi_led "rt2800pci-phy0::radio" - ;; - dir-615-d|\ - dir-615-h1) - ucidef_set_led_default "status" "Status LED (amber)" "d-link:amber:status" "0" - set_wifi_led "rt2800pci-phy0::radio" - ;; - esr-9753) - set_wifi_led "rt2800pci-phy0::radio" - ;; - f5d8235-v1) - set_usb_led "f5d8235-v1:blue:storage" - ;; - f5d8235-v2) - set_usb_led "f5d8235v2:blue:storage" - ;; - fonera20n) - set_usb_led "fonera20n:orange:usb" - set_wifi_led "fonera20n:orange:wifi" - ;; - all0239-3g|\ - hw550-3g) - set_usb_led "hw550-3g:green:usb" - ;; - mofi3500-3gn) - set_usb_led "mofi3500-3gn:green:usb" - ;; - mzk-w300nh2) - set_wifi_led "mzkw300nh2:amber:wlan" - ;; - nw718) - set_usb_led "nw718:amber:usb" - ;; - sl-r7205) - set_wifi_led "rt2800pci-phy0::radio" - ;; - v11st-fe) - set_wifi_led "rt2800pci-phy0::radio" - ;; - w306r-v20) - set_wifi_led "rt2800pci-phy0::radio" - ;; - w502u) - set_usb_led "alfa:blue:usb" - set_wifi_led "rt2800pci-phy0::radio" - ;; - wcr-150gn) - set_usb_led "wcr150gn:amber:user" - ;; -esac - -ucidef_commit_leds - -exit 0 diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network deleted file mode 100755 index bbcdf6fde..000000000 --- a/target/linux/ramips/base-files/etc/uci-defaults/network +++ /dev/null @@ -1,260 +0,0 @@ -#!/bin/sh - -. /lib/functions.sh -. /lib/ramips.sh -. /lib/functions/uci-defaults.sh - -if [ ! -x /usr/sbin/maccalc ]; then - echo "$0: maccalc not found!" - return -fi - -ramips_setup_rt3x5x_vlans() -{ - if [ ! -x /sbin/swconfig ]; then - # legacy default - ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" - return - fi - local wanports="" - local lanports="" - swconfig dev rt305x set reset 1 - for port in 5 4 3 2 1 0; do - if [ `swconfig dev rt305x port $port get disable` = "1" ]; then - continue - fi - if [ `swconfig dev rt305x port $port get lan` = "0" ]; then - wanports="$port $wanports" - else - lanports="$port $lanports" - fi - done - ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" - ucidef_add_switch "rt305x" "1" "1" - ucidef_add_switch_vlan "rt305x" "1" "$lanports 6t" - ucidef_add_switch_vlan "rt305x" "2" "$wanports 6t" -} - -ramips_setup_interfaces() -{ - local board="$1" - - ucidef_set_interface_loopback - - case $board in - all0256n | \ - all5002 | \ - broadway) - ucidef_set_interface_lan "eth0" - ;; - - dir-615-h1 | \ - wl-330n) - ucidef_set_interface_lan "eth0.1" - ;; - - 3g-6200n | \ - argus-atp52b | \ - b2c | \ - nw718 | \ - psr-680w | \ - sl-r7205 | \ - w502u | \ - wr6202) - ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" - ;; - - dir-645) - ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" - ucidef_add_switch "switch0" "1" "1" - ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 6t" - ucidef_add_switch_vlan "switch0" "2" "0 6t" - ;; - - mzk-w300nh2) - ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" - ucidef_add_switch "switch0" "1" "1" - ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 6t" - ucidef_add_switch_vlan "switch0" "2" "4 6t" - ;; - - f5d8235-v1 | \ - f5d8235-v2 | \ - ur-336un) - ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" - ;; - - br6524n | \ - v11st-fe) - ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" - ucidef_add_switch "switch0" "1" "1" - ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 5t" - ucidef_add_switch_vlan "switch0" "2" "0 5t" - ;; - - rt-n15 | \ - wl-351) - ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" - ucidef_add_switch "switch0" "1" "1" - ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t" - ucidef_add_switch_vlan "switch0" "2" "4 5t" - ;; - - rt-n56u) - ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" - ucidef_add_switch "switch0" "1" "1" - ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 8t" - ucidef_add_switch_vlan "switch0" "2" "4 8t" - ;; - - tew-691gr|\ - tew-692gr) - ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" - ucidef_add_switch "switch0" "1" "1" - ucidef_add_switch_vlan "switch0" "1" "0t 1 2 3 4" - ucidef_add_switch_vlan "switch0" "2" "0t 5" - ;; - - freestation5 | \ - wcr-150gn) - ucidef_set_interfaces_lan_wan "eth0.2" "eth0.1" - ;; - - wli-tx4-ag300n) - ucidef_set_interface_lan "eth0" - ;; - - *) - RT3X5X=`cat /proc/cpuinfo | egrep "(RT3.5|RT5350)"` - if [ -n "${RT3X5X}" ]; then - ramips_setup_rt3x5x_vlans - else - ucidef_set_interfaces_lan_wan "eth0" "eth1" - fi - ;; - esac -} - -ramips_setup_macs() -{ - local board="$1" - local lan_mac="" - local wan_mac="" - - case $board in - all0256n | \ - all5002 | \ - dir-615-h1) - lan_mac=$(ramips_get_mac_binary factory 40) - ;; - 3g-6200n | \ - air3gii | \ - argus-atp52b | \ - bc2 | \ - broadway | \ - f5d8235-v1 | \ - mzk-w300nh2 | \ - nw718 | \ - psr-680w | \ - rt-n15 | \ - sl-r7205 | \ - wl-351) - lan_mac=$(ramips_get_mac_binary factory 4) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) - ;; - - w306r-v20) - lan_mac=$(ramips_get_mac_binary factory 4) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 5) - ;; - - rt-n13u | \ - fonera20n) - lan_mac=$(ramips_get_mac_binary factory 40) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) - ;; - - dir-300-b1 |\ - dir-300-b2 |\ - dir-600-b1) - lan_mac=$(ramips_get_mac_binary devdata 16388) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) - ;; - - dir-620-a1) - lan_mac=$(ramips_get_mac_binary factory 4) - lan_mac=$(maccalc or "$lan_mac" "02:00:00:00:00:00") - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) - ;; - - dir-645) - lan_mac=$(ramips_get_mac_nvram nvram lanmac) - wan_mac=$(ramips_get_mac_nvram nvram wanmac) - ;; - - esr-9753 | \ - ur-336un) - lan_mac=$(ramips_get_mac_binary devdata 16388) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) - ;; - - nbg-419n | \ - wcr-150gn) - lan_mac=$(ramips_get_mac_binary factory 4) - wan_mac=$(ramips_get_mac_binary factory 40) - ;; - - f5d8235-v2) - lan_mac=$(ramips_get_mac_binary "u-boot" 262148) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) - ;; - - rt-n56u) - lan_mac=$(ramips_get_mac_binary factory 4) - wan_mac=$(ramips_get_mac_binary factory 32772) - ;; - - tew-691gr) - lan_mac=$(ramips_get_mac_binary factory 40) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 3) - ;; - - tew-692gr) - lan_mac=$(ramips_get_mac_binary factory 40) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 4) - ;; - - all0239-3g | \ - carambola | \ - w502u) - lan_mac=$(ramips_get_mac_binary factory 40) - wan_mac=$(ramips_get_mac_binary factory 46) - ;; - - wl341v3) - lan_mac=$(ramips_get_mac_binary board-nvram 65440) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) - ;; - - wli-tx4-ag300n) - lan_mac=$(ramips_get_mac_binary factory 4) - ;; - - esac - - [ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan $lan_mac - [ -n "$wan_mac" ] && ucidef_set_interface_macaddr wan $wan_mac -} - -[ -e /etc/config/network ] && exit 0 - -touch /etc/config/network - -board=$(ramips_board_name) - -ramips_setup_interfaces $board -ramips_setup_macs $board - -uci commit network - -exit 0 -- cgit v1.2.3 From 86d2c52f52c503c83ae88078fa21da5e2fa061c0 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 19 Jan 2013 17:05:06 +0000 Subject: ramips: add user-space support for the Tenda 3G300M Signed-off-by: Cezary Jackiewicz Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35245 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/etc/diag.sh | 3 +++ target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom | 1 + target/linux/ramips/base-files/etc/uci-defaults/01_leds | 3 +++ target/linux/ramips/base-files/etc/uci-defaults/02_network | 2 ++ target/linux/ramips/base-files/lib/preinit/06_set_iface_mac | 1 + target/linux/ramips/base-files/lib/ramips.sh | 3 +++ target/linux/ramips/base-files/lib/upgrade/platform.sh | 1 + 7 files changed, 14 insertions(+) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index d8b913fca..ff5818c20 100755 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -33,6 +33,9 @@ get_status_led() { 3g-6200n) status_led="edimax:green:power" ;; + 3g300m) + status_led="tenda:blue:ap" + ;; argus-atp52b) status_led="argus-atp52b:green:run" ;; diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index 6bd2c922c..61d79b940 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -52,6 +52,7 @@ case "$FIRMWARE" in ;; 3g-6200n | \ + 3g300m | \ air3gii | \ all0239-3g | \ all0256n | \ diff --git a/target/linux/ramips/base-files/etc/uci-defaults/01_leds b/target/linux/ramips/base-files/etc/uci-defaults/01_leds index fa9c4f0ab..516f3cc50 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/01_leds +++ b/target/linux/ramips/base-files/etc/uci-defaults/01_leds @@ -18,6 +18,9 @@ case $board in set_wifi_led "edimax:amber:wlan" set_usb_led "edimax:blue:3g" ;; + 3g300m) + set_usb_led "tenda:blue:3g" + ;; air3gii) set_wifi_led "airlive:green:wlan" set_usb_led "airlive:green:mobile" diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network index bbcdf6fde..a8e5ef9d7 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/02_network +++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network @@ -42,6 +42,7 @@ ramips_setup_interfaces() ucidef_set_interface_loopback case $board in + 3g300m | \ all0256n | \ all5002 | \ broadway) @@ -148,6 +149,7 @@ ramips_setup_macs() lan_mac=$(ramips_get_mac_binary factory 40) ;; 3g-6200n | \ + 3g300m | \ air3gii | \ argus-atp52b | \ bc2 | \ diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac index f411ab1fd..8f9f83583 100644 --- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac +++ b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac @@ -9,6 +9,7 @@ preinit_set_mac_address() { case $(ramips_board_name) in 3g-6200n |\ + 3g300m | \ mzk-w300nh2 |\ wl-330n |\ wl-330n3g) diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 03b49e8f3..83dcc0e48 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -182,6 +182,9 @@ ramips_board_name() { *"Sitecom WL-351 v1 002") name="wl-351" ;; + *"Tenda 3G300M") + name="3g300m" + ;; *"Tenda W306R V2.0") name="w306r-v20" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 584e16410..0ddf2df44 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -15,6 +15,7 @@ platform_check_image() { case "$board" in 3g-6200n | \ + 3g300m | \ air3gii | \ all0239-3g | \ all0256n | \ -- cgit v1.2.3 From 70fa20423a0510e046284dedaf791ae9a3fc7b63 Mon Sep 17 00:00:00 2001 From: blogic Date: Mon, 28 Jan 2013 17:44:41 +0000 Subject: ramips: reset switch on single-port devices Signed-off-by: Daniel Gole git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35356 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/etc/uci-defaults/02_network | 1 + 1 file changed, 1 insertion(+) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network index a8e5ef9d7..b9c88e352 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/02_network +++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network @@ -46,6 +46,7 @@ ramips_setup_interfaces() all0256n | \ all5002 | \ broadway) + ucidef_add_switch "switch0" "1" "0" ucidef_set_interface_lan "eth0" ;; -- cgit v1.2.3 From ecf5eeb12b80022f66d737e84790dc3556c783a9 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 2 Feb 2013 17:01:50 +0000 Subject: ramips: add userspace support for the Edimax BR-6425 [juhosg: remove sysupgrade changes] Signed-off-by: Yuval Adam Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35463 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/etc/diag.sh | 3 +++ target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom | 1 + target/linux/ramips/base-files/etc/uci-defaults/01_leds | 3 +++ target/linux/ramips/base-files/etc/uci-defaults/02_network | 1 + target/linux/ramips/base-files/lib/ramips.sh | 3 +++ 5 files changed, 11 insertions(+) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index ff5818c20..8702a2def 100755 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -42,6 +42,9 @@ get_status_led() { br6524n) status_led="edimax:blue:power" ;; + br6425) + status_led="edimax:green:power" + ;; dir-300-b1 | dir-600-b1 | dir-600-b2 | dir-615-h1 | dir-615-d | dir-620-a1) status_led="d-link:green:status" ;; diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index 61d79b940..9ff58f1b8 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -59,6 +59,7 @@ case "$FIRMWARE" in all5002 | \ argus-atp52b | \ bc2 | \ + br6425 | \ broadway | \ br6524n | \ carambola | \ diff --git a/target/linux/ramips/base-files/etc/uci-defaults/01_leds b/target/linux/ramips/base-files/etc/uci-defaults/01_leds index 516f3cc50..f582e5cdd 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/01_leds +++ b/target/linux/ramips/base-files/etc/uci-defaults/01_leds @@ -35,6 +35,9 @@ case $board in bc2) set_usb_led "bc2:blue:usb" ;; + br6425) + set_wifi_led "edimax:orange:wlan" + ;; broadway) set_usb_led "red:diskmounted" set_wifi_led "red:wps_active" diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network index b9c88e352..cc5b8c2be 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/02_network +++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network @@ -154,6 +154,7 @@ ramips_setup_macs() air3gii | \ argus-atp52b | \ bc2 | \ + br6425 | \ broadway | \ f5d8235-v1 | \ mzk-w300nh2 | \ diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 83dcc0e48..3f06da369 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -56,6 +56,9 @@ ramips_board_name() { *"AirLive Air3GII") name="air3gii" ;; + *"Edimax BR-6425") + name="br6425" + ;; *"Allnet ALL0239-3G") name="all0239-3g" ;; -- cgit v1.2.3 From 0c46f343b30717e31fe424e7e30a7a0c2e4a2dce Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 2 Feb 2013 17:21:05 +0000 Subject: ramips: add user-space support for the Omnima EMB HPM board Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35467 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/etc/diag.sh | 3 ++- .../linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom | 1 + target/linux/ramips/base-files/etc/uci-defaults/01_leds | 5 +++++ target/linux/ramips/base-files/etc/uci-defaults/02_network | 5 +++++ target/linux/ramips/base-files/lib/preinit/06_set_iface_mac | 1 + target/linux/ramips/base-files/lib/ramips.sh | 3 +++ target/linux/ramips/base-files/lib/upgrade/platform.sh | 1 + 7 files changed, 18 insertions(+), 1 deletion(-) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index 8702a2def..eaa28e190 100755 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -79,7 +79,8 @@ get_status_led() { nw718) status_led="nw718:amber:cpu" ;; - omni-emb) + omni-emb|\ + omni-emb-hpm) status_led="emb:green:status" ;; psr-680w) diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index 9ff58f1b8..43121e19b 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -75,6 +75,7 @@ case "$FIRMWARE" in nbg-419n | \ nw718 | \ omni-emb | \ + omni-emb-hpm | \ psr-680w | \ rt-n15 | \ rt-n56u | \ diff --git a/target/linux/ramips/base-files/etc/uci-defaults/01_leds b/target/linux/ramips/base-files/etc/uci-defaults/01_leds index f582e5cdd..104f201fb 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/01_leds +++ b/target/linux/ramips/base-files/etc/uci-defaults/01_leds @@ -84,6 +84,11 @@ case $board in nw718) set_usb_led "nw718:amber:usb" ;; + omni-emb-hpm) + ucidef_set_led_default "power" "POWER" "emb:orange:power" "1" + ucidef_set_led_netdev "eth" "ETH" "emb:green:eth" "eth0" + set_wifi_led "emb:green:wifi" + ;; sl-r7205) set_wifi_led "rt2800pci-phy0::radio" ;; diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network index cc5b8c2be..b6fff7a2c 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/02_network +++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network @@ -122,6 +122,7 @@ ramips_setup_interfaces() ucidef_set_interfaces_lan_wan "eth0.2" "eth0.1" ;; + omni-emb-hpm|\ wli-tx4-ag300n) ucidef_set_interface_lan "eth0" ;; @@ -208,6 +209,10 @@ ramips_setup_macs() wan_mac=$(ramips_get_mac_binary factory 40) ;; + omni-emb-hpm) + lan_mac=$(ramips_get_mac_binary factory 40) + ;; + f5d8235-v2) lan_mac=$(ramips_get_mac_binary "u-boot" 262148) wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac index 8f9f83583..247b5531b 100644 --- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac +++ b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac @@ -54,6 +54,7 @@ preinit_set_mac_address() { hw550-3g |\ nbg-419n |\ omni-emb |\ + omni-emb-hpm |\ tew-691gr |\ tew-692gr |\ w306r-v20 |\ diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 3f06da369..b8b735fd6 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -140,6 +140,9 @@ ramips_board_name() { *"NW718") name="nw718" ;; + *"Omnima EMB HPM") + name="omni-emb-hpm" + ;; *"Omnima MiniEMBWiFi") name="omni-emb" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 0ddf2df44..1b358c12e 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -40,6 +40,7 @@ platform_check_image() { nbg-419n | \ nw718 | \ omni-emb | \ + omni-emb-hpm | \ psr-680w | \ rt-g32-b1 | \ rt-n10-plus | \ -- cgit v1.2.3 From 167702283be513e96391b3f64dff151a4999104e Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 16 Feb 2013 11:50:21 +0000 Subject: ramips: use the mtd_get_mac_* helpers Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35613 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../ramips/base-files/etc/uci-defaults/02_network | 42 +++++++++++----------- .../ramips/base-files/lib/preinit/06_set_iface_mac | 17 ++++----- target/linux/ramips/base-files/lib/ramips.sh | 37 ------------------- 3 files changed, 30 insertions(+), 66 deletions(-) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network index b6fff7a2c..fafa7eaa3 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/02_network +++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network @@ -148,7 +148,7 @@ ramips_setup_macs() all0256n | \ all5002 | \ dir-615-h1) - lan_mac=$(ramips_get_mac_binary factory 40) + lan_mac=$(mtd_get_mac_binary factory 40) ;; 3g-6200n | \ 3g300m | \ @@ -164,89 +164,89 @@ ramips_setup_macs() rt-n15 | \ sl-r7205 | \ wl-351) - lan_mac=$(ramips_get_mac_binary factory 4) + lan_mac=$(mtd_get_mac_binary factory 4) wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) ;; w306r-v20) - lan_mac=$(ramips_get_mac_binary factory 4) + lan_mac=$(mtd_get_mac_binary factory 4) wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 5) ;; rt-n13u | \ fonera20n) - lan_mac=$(ramips_get_mac_binary factory 40) + lan_mac=$(mtd_get_mac_binary factory 40) wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) ;; dir-300-b1 |\ dir-300-b2 |\ dir-600-b1) - lan_mac=$(ramips_get_mac_binary devdata 16388) + lan_mac=$(mtd_get_mac_binary devdata 16388) wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) ;; dir-620-a1) - lan_mac=$(ramips_get_mac_binary factory 4) + lan_mac=$(mtd_get_mac_binary factory 4) lan_mac=$(maccalc or "$lan_mac" "02:00:00:00:00:00") wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) ;; dir-645) - lan_mac=$(ramips_get_mac_nvram nvram lanmac) - wan_mac=$(ramips_get_mac_nvram nvram wanmac) + lan_mac=$(mtd_get_mac_ascii nvram lanmac) + wan_mac=$(mtd_get_mac_ascii nvram wanmac) ;; esr-9753 | \ ur-336un) - lan_mac=$(ramips_get_mac_binary devdata 16388) + lan_mac=$(mtd_get_mac_binary devdata 16388) wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) ;; nbg-419n | \ wcr-150gn) - lan_mac=$(ramips_get_mac_binary factory 4) - wan_mac=$(ramips_get_mac_binary factory 40) + lan_mac=$(mtd_get_mac_binary factory 4) + wan_mac=$(mtd_get_mac_binary factory 40) ;; omni-emb-hpm) - lan_mac=$(ramips_get_mac_binary factory 40) + lan_mac=$(mtd_get_mac_binary factory 40) ;; f5d8235-v2) - lan_mac=$(ramips_get_mac_binary "u-boot" 262148) + lan_mac=$(mtd_get_mac_binary "u-boot" 262148) wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) ;; rt-n56u) - lan_mac=$(ramips_get_mac_binary factory 4) - wan_mac=$(ramips_get_mac_binary factory 32772) + lan_mac=$(mtd_get_mac_binary factory 4) + wan_mac=$(mtd_get_mac_binary factory 32772) ;; tew-691gr) - lan_mac=$(ramips_get_mac_binary factory 40) + lan_mac=$(mtd_get_mac_binary factory 40) wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 3) ;; tew-692gr) - lan_mac=$(ramips_get_mac_binary factory 40) + lan_mac=$(mtd_get_mac_binary factory 40) wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 4) ;; all0239-3g | \ carambola | \ w502u) - lan_mac=$(ramips_get_mac_binary factory 40) - wan_mac=$(ramips_get_mac_binary factory 46) + lan_mac=$(mtd_get_mac_binary factory 40) + wan_mac=$(mtd_get_mac_binary factory 46) ;; wl341v3) - lan_mac=$(ramips_get_mac_binary board-nvram 65440) + lan_mac=$(mtd_get_mac_binary board-nvram 65440) wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) ;; wli-tx4-ag300n) - lan_mac=$(ramips_get_mac_binary factory 4) + lan_mac=$(mtd_get_mac_binary factory 4) ;; esac diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac index 247b5531b..6d3dd58c0 100644 --- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac +++ b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac @@ -5,6 +5,7 @@ preinit_set_mac_address() { local mac + . /lib/functions.sh . /lib/ramips.sh case $(ramips_board_name) in @@ -13,7 +14,7 @@ preinit_set_mac_address() { mzk-w300nh2 |\ wl-330n |\ wl-330n3g) - mac=$(ramips_get_mac_binary factory 4) + mac=$(mtd_get_mac_binary factory 4) ifconfig eth0 hw ether $mac 2>/dev/null ;; bc2 |\ @@ -25,23 +26,23 @@ preinit_set_mac_address() { psr-680w |\ rt-n56u |\ sl-r7205) - mac=$(ramips_get_mac_binary factory 4) + mac=$(mtd_get_mac_binary factory 4) mac=$(maccalc or "$mac" "02:00:00:00:00:00") ifconfig eth0 hw ether $mac 2>/dev/null ;; dir-300-b1 |\ dir-300-b2 |\ dir-600-b1) - mac=$(ramips_get_mac_binary devdata 16388) + mac=$(mtd_get_mac_binary devdata 16388) ifconfig eth0 hw ether $mac 2>/dev/null ;; dir-645) - mac=$(ramips_get_mac_nvram nvram lanmac) + mac=$(mtd_get_mac_ascii nvram lanmac) mac=$(maccalc or "$mac" "02:00:00:00:00:00") ifconfig eth0 hw ether $mac 2>/dev/null ;; dap-1350) - mac=$(ramips_get_mac_binary devdata 46) + mac=$(mtd_get_mac_binary devdata 46) ifconfig eth0 hw ether $mac 2>/dev/null ;; all0239-3g |\ @@ -61,15 +62,15 @@ preinit_set_mac_address() { w502u |\ wr6202 |\ xdxrn502j) - mac=$(ramips_get_mac_binary factory 40) + mac=$(mtd_get_mac_binary factory 40) ifconfig eth0 hw ether $mac 2>/dev/null ;; wl341v3) - mac=$(ramips_get_mac_binary board-nvram 65440) + mac=$(mtd_get_mac_binary board-nvram 65440) ifconfig eth0 hw ether $mac 2>/dev/null ;; rt-n10-plus) - mac=$(ramips_get_mac_binary devconf 4) + mac=$(mtd_get_mac_binary devconf 4) ifconfig eth0 hw ether $mac 2>/dev/null ;; esac diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index b8b735fd6..5d24abcd5 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -3,43 +3,6 @@ # Copyright (C) 2010 OpenWrt.org # -ramips_get_mac_binary() -{ - local mtdname="$1" - local seek="$2" - local part - - . /lib/functions.sh - - part=$(find_mtd_part "$mtdname") - if [ -z "$part" ]; then - echo "ramips_get_mac_binary: partition $mtdname not found!" >&2 - return - fi - - dd bs=1 skip=$seek count=6 if=$part 2>/dev/null | /usr/sbin/maccalc bin2mac -} - -ramips_get_mac_nvram() -{ - local mtdname="$1" - local key="$2" - local part - local mac_dirty - - . /lib/functions.sh - - part=$(find_mtd_part "$mtdname") - if [ -z "$part" ]; then - echo "ramips_get_mac_nvram: partition $mtdname not found!" >&2 - return - fi - - mac_dirty=$(strings "$part" | sed -n 's/'"$key"'=//p') - # "canonicalize" mac - /usr/sbin/maccalc add "$mac_dirty" 0 -} - ramips_board_name() { local machine local name -- cgit v1.2.3 From 5ed3063be15e50fe2927210f749bdb71903b8be1 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 16 Feb 2013 11:50:25 +0000 Subject: ramips: use the new macaddr_* helpers instead of maccalc Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35615 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../ramips/base-files/etc/uci-defaults/02_network | 27 +++++++++------------- .../ramips/base-files/lib/preinit/06_set_iface_mac | 4 ++-- 2 files changed, 13 insertions(+), 18 deletions(-) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network index fafa7eaa3..5fb52bbaf 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/02_network +++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network @@ -4,11 +4,6 @@ . /lib/ramips.sh . /lib/functions/uci-defaults.sh -if [ ! -x /usr/sbin/maccalc ]; then - echo "$0: maccalc not found!" - return -fi - ramips_setup_rt3x5x_vlans() { if [ ! -x /sbin/swconfig ]; then @@ -165,31 +160,31 @@ ramips_setup_macs() sl-r7205 | \ wl-351) lan_mac=$(mtd_get_mac_binary factory 4) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) + wan_mac=$(macaddr_add "$lan_mac" 1) ;; w306r-v20) lan_mac=$(mtd_get_mac_binary factory 4) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 5) + wan_mac=$(macaddr_add "$lan_mac" 5) ;; rt-n13u | \ fonera20n) lan_mac=$(mtd_get_mac_binary factory 40) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) + wan_mac=$(macaddr_add "$lan_mac" 1) ;; dir-300-b1 |\ dir-300-b2 |\ dir-600-b1) lan_mac=$(mtd_get_mac_binary devdata 16388) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) + wan_mac=$(macaddr_add "$lan_mac" 1) ;; dir-620-a1) lan_mac=$(mtd_get_mac_binary factory 4) - lan_mac=$(maccalc or "$lan_mac" "02:00:00:00:00:00") - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) + lan_mac=$(macaddr_setbit_la "$lan_mac") + wan_mac=$(macaddr_add "$lan_mac" 1) ;; dir-645) @@ -200,7 +195,7 @@ ramips_setup_macs() esr-9753 | \ ur-336un) lan_mac=$(mtd_get_mac_binary devdata 16388) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) + wan_mac=$(macaddr_add "$lan_mac" 1) ;; nbg-419n | \ @@ -215,7 +210,7 @@ ramips_setup_macs() f5d8235-v2) lan_mac=$(mtd_get_mac_binary "u-boot" 262148) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) + wan_mac=$(macaddr_add "$lan_mac" 1) ;; rt-n56u) @@ -225,12 +220,12 @@ ramips_setup_macs() tew-691gr) lan_mac=$(mtd_get_mac_binary factory 40) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 3) + wan_mac=$(macaddr_add "$lan_mac" 3) ;; tew-692gr) lan_mac=$(mtd_get_mac_binary factory 40) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 4) + wan_mac=$(macaddr_add "$lan_mac" 4) ;; all0239-3g | \ @@ -242,7 +237,7 @@ ramips_setup_macs() wl341v3) lan_mac=$(mtd_get_mac_binary board-nvram 65440) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) + wan_mac=$(macaddr_add "$lan_mac" 1) ;; wli-tx4-ag300n) diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac index 6d3dd58c0..fcfb86bd5 100644 --- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac +++ b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac @@ -27,7 +27,7 @@ preinit_set_mac_address() { rt-n56u |\ sl-r7205) mac=$(mtd_get_mac_binary factory 4) - mac=$(maccalc or "$mac" "02:00:00:00:00:00") + mac=$(macaddr_setbit_la "$mac") ifconfig eth0 hw ether $mac 2>/dev/null ;; dir-300-b1 |\ @@ -38,7 +38,7 @@ preinit_set_mac_address() { ;; dir-645) mac=$(mtd_get_mac_ascii nvram lanmac) - mac=$(maccalc or "$mac" "02:00:00:00:00:00") + mac=$(macaddr_setbit_la "$mac") ifconfig eth0 hw ether $mac 2>/dev/null ;; dap-1350) -- cgit v1.2.3 From a0d6c55a7bd5694475d302260f308ef9e741d4c9 Mon Sep 17 00:00:00 2001 From: juhosg Date: Mon, 18 Feb 2013 09:56:29 +0000 Subject: ramips: migrate to common led helper functions [juhosg: migrate to status_led_blink_{preinit,failsafe} helpers] Signed-off-by: Michael Heimpold Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35652 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/etc/diag.sh | 32 ++++-------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index eaa28e190..102ff2731 100755 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -1,33 +1,9 @@ #!/bin/sh -# -# Copyright (C) 2010 OpenWrt.org -# -# +# Copyright (C) 2010-2013 OpenWrt.org +. /lib/functions/leds.sh . /lib/ramips.sh -status_led="" - -led_set_attr() { - [ -f "/sys/class/leds/$1/$2" ] && echo "$3" > "/sys/class/leds/$1/$2" -} - -status_led_set_timer() { - led_set_attr $status_led "trigger" "timer" - led_set_attr $status_led "delay_on" "$1" - led_set_attr $status_led "delay_off" "$2" -} - -status_led_on() { - led_set_attr $status_led "trigger" "none" - led_set_attr $status_led "brightness" 255 -} - -status_led_off() { - led_set_attr $status_led "trigger" "none" - led_set_attr $status_led "brightness" 0 -} - get_status_led() { case $(ramips_board_name) in 3g-6200n) @@ -150,10 +126,10 @@ set_state() { case "$1" in preinit) insmod leds-gpio - status_led_set_timer 200 200 + status_led_blink_preinit ;; failsafe) - status_led_set_timer 50 50 + status_led_blink_failsafe ;; done) status_led_on -- cgit v1.2.3 From 99a54982d2a2b41b7a28d7a0f0e1560d4c3167e8 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sun, 3 Mar 2013 12:46:08 +0000 Subject: ramips: fix whitespace in /lib/ramips.sh Signed-off-by: Daniel Golle Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35849 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/lib/ramips.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 5d24abcd5..8ca3bfbc5 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -70,9 +70,9 @@ ramips_board_name() { *"DIR-645") name="dir-645" ;; - *"DAP-1350") - name="dap-1350" - ;; + *"DAP-1350") + name="dap-1350" + ;; *"ESR-9753") name="esr-9753" ;; -- cgit v1.2.3 From 47a088f576d156961affb9e99564f6f7451f8a36 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sun, 3 Mar 2013 12:47:02 +0000 Subject: ramips: enhance user-space board detection Similar to ar71xx, detect only once and cache the strings in /tmp/sysinfo/model and /tmp/sysinfo/boardname. Signed-off-by: Daniel Golle Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35850 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../base-files/lib/preinit/03_preinit_do_ramips.sh | 2 ++ target/linux/ramips/base-files/lib/ramips.sh | 25 +++++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/lib/preinit/03_preinit_do_ramips.sh b/target/linux/ramips/base-files/lib/preinit/03_preinit_do_ramips.sh index e76418dad..31ef5f814 100644 --- a/target/linux/ramips/base-files/lib/preinit/03_preinit_do_ramips.sh +++ b/target/linux/ramips/base-files/lib/preinit/03_preinit_do_ramips.sh @@ -2,6 +2,8 @@ do_ramips() { . /lib/ramips.sh + + ramips_board_detect } boot_hook_add preinit_main do_ramips diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 8ca3bfbc5..4687856e6 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -1,9 +1,13 @@ #!/bin/sh # -# Copyright (C) 2010 OpenWrt.org +# Copyright (C) 2010-2013 OpenWrt.org # -ramips_board_name() { +RAMIPS_BOARD_NAME= +RAMIPS_MODEL= + + +ramips_board_detect() { local machine local name @@ -189,5 +193,20 @@ ramips_board_name() { ;; esac - echo $name + [ -z "$RAMIPS_BOARD_NAME" ] && RAMIPS_BOARD_NAME="$name" + [ -z "$RAMIPS_MODEL" ] && RAMIPS_MODEL="$machine" + + [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/" + + echo "$RAMIPS_BOARD_NAME" > /tmp/sysinfo/board_name + echo "$RAMIPS_MODEL" > /tmp/sysinfo/model +} + +ramips_board_name() { + local name + + [ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name) + [ -z "$name" ] && name="unknown" + + echo "$name" } -- cgit v1.2.3 From afbaa137be40d95e58cd069a513039b92fb55368 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sun, 3 Mar 2013 12:47:25 +0000 Subject: ramips: indicate support for ALL5003 add ALL5003 to board description in mach-all5002.c adapt detection in user-space accordingly (no functional changes) Signed-off-by: Daniel Golle Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35851 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/lib/ramips.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 4687856e6..4b3e362ac 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -32,7 +32,7 @@ ramips_board_detect() { *"Allnet ALL0256N") name="all0256n" ;; - *"Allnet ALL5002") + *"Allnet ALL5002/ALL5003") name="all5002" ;; *"ARC FreeStation5") -- cgit v1.2.3 From 6dac9240dc509b69363d2a050688764fd78b02aa Mon Sep 17 00:00:00 2001 From: juhosg Date: Sun, 3 Mar 2013 12:47:28 +0000 Subject: ramips: add user-space detection for ALL5002/ALL5003 Signed-off-by: Daniel Golle Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35852 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/lib/ramips.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 4b3e362ac..070214535 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -6,6 +6,19 @@ RAMIPS_BOARD_NAME= RAMIPS_MODEL= +all500x_board_detect() { + local systype + + systype=$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /system type/ {print $2}' /proc/cpuinfo) + case "$systype" in + *"RT5350"*) + RAMIPS_MODEL="Allnet ALL5003" + ;; + *"RT3352"*) + RAMIPS_MODEL="Allnet ALL5002" + ;; + esac +} ramips_board_detect() { local machine @@ -193,6 +206,12 @@ ramips_board_detect() { ;; esac + case "$machine" in + *"Allnet ALL5002/ALL5003") + all500x_board_detect + ;; + esac + [ -z "$RAMIPS_BOARD_NAME" ] && RAMIPS_BOARD_NAME="$name" [ -z "$RAMIPS_MODEL" ] && RAMIPS_MODEL="$machine" -- cgit v1.2.3 From e7da5b33d077d1d1aab7606ddd3e44bbab7ab25b Mon Sep 17 00:00:00 2001 From: juhosg Date: Mon, 11 Mar 2013 21:02:43 +0000 Subject: ramips: add user-space support for the Upvel UR-326N4G board MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [juhosg: fix mac address setup] Patch from: Дмитрий Лебедев Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35971 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/etc/diag.sh | 3 +++ .../ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom | 1 + target/linux/ramips/base-files/etc/uci-defaults/02_network | 8 ++++++++ target/linux/ramips/base-files/lib/ramips.sh | 3 +++ target/linux/ramips/base-files/lib/upgrade/platform.sh | 1 + 5 files changed, 16 insertions(+) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index 102ff2731..adb205b55 100755 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -111,6 +111,9 @@ get_status_led() { mzk-w300nh2) status_led="mzkw300nh2:green:power" ;; + ur-326n4g) + status_led="ur326:green:wps" + ;; ur-336un) status_led="ur336:green:wps" ;; diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index 43121e19b..40785287d 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -93,6 +93,7 @@ case "$FIRMWARE" in wr512-3gn | \ wr6202 | \ mzk-w300nh2 | \ + ur-326n4g | \ ur-336un | \ xdxrn502j) rt2x00_eeprom_extract "factory" 0 272 diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network index 5fb52bbaf..d6ab75afa 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/02_network +++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network @@ -77,6 +77,13 @@ ramips_setup_interfaces() f5d8235-v1 | \ f5d8235-v2 | \ + ur-326n4g) + ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" + ucidef_add_switch "switch0" "1" "1" + ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 6t" + ucidef_add_switch_vlan "switch0" "2" "0 6t" + ;; + ur-336un) ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ;; @@ -193,6 +200,7 @@ ramips_setup_macs() ;; esr-9753 | \ + ur-326n4g | \ ur-336un) lan_mac=$(mtd_get_mac_binary devdata 16388) wan_mac=$(macaddr_add "$lan_mac" 1) diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 070214535..6638b0a00 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -192,6 +192,9 @@ ramips_board_detect() { *"WR512-3GN-like router") name="wr512-3gn" ;; + *"UR-326N4G Wireless N router") + name="ur-326n4g" + ;; *"UR-336UN Wireless N router") name="ur-336un" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 1b358c12e..97cc382b3 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -58,6 +58,7 @@ platform_check_image() { wl-351 | \ wli-tx4-ag300n | \ whr-g300n |\ + ur-326n4g |\ ur-336un |\ wr512-3gn) [ "$magic" != "27051956" ] && { -- cgit v1.2.3 From dc1f7813bc9ea5a4e969e7334b955c44b14801b9 Mon Sep 17 00:00:00 2001 From: blogic Date: Tue, 12 Mar 2013 13:52:40 +0000 Subject: [ramips] make sure errors get sent to /dev/null Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35988 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/etc/diag.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index adb205b55..0c2ae83c7 100755 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -128,7 +128,7 @@ set_state() { case "$1" in preinit) - insmod leds-gpio + insmod leds-gpio 2> /dev/null status_led_blink_preinit ;; failsafe) -- cgit v1.2.3 From 29e45edaa5b47c520218d5be5f27dc2fe0d0776a Mon Sep 17 00:00:00 2001 From: blogic Date: Wed, 3 Apr 2013 09:59:59 +0000 Subject: [ramips] there is no ttyS1 console Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36171 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/etc/inittab | 1 - 1 file changed, 1 deletion(-) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/inittab b/target/linux/ramips/base-files/etc/inittab index 67c36a6a9..870b3cc76 100644 --- a/target/linux/ramips/base-files/etc/inittab +++ b/target/linux/ramips/base-files/etc/inittab @@ -1,4 +1,3 @@ ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K shutdown ttyS0::askfirst:/bin/ash --login -ttyS1::askfirst:/bin/ash --login -- cgit v1.2.3 From 08e872c86ad3e131cced9a4752e4a17d481b69e8 Mon Sep 17 00:00:00 2001 From: blogic Date: Wed, 3 Apr 2013 10:00:03 +0000 Subject: [ramips] add profile for the Edimax 3g-6200NL board MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit http://patchwork.openwrt.org/patch/3214/ Signed-off-by: Cédric Le Moing git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36172 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom | 1 + target/linux/ramips/base-files/etc/uci-defaults/01_leds | 3 +++ target/linux/ramips/base-files/etc/uci-defaults/02_network | 1 + target/linux/ramips/base-files/lib/preinit/06_set_iface_mac | 1 + target/linux/ramips/base-files/lib/ramips.sh | 3 +++ target/linux/ramips/base-files/lib/upgrade/platform.sh | 1 + 6 files changed, 10 insertions(+) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index 40785287d..de5a542f3 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -52,6 +52,7 @@ case "$FIRMWARE" in ;; 3g-6200n | \ + 3g-6200nl | \ 3g300m | \ air3gii | \ all0239-3g | \ diff --git a/target/linux/ramips/base-files/etc/uci-defaults/01_leds b/target/linux/ramips/base-files/etc/uci-defaults/01_leds index 104f201fb..65497266e 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/01_leds +++ b/target/linux/ramips/base-files/etc/uci-defaults/01_leds @@ -18,6 +18,9 @@ case $board in set_wifi_led "edimax:amber:wlan" set_usb_led "edimax:blue:3g" ;; + 3g-6200nl) + set_wifi_led "edimax:green:wlan" + ;; 3g300m) set_usb_led "tenda:blue:3g" ;; diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network index d6ab75afa..7d30f72f0 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/02_network +++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network @@ -46,6 +46,7 @@ ramips_setup_interfaces() ;; dir-615-h1 | \ + 3g-6200nl | \ wl-330n) ucidef_set_interface_lan "eth0.1" ;; diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac index fcfb86bd5..e860309ec 100644 --- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac +++ b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac @@ -10,6 +10,7 @@ preinit_set_mac_address() { case $(ramips_board_name) in 3g-6200n |\ + 3g-6200nl |\ 3g300m | \ mzk-w300nh2 |\ wl-330n |\ diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 6638b0a00..2a713f8c6 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -33,6 +33,9 @@ ramips_board_detect() { *"Edimax 3g-6200n") name="3g-6200n" ;; + *"Edimax 3g-6200nl") + name="3g-6200nl" + ;; *"AirLive Air3GII") name="air3gii" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 97cc382b3..a6f52cd14 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -15,6 +15,7 @@ platform_check_image() { case "$board" in 3g-6200n | \ + 3g-6200nl | \ 3g300m | \ air3gii | \ all0239-3g | \ -- cgit v1.2.3 From 47b76427f5da982d712c2550124b1721eb85ed97 Mon Sep 17 00:00:00 2001 From: blogic Date: Wed, 3 Apr 2013 10:00:08 +0000 Subject: [ramips] add Huawei D105 http://patchwork.openwrt.org/patch/3510/ Signed-off-by: Cezary Jackiewicz git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36173 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/etc/diag.sh | 3 +++ .../linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom | 1 + target/linux/ramips/base-files/etc/uci-defaults/01_leds | 4 ++++ target/linux/ramips/base-files/etc/uci-defaults/02_network | 2 ++ target/linux/ramips/base-files/lib/preinit/06_set_iface_mac | 1 + target/linux/ramips/base-files/lib/ramips.sh | 3 +++ target/linux/ramips/base-files/lib/upgrade/platform.sh | 1 + 7 files changed, 15 insertions(+) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index 0c2ae83c7..dbde1f777 100755 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -21,6 +21,9 @@ get_status_led() { br6425) status_led="edimax:green:power" ;; + d105) + status_led="d105:red:power" + ;; dir-300-b1 | dir-600-b1 | dir-600-b2 | dir-615-h1 | dir-615-d | dir-620-a1) status_led="d-link:green:status" ;; diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index de5a542f3..6dd36d740 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -64,6 +64,7 @@ case "$FIRMWARE" in broadway | \ br6524n | \ carambola | \ + d105 | \ dir-615-h1 | \ dir-620-a1 | \ esr-9753 | \ diff --git a/target/linux/ramips/base-files/etc/uci-defaults/01_leds b/target/linux/ramips/base-files/etc/uci-defaults/01_leds index 65497266e..bb8a5dcbd 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/01_leds +++ b/target/linux/ramips/base-files/etc/uci-defaults/01_leds @@ -48,6 +48,10 @@ case $board in br6524n) set_wifi_led "edimax:blue:wlan" ;; + d105) + ucidef_set_led_default "power" "POWER" "d105:red:power" "1" + set_usb_led "d105:green:usb" + ;; dir-300-b1|\ dir-600-b1|\ dir-600-b2|\ diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network index 7d30f72f0..d2400870c 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/02_network +++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network @@ -125,6 +125,7 @@ ramips_setup_interfaces() ucidef_set_interfaces_lan_wan "eth0.2" "eth0.1" ;; + d105 | \ omni-emb-hpm|\ wli-tx4-ag300n) ucidef_set_interface_lan "eth0" @@ -249,6 +250,7 @@ ramips_setup_macs() wan_mac=$(macaddr_add "$lan_mac" 1) ;; + d105 | \ wli-tx4-ag300n) lan_mac=$(mtd_get_mac_binary factory 4) ;; diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac index e860309ec..985d1bc8f 100644 --- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac +++ b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac @@ -20,6 +20,7 @@ preinit_set_mac_address() { ;; bc2 |\ broadway |\ + d105 |\ dir-620-a1 |\ esr-9753 |\ freestation5 |\ diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 2a713f8c6..4948e5b5c 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -105,6 +105,9 @@ ramips_board_detect() { *"Hauppauge Broadway") name="broadway" ;; + *"Huawei D105") + name="d105" + ;; *"La Fonera 2.0N") name="fonera20n" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index a6f52cd14..e2a55feab 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -24,6 +24,7 @@ platform_check_image() { bc2 | \ broadway | \ carambola | \ + d105 | \ dir-300-b1 | \ dir-600-b1 | \ dir-600-b2 | \ -- cgit v1.2.3 From 8d7aa0846cb129365246b428583e0edb99d160d7 Mon Sep 17 00:00:00 2001 From: blogic Date: Wed, 3 Apr 2013 10:00:21 +0000 Subject: [ramips] add profile for tenda w150m board http://patchwork.openwrt.org/patch/3371/ Signed-off-by: Chi Zhang git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36176 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/etc/diag.sh | 2 +- target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom | 1 + target/linux/ramips/base-files/etc/uci-defaults/02_network | 2 ++ target/linux/ramips/base-files/lib/preinit/06_set_iface_mac | 1 + target/linux/ramips/base-files/lib/ramips.sh | 3 +++ target/linux/ramips/base-files/lib/upgrade/platform.sh | 1 + 6 files changed, 9 insertions(+), 1 deletion(-) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index dbde1f777..866003c28 100755 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -9,7 +9,7 @@ get_status_led() { 3g-6200n) status_led="edimax:green:power" ;; - 3g300m) + 3g300m | w150m) status_led="tenda:blue:ap" ;; argus-atp52b) diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index 6dd36d740..b6490b5b5 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -85,6 +85,7 @@ case "$FIRMWARE" in v11st-fe | \ v22rw-2x2 | \ w306r-v20 | \ + w150m | \ w502u | \ wcr-150gn | \ whr-g300n | \ diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network index d2400870c..98aefbdf3 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/02_network +++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network @@ -38,6 +38,7 @@ ramips_setup_interfaces() case $board in 3g300m | \ + w150m | \ all0256n | \ all5002 | \ broadway) @@ -156,6 +157,7 @@ ramips_setup_macs() ;; 3g-6200n | \ 3g300m | \ + w150m | \ air3gii | \ argus-atp52b | \ bc2 | \ diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac index 985d1bc8f..7824e2b25 100644 --- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac +++ b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac @@ -12,6 +12,7 @@ preinit_set_mac_address() { 3g-6200n |\ 3g-6200nl |\ 3g300m | \ + w150m | \ mzk-w300nh2 |\ wl-330n |\ wl-330n3g) diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 4948e5b5c..c89dd469a 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -180,6 +180,9 @@ ramips_board_detect() { *"Tenda W306R V2.0") name="w306r-v20" ;; + *"Tenda W150M") + name="w150m" + ;; *"TEW-691GR") name="tew-691gr" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index e2a55feab..34d2c54c8 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -17,6 +17,7 @@ platform_check_image() { 3g-6200n | \ 3g-6200nl | \ 3g300m | \ + w150m | \ air3gii | \ all0239-3g | \ all0256n | \ -- cgit v1.2.3 From 2861cbfdf1d64082ac1c5213727ccb0b7f87919c Mon Sep 17 00:00:00 2001 From: blogic Date: Fri, 5 Apr 2013 23:37:45 +0000 Subject: [ramips] fix dir-615 h1 network config http://patchwork.openwrt.org/patch/3527/ Signed-off-by: Daniel Petre git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36213 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/etc/uci-defaults/02_network | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network index 98aefbdf3..9c1936e57 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/02_network +++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network @@ -46,7 +46,6 @@ ramips_setup_interfaces() ucidef_set_interface_lan "eth0" ;; - dir-615-h1 | \ 3g-6200nl | \ wl-330n) ucidef_set_interface_lan "eth0.1" @@ -70,6 +69,7 @@ ramips_setup_interfaces() ucidef_add_switch_vlan "switch0" "2" "0 6t" ;; + dir-615-h1 | \ mzk-w300nh2) ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_add_switch "switch0" "1" "1" -- cgit v1.2.3 From cb06f20d31cc8776aab0de950b89b77f50eef890 Mon Sep 17 00:00:00 2001 From: blogic Date: Tue, 9 Apr 2013 14:19:33 +0000 Subject: [ramips] Add Netgear WNCE2001 (OF version) Add Netgear WNCE2001. This is a small RT3052 device with 4MB spi flash and 32MB ram. 2 built-in antennas, 1x fastE, no USB, reset & wps switch. On my model the AP/RT switch is unpopulated, but I verified the gpio mapping for it. The stock firmware is running an unprotected tftpd which allows you to read any file from the filesystem. Serial port is present on testpads (See image on the wiki page). There are more testpads below the shield near the SoC, which may have JTAG. Slight annoyance: The bootloader is checksumming kernel&rootfs, but can be tricked by zeroing checksum and length fields in the checksum partition, see target/linux/ramips/base-files/lib/preinit/04_disable_wnce2001_flash_checksumming The manufacturer image is very similar to the DAP one, so I slightly modified mkdapimg to support generating it. The resulting openwrt-ramips-rt305x-wnce2001-squashfs-factory-(worldwide|northamerica).bin can be used to flash from stock to OpenWRT using the stock firmware upgrade function, without using the serial port. http://www.netgear.com/landing/wnce2001.aspx http://wiki.openwrt.org/toh/netgear/wnce2001 Signed-off-by: Tobias Diedrich git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36289 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/etc/diag.sh | 3 ++ .../etc/hotplug.d/firmware/10-rt2x00-eeprom | 1 + .../ramips/base-files/etc/uci-defaults/01_leds | 3 ++ .../ramips/base-files/etc/uci-defaults/02_network | 6 ++- .../preinit/04_disable_wnce2001_flash_checksumming | 43 ++++++++++++++++++++++ .../ramips/base-files/lib/preinit/06_set_iface_mac | 1 + target/linux/ramips/base-files/lib/ramips.sh | 3 ++ .../ramips/base-files/lib/upgrade/platform.sh | 1 + 8 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 target/linux/ramips/base-files/lib/preinit/04_disable_wnce2001_flash_checksumming (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index 866003c28..fe925c0f0 100755 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -111,6 +111,9 @@ get_status_led() { wr512-3gn) status_led="wr512:green:wps" ;; + wnce2001) + status_led="netgear:green:power" + ;; mzk-w300nh2) status_led="mzkw300nh2:green:power" ;; diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index b6490b5b5..5915a02ef 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -93,6 +93,7 @@ case "$FIRMWARE" in wl-330n3g | \ wl-351 | \ wli-tx4-ag300n | \ + wnce2001 | \ wr512-3gn | \ wr6202 | \ mzk-w300nh2 | \ diff --git a/target/linux/ramips/base-files/etc/uci-defaults/01_leds b/target/linux/ramips/base-files/etc/uci-defaults/01_leds index bb8a5dcbd..cd17d7fa3 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/01_leds +++ b/target/linux/ramips/base-files/etc/uci-defaults/01_leds @@ -112,6 +112,9 @@ case $board in wcr-150gn) set_usb_led "wcr150gn:amber:user" ;; + wnce2001) + set_wifi_led "netgear:green:wlan" + ;; esac ucidef_commit_leds diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network index 9c1936e57..e28f2b546 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/02_network +++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network @@ -41,7 +41,8 @@ ramips_setup_interfaces() w150m | \ all0256n | \ all5002 | \ - broadway) + broadway | \ + wnce2001) ucidef_add_switch "switch0" "1" "0" ucidef_set_interface_lan "eth0" ;; @@ -242,7 +243,8 @@ ramips_setup_macs() all0239-3g | \ carambola | \ - w502u) + w502u | \ + wnce2001) lan_mac=$(mtd_get_mac_binary factory 40) wan_mac=$(mtd_get_mac_binary factory 46) ;; diff --git a/target/linux/ramips/base-files/lib/preinit/04_disable_wnce2001_flash_checksumming b/target/linux/ramips/base-files/lib/preinit/04_disable_wnce2001_flash_checksumming new file mode 100644 index 000000000..67a1746f1 --- /dev/null +++ b/target/linux/ramips/base-files/lib/preinit/04_disable_wnce2001_flash_checksumming @@ -0,0 +1,43 @@ +#!/bin/sh + +# Netgear WNCE2001 has does a checksum check on boot and goes into recovery +# tftp mode when the check fails. Initializing the JFFS2 partition triggers +# this, so we make sure to zero checksum and size to be checksummed before +# that happens, so this needs to run very early during boot. + +do_wnce2001_checksumming_disable() { + . /lib/ramips.sh + + local board=$(ramips_board_name) + + case "$board" in + wnce2001) + echo "Board is WNCE2001, updating checksum partition..." + local zeroes=/dev/zero + local tmpfile=/tmp/wnce2001_checksum + local partname=checksum + local mtd=$(find_mtd_part $partname) + dd if=$mtd of=$tmpfile bs=80 count=1 2>/dev/null + signature=$(dd if=$tmpfile bs=1 skip=24 count=20 2>/dev/null) + checksum=$(dd if=$tmpfile bs=1 count=4 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"') + if [ "$signature" != "RT3052-AP-WNCE2001-3" ]; then + echo "Signature of checksum partition is wrong, bailing." + return 0 + fi + if [ "$checksum" != "00000000" ]; then + echo "Checksum is set, zeroing." + # zero out checksum + dd if=$zeroes of=$tmpfile conv=notrunc bs=1 seek=0 count=4 2>/dev/null + # zero out bytecount to be checksummed + dd if=$zeroes of=$tmpfile conv=notrunc bs=1 seek=60 count=4 2>/dev/null + mtd write $tmpfile $partname + else + echo "Checksum is already zero, nothing to do." + fi + ;; + esac + + return 0 +} + +boot_hook_add preinit_main do_wnce2001_checksumming_disable diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac index 7824e2b25..52bf115cc 100644 --- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac +++ b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac @@ -64,6 +64,7 @@ preinit_set_mac_address() { w306r-v20 |\ w502u |\ wr6202 |\ + wnce2001 |\ xdxrn502j) mac=$(mtd_get_mac_binary factory 40) ifconfig eth0 hw ether $mac 2>/dev/null diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index c89dd469a..37b477a06 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -120,6 +120,9 @@ ramips_board_detect() { *"NBG-419N") name="nbg-419n" ;; + *"Netgear WNCE2001") + name="wnce2001" + ;; *"NexAira BC2") name="bc2" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 34d2c54c8..ef150445b 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -59,6 +59,7 @@ platform_check_image() { wl341v3 | \ wl-330n | \ wl-351 | \ + wnce2001 | \ wli-tx4-ag300n | \ whr-g300n |\ ur-326n4g |\ -- cgit v1.2.3 From c3b0a9a70eec323cc5bfecbf7ba9e46b2ee7920d Mon Sep 17 00:00:00 2001 From: blogic Date: Thu, 25 Apr 2013 19:02:48 +0000 Subject: ramips: Add support of D-link DIR-620D1 Signed-off-by: Serge Vasilugin Acked-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36432 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/etc/diag.sh | 2 +- target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom | 1 + target/linux/ramips/base-files/etc/uci-defaults/01_leds | 3 +++ target/linux/ramips/base-files/etc/uci-defaults/02_network | 1 + target/linux/ramips/base-files/lib/preinit/06_set_iface_mac | 1 + target/linux/ramips/base-files/lib/ramips.sh | 3 +++ target/linux/ramips/base-files/lib/upgrade/platform.sh | 1 + 7 files changed, 11 insertions(+), 1 deletion(-) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index fe925c0f0..a82e1ce34 100755 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -24,7 +24,7 @@ get_status_led() { d105) status_led="d105:red:power" ;; - dir-300-b1 | dir-600-b1 | dir-600-b2 | dir-615-h1 | dir-615-d | dir-620-a1) + dir-300-b1 | dir-600-b1 | dir-600-b2 | dir-615-h1 | dir-615-d | dir-620-a1| dir-620-d1) status_led="d-link:green:status" ;; dir-645) diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index 5915a02ef..5cd931320 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -67,6 +67,7 @@ case "$FIRMWARE" in d105 | \ dir-615-h1 | \ dir-620-a1 | \ + dir-620-d1 | \ esr-9753 | \ fonera20n | \ rt-n13u | \ diff --git a/target/linux/ramips/base-files/etc/uci-defaults/01_leds b/target/linux/ramips/base-files/etc/uci-defaults/01_leds index cd17d7fa3..cfe5c621c 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/01_leds +++ b/target/linux/ramips/base-files/etc/uci-defaults/01_leds @@ -65,6 +65,9 @@ case $board in ucidef_set_led_default "status" "Status LED (amber)" "d-link:amber:status" "0" set_wifi_led "rt2800pci-phy0::radio" ;; + dir-620-d1) + set_wifi_led "d-link:green:wifi" + ;; esr-9753) set_wifi_led "rt2800pci-phy0::radio" ;; diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network index e28f2b546..49c4f7f33 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/02_network +++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network @@ -164,6 +164,7 @@ ramips_setup_macs() bc2 | \ br6425 | \ broadway | \ + dir-620-d1 | \ f5d8235-v1 | \ mzk-w300nh2 | \ nw718 | \ diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac index 52bf115cc..d0309fd6e 100644 --- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac +++ b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac @@ -12,6 +12,7 @@ preinit_set_mac_address() { 3g-6200n |\ 3g-6200nl |\ 3g300m | \ + dir-620-d1 |\ w150m | \ mzk-w300nh2 |\ wl-330n |\ diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 37b477a06..24823f6c0 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -81,6 +81,9 @@ ramips_board_detect() { *"DIR-620 A1") name="dir-620-a1" ;; + *"DIR-620 D1") + name="dir-620-d1" + ;; *"DIR-615 H1") name="dir-615-h1" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index ef150445b..895455971 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -32,6 +32,7 @@ platform_check_image() { dir-615-h1 | \ dir-615-d | \ dir-620-a1 | \ + dir-620-d1 | \ dap-1350 | \ esr-9753 | \ fonera20n | \ -- cgit v1.2.3 From 6c0f28a0d8f1bfdafa5a05cba6dfa870ef2f7850 Mon Sep 17 00:00:00 2001 From: blogic Date: Thu, 25 Apr 2013 19:02:53 +0000 Subject: ramips: Add Alpha ASL-26555 support. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This board uses a TrendChip SOC with its own RAM/Flash for ADSL support. We know both SOCs are connected through ethernet and use some kind of protocol for UART communication, but due to the lack of GPL sources we couldn't get it to work. For this reason the network is configured only for LAN. There are two versions (Chile 8MB and Spain 16MB). Wiki: http://wiki.openwrt.org/toh/alpha/asl26555 Signed-off-by: Esteban Benito Signed-off-by: Álvaro Fernández Rojas Patchwork: http://patchwork.openwrt.org/patch/3571/ Acked-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36433 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/etc/diag.sh | 3 +++ .../ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom | 1 + target/linux/ramips/base-files/etc/uci-defaults/01_leds | 6 ++++++ target/linux/ramips/base-files/etc/uci-defaults/02_network | 10 ++++++++++ target/linux/ramips/base-files/lib/preinit/06_set_iface_mac | 1 + target/linux/ramips/base-files/lib/ramips.sh | 3 +++ target/linux/ramips/base-files/lib/upgrade/platform.sh | 1 + 7 files changed, 25 insertions(+) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index a82e1ce34..1970ae0bc 100755 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -15,6 +15,9 @@ get_status_led() { argus-atp52b) status_led="argus-atp52b:green:run" ;; + asl26555) + status_led="asl26555:green:power" + ;; br6524n) status_led="edimax:blue:power" ;; diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index 5cd931320..538047b42 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -30,6 +30,7 @@ board=$(ramips_board_name) case "$FIRMWARE" in "soc_wmac.eeprom") case $board in + asl26555 | \ dir-300-b1 | \ dir-600-b1 | \ dir-600-b2 | \ diff --git a/target/linux/ramips/base-files/etc/uci-defaults/01_leds b/target/linux/ramips/base-files/etc/uci-defaults/01_leds index cfe5c621c..ec031883e 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/01_leds +++ b/target/linux/ramips/base-files/etc/uci-defaults/01_leds @@ -35,6 +35,12 @@ case $board in ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "all0256n:green:rssihigh" "wlan0" "70" "100" "-69" "8" set_wifi_led "rt2800pci-phy0::radio" ;; + asl26555) + ucidef_set_led_default "power" "POWER" "asl26555:green:power" "1" + ucidef_set_led_netdev "eth" "ETH" "asl26555:green:eth" "eth0" + set_wifi_led "asl26555:green:wlan" + set_usb_led "asl26555:green:3g" + ;; bc2) set_usb_led "bc2:blue:usb" ;; diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network index 49c4f7f33..b3d87d288 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/02_network +++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network @@ -63,6 +63,12 @@ ramips_setup_interfaces() ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ;; + asl26555) + ucidef_set_interface_lan "eth0.1" + ucidef_add_switch "switch0" "1" "1" + ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 6t" + ;; + dir-645) ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_add_switch "switch0" "1" "1" @@ -176,6 +182,10 @@ ramips_setup_macs() wan_mac=$(macaddr_add "$lan_mac" 1) ;; + asl26555) + lan_mac=$(mtd_get_mac_binary devdata 16388) + ;; + w306r-v20) lan_mac=$(mtd_get_mac_binary factory 4) wan_mac=$(macaddr_add "$lan_mac" 5) diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac index d0309fd6e..7becaf7ad 100644 --- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac +++ b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac @@ -34,6 +34,7 @@ preinit_set_mac_address() { mac=$(macaddr_setbit_la "$mac") ifconfig eth0 hw ether $mac 2>/dev/null ;; + asl26555 |\ dir-300-b1 |\ dir-300-b2 |\ dir-600-b1) diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 24823f6c0..c1355bcad 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -66,6 +66,9 @@ ramips_board_detect() { *"Asus WL-330N3G") name="wl-330n3g" ;; + *"Alpha ASL26555") + name="asl26555" + ;; *"Aztech HW550-3G") name="hw550-3g" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 895455971..15c0007a0 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -22,6 +22,7 @@ platform_check_image() { all0239-3g | \ all0256n | \ all5002 | \ + asl26555 | \ bc2 | \ broadway | \ carambola | \ -- cgit v1.2.3 From de57f725333379193889e88ed7442f880d87f50c Mon Sep 17 00:00:00 2001 From: blogic Date: Thu, 25 Apr 2013 19:02:57 +0000 Subject: ramips: set preinit interface to eth0 by default. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes any ramips device accessible via ethernet in failsafe mode. Based on: https://dev.openwrt.org/changeset/36322 Signed-off-by: Álvaro Fernández Rojas Patchwork: http://patchwork.openwrt.org/patch/3567/ Acked-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36434 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../base-files/lib/preinit/07_set_preinit_iface_ramips | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 target/linux/ramips/base-files/lib/preinit/07_set_preinit_iface_ramips (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/lib/preinit/07_set_preinit_iface_ramips b/target/linux/ramips/base-files/lib/preinit/07_set_preinit_iface_ramips new file mode 100644 index 000000000..c8b7f2ad3 --- /dev/null +++ b/target/linux/ramips/base-files/lib/preinit/07_set_preinit_iface_ramips @@ -0,0 +1,12 @@ +#!/bin/sh +# +# Copyright (C) 2013 OpenWrt.org +# + +. /lib/ramips.sh + +ramips_set_preinit_iface() { + ifname=eth0 +} + +boot_hook_add preinit_main ramips_set_preinit_iface -- cgit v1.2.3 From ef18e846dcfb55f39794bc510da4f85da85d5452 Mon Sep 17 00:00:00 2001 From: blogic Date: Thu, 25 Apr 2013 19:03:01 +0000 Subject: ramips: introduce DTS for ALL5003 Prior to the switch to 3.8, ALL5002 and ALL5003 boards shared mach-all5002.c. With the change to DTS, this is no longer accurate, as ALL5002 is based on Rt3352 SoC while ALL5003 is based on Rt5350 SoC, therefore the corresponding rt5350.dtsi need to be included for ALL5003. Signed-off-by: Daniel Golle Patchwork: http://patchwork.openwrt.org/patch/3557/ Acked-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36435 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom | 1 + target/linux/ramips/base-files/etc/uci-defaults/02_network | 1 + target/linux/ramips/base-files/lib/preinit/06_set_iface_mac | 1 + target/linux/ramips/base-files/lib/ramips.sh | 9 ++++++--- target/linux/ramips/base-files/lib/upgrade/platform.sh | 1 + 5 files changed, 10 insertions(+), 3 deletions(-) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index 538047b42..320e01d90 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -59,6 +59,7 @@ case "$FIRMWARE" in all0239-3g | \ all0256n | \ all5002 | \ + all5003 | \ argus-atp52b | \ bc2 | \ br6425 | \ diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network index b3d87d288..41907bf1d 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/02_network +++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network @@ -41,6 +41,7 @@ ramips_setup_interfaces() w150m | \ all0256n | \ all5002 | \ + all5003 | \ broadway | \ wnce2001) ucidef_add_switch "switch0" "1" "0" diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac index 7becaf7ad..022f72e24 100644 --- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac +++ b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac @@ -53,6 +53,7 @@ preinit_set_mac_address() { all0239-3g |\ all0256n |\ all5002 |\ + all5003 |\ carambola |\ dir-615-h1 |\ fonera20n |\ diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index c1355bcad..99bdbdd80 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -48,9 +48,12 @@ ramips_board_detect() { *"Allnet ALL0256N") name="all0256n" ;; - *"Allnet ALL5002/ALL5003") + *"Allnet ALL5002") name="all5002" ;; + *"Allnet ALL5003") + name="all5003" + ;; *"ARC FreeStation5") name="freestation5" ;; @@ -212,7 +215,7 @@ ramips_board_detect() { ;; *"UR-326N4G Wireless N router") name="ur-326n4g" - ;; + ;; *"UR-336UN Wireless N router") name="ur-336un" ;; @@ -228,7 +231,7 @@ ramips_board_detect() { esac case "$machine" in - *"Allnet ALL5002/ALL5003") + *"Allnet ALL500"[23]*) all500x_board_detect ;; esac diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 15c0007a0..b2fa0bd95 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -22,6 +22,7 @@ platform_check_image() { all0239-3g | \ all0256n | \ all5002 | \ + all5003 | \ asl26555 | \ bc2 | \ broadway | \ -- cgit v1.2.3 From dc339f1a1a6b61a24fcd58eb942f418cde9e699c Mon Sep 17 00:00:00 2001 From: blogic Date: Thu, 25 Apr 2013 19:03:05 +0000 Subject: ramips: remove now unneeded user-space board detection Now that ALL5002 and ALL5003 each got their own DTS and board names, remove the now no longer needed user-space part which previously differentiated between ALL5002 and ALL5003. Signed-off-by: Daniel Golle Patchwork: http://patchwork.openwrt.org/patch/3558/ Acked-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36436 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/lib/ramips.sh | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 99bdbdd80..63af00d03 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -6,20 +6,6 @@ RAMIPS_BOARD_NAME= RAMIPS_MODEL= -all500x_board_detect() { - local systype - - systype=$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /system type/ {print $2}' /proc/cpuinfo) - case "$systype" in - *"RT5350"*) - RAMIPS_MODEL="Allnet ALL5003" - ;; - *"RT3352"*) - RAMIPS_MODEL="Allnet ALL5002" - ;; - esac -} - ramips_board_detect() { local machine local name @@ -230,12 +216,6 @@ ramips_board_detect() { ;; esac - case "$machine" in - *"Allnet ALL500"[23]*) - all500x_board_detect - ;; - esac - [ -z "$RAMIPS_BOARD_NAME" ] && RAMIPS_BOARD_NAME="$name" [ -z "$RAMIPS_MODEL" ] && RAMIPS_MODEL="$machine" -- cgit v1.2.3 From 879ea89c252b59a44a6abe06cb8695a0695d676f Mon Sep 17 00:00:00 2001 From: blogic Date: Mon, 6 May 2013 16:45:35 +0000 Subject: ramips: Update ARC Freestation profile These devices are actually built around the 8devices Carambola dev board. ARC FreeStation, Flex mARC, iFlex, and SplitStation devices are supported with this image, see "ARCFlex Firmware Downloads": http://www.antennas.com/wiki/index.php?title=ARC-OS_Firmware_Downloads_and_Revision_History Funnily enough if present the external USB wlan ends up being wlan-0, with the SoC device being wlan-1. - Invert port map so special handling of vlan config can be removed. - Add LED config similar to original ArcOS firmware. - Add GPIO export for enabling PoE passthrough from ethernet port 0 to port 1 - Get MACs from factory partition. - Update description to list supported devices. - Carambola uses RT3050 (not RT3052), though my Carambola CPU actually reports itself as being an RT3350 while still having RT3050F markings. Signed-off-by: Tobias Diedrich git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36564 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/etc/uci-defaults/02_network | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network index 41907bf1d..fe81899e7 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/02_network +++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network @@ -129,7 +129,6 @@ ramips_setup_interfaces() ucidef_add_switch_vlan "switch0" "2" "0t 5" ;; - freestation5 | \ wcr-150gn) ucidef_set_interfaces_lan_wan "eth0.2" "eth0.1" ;; @@ -255,6 +254,7 @@ ramips_setup_macs() all0239-3g | \ carambola | \ + freestation5 | \ w502u | \ wnce2001) lan_mac=$(mtd_get_mac_binary factory 40) -- cgit v1.2.3