[OpenWrt-Devel] Where can I found the autossh package for barrier breaker(14.7)

2014-09-02 Thread John Xu
Hi,

I upgrade my MW4530R from AA to BB, but I cannot found the autossh
package any more, I first run following command to update the package list

root@OpenWrt:~# opkg update
Downloading
http://downloads.openwrt.org/snapshots/trunk/ar71xx/packages/base/Packages.gz.
Updated list of available packages in /var/opkg-lists/chaos_calmer_base.
Downloading
http://downloads.openwrt.org/snapshots/trunk/ar71xx/packages/luci/Packages.gz.
Updated list of available packages in /var/opkg-lists/chaos_calmer_luci.
Downloading
http://downloads.openwrt.org/snapshots/trunk/ar71xx/packages/management/Packages.gz.
Updated list of available packages in
/var/opkg-lists/chaos_calmer_management.
Downloading
http://downloads.openwrt.org/snapshots/trunk/ar71xx/packages/packages/Packages.gz.
Updated list of available packages in /var/opkg-lists/chaos_calmer_packages.
Downloading
http://downloads.openwrt.org/snapshots/trunk/ar71xx/packages/routing/Packages.gz.
Updated list of available packages in /var/opkg-lists/chaos_calmer_routing.
Downloading
http://downloads.openwrt.org/snapshots/trunk/ar71xx/packages/telephony/Packages.gz.
Updated list of available packages in
/var/opkg-lists/chaos_calmer_telephony.

After then I try to install it with

root@OpenWrt:~# opkg install autossh
Unknown package 'autossh'.
Collected errors:
* opkg_install_cmd: Cannot install package autossh.


Then I try to search in the
http://downloads.openwrt.org/snapshots/trunk/ar71xx/packages/packages/
http://downloads.openwrt.org/snapshots/trunk/ar71xx/packages/ and
http://downloads.openwrt.org/snapshots/trunk/ar71xx/packages/base/
http://downloads.openwrt.org/snapshots/trunk/ar71xx/packages/, but I
still cannot found it.

If this package not supported by BB, can anyone told me where I can got
a replacement software?

Thanks,
John

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [Bug: Busybox 1.22.1] false return 0 instead of 1 with '--help' switch.

2014-09-02 Thread Alive4Ever
On Friday, August 29, 2014 02:08:56 PM Bastian Bittorf wrote:
 * Alive4ever alive4e...@live.com [29.08.2014 14:03]:
  I'm using an embedded system with busybox v1.22.1, running Openwrt Chaos 
  Chalmer r42321, mips24k AR9330
  
  When I call 'busybox false --help', the return status is zero. I think it 
  has nothing todo with openwrt, because it's the output of busybox, not the 
  problem on openwrt performance. I feel it's strange, because GNU coreutils 
  false binary gives return status 1, even when invoked with '--help' switch. 
  I also notice that Ubuntu busybox false, which is version 1.21.1 performs 
  the same behaviour as GNU coreutils.
  
 
 i cannot see a bug here on OpenWrt:
 
 root@box:~ busybox false --help
 BusyBox v1.22.1 (2014-08-28 18:55:30 EDT) multi-call binary.
 
 Usage: false 
 
 Return an exit code of FALSE (1)
 
 root@box:~ echo $?
 0
 root@box:~ false --help
 root@box:~ echo $?
 1
 root@box:~ false bla
 root@box:~ echo $?
 1
 
 bye, bastian

Hi bastian,
If you are just typing false on openwrt shell, it uses false in the 
built in shell.

root@OpenWrt:~# type false
false is a shell builtin
root@OpenWrt:~# false --help
root@OpenWrt:~# echo $?
1
root@OpenWrt:~#

There is no problem with ash built in false. The problem is busybox 
false applet.
To invoke busybox false, either call '/bin/false' or '/bin/busybox false'

root@OpenWrt:~# /bin/false --help ; echo $?
BusyBox v1.22.1 (2014-08-28 15:20:07 WIB) multi-call binary.

Usage: false 

Return an exit code of FALSE (1)

0

root@OpenWrt:~# busybox false --help ; echo $?
BusyBox v1.22.1 (2014-08-28 15:20:07 WIB) multi-call binary.

Usage: false 

Return an exit code of FALSE (1)

0

That's the unexpected behavior from busybox false applet.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] build failure for Asus WL-500GP

2014-09-02 Thread Bas Mevissen
On 08/28/2014 12:10 PM, Peter Münster wrote:
 Hi,
 
 With latest git version, there is a build failure:
 
 --8---cut here---start-8---
 find 
 /home/peter/soft/wl-500gp/build_dir/target-mipsel_mips32_uClibc-0.9.33.2/linux-brcm47xx_generic/linux-3.14.16
  
 /home/peter/soft/wl-500gp/staging_dir/target-mipsel_mips32_uClibc-0.9.33.2/root-brcm47xx/lib/modules
  -name \*.ko | xargs mipsel-openwrt-linux-uclibc-nm | awk '$1 == U { print 
 $2 } ' | sort -u  
 /home/peter/soft/wl-500gp/build_dir/target-mipsel_mips32_uClibc-0.9.33.2/linux-brcm47xx_generic/mod_symtab.txt
 mipsel-openwrt-linux-uclibc-nm -n 
 /home/peter/soft/wl-500gp/build_dir/target-mipsel_mips32_uClibc-0.9.33.2/linux-brcm47xx_generic/linux-3.14.16/vmlinux.o
  | grep -F ' r __ksymtab' | sed -e 's, r __ksymtab_,,'  
 /home/peter/soft/wl-500gp/build_dir/target-mipsel_mips32_uClibc-0.9.33.2/linux-brcm47xx_generic/kernel_symtab.txt
 grep -Ff 
 /home/peter/soft/wl-500gp/build_dir/target-mipsel_mips32_uClibc-0.9.33.2/linux-brcm47xx_generic/mod_symtab.txt
  
 /home/peter/soft/wl-500gp/build_dir/target-mipsel_mips32_uClibc-0.9.33.2/linux-brcm47xx_generic/kernel_symtab.txt
   
 /home/peter/soft/wl-500gp/build_dir/target-mipsel_mips32_uClibc-0.9.33.2/linux-brcm47xx_generic/sym_include.txt
 make[4]: *** 
 [/home/peter/soft/wl-500gp/build_dir/target-mipsel_mips32_uClibc-0.9.33.2/linux-brcm47xx_generic/symtab.h]
  Error 1
 make[4]: Leaving directory `/home/peter/soft/wl-500gp/target/linux/brcm47xx'
 make[3]: *** [install] Error 2
 make[3]: Leaving directory `/home/peter/soft/wl-500gp/target/linux'
 make[2]: *** [target/linux/install] Error 2
 make[2]: Leaving directory `/home/peter/soft/wl-500gp'
 make[1]: *** 
 [/home/peter/soft/wl-500gp/staging_dir/target-mipsel_mips32_uClibc-0.9.33.2/stamp/.target_install]
  Error 2
 make[1]: Leaving directory `/home/peter/soft/wl-500gp'
 make: *** [world] Error 2
 --8---cut here---end---8---
 
 linux-brcm47xx_generic/kernel_symtab.txt is empty.
 

Hi Peter,

Tried newly checked out tree (SVN r42398) with the default config for
WL500GPv1. Don't suspect any difference between SVN and GIT trees.

 make[2] package/install
 make[3] package/preconfig
 make[2] target/install
 make[3] -C target/linux install
 make[6] -C target/linux/brcm47xx/image/lzma-loader clean install
 make[2] package/index

real20m18.881s
user39m8.944s
sys 4m19.241s

Seems to build fine. Nightlies on openwrt.org
(https://downloads.openwrt.org/snapshots/trunk) are fine too. So I
suspect the problem to be on your side. Maybe clean your tree or start
all over (saving your changes and .config o/c)

Bas.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH] hostapd: add ubus bindings for wps

2014-09-02 Thread Petar Koretic
With this patch WPS discovery can be started or canceled over ubus if
WPS is enabled in wireless configuration. This is equivalent of
'hostapd_cli wps_pbc' and 'hostapd_cli wps_cancel' commands.

Signed-off-by: Petar Koretic petar.kore...@sartura.hr
---
 .../hostapd/patches/600-ubus_support.patch | 41 --
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/package/network/services/hostapd/patches/600-ubus_support.patch 
b/package/network/services/hostapd/patches/600-ubus_support.patch
index 96a91db..e57c01f 100644
--- a/package/network/services/hostapd/patches/600-ubus_support.patch
+++ b/package/network/services/hostapd/patches/600-ubus_support.patch
@@ -41,7 +41,7 @@
HAPD_IFACE_DISABLED,
 --- /dev/null
 +++ b/src/ap/ubus.c
-@@ -0,0 +1,373 @@
+@@ -0,0 +1,408 @@
 +/*
 + * hostapd / ubus support
 + * Copyright (c) 2013, Felix Fietkau n...@openwrt.org
@@ -55,6 +55,7 @@
 +#include utils/eloop.h
 +#include common/ieee802_11_defs.h
 +#include hostapd.h
++#include wps_hostapd.h
 +#include sta_info.h
 +#include ubus.h
 +
@@ -304,10 +305,44 @@
 +  return 0;
 +}
 +
++static int
++hostapd_bss_wps_start(struct ubus_context *ctx, struct ubus_object *obj,
++  struct ubus_request_data *req, const char *method,
++  struct blob_attr *msg)
++{
++  int rc;
++  struct hostapd_data *hapd = container_of(obj, struct hostapd_data, 
ubus.obj);
++
++  rc = hostapd_wps_button_pushed(hapd, NULL);
++
++  if (rc != 0)
++  return UBUS_STATUS_NOT_SUPPORTED;
++
++  return 0;
++}
++
++static int
++hostapd_bss_wps_cancel(struct ubus_context *ctx, struct ubus_object *obj,
++  struct ubus_request_data *req, const char *method,
++  struct blob_attr *msg)
++{
++  int rc;
++  struct hostapd_data *hapd = container_of(obj, struct hostapd_data, 
ubus.obj);
++
++  rc = hostapd_wps_cancel(hapd);
++
++  if (rc != 0)
++  return UBUS_STATUS_NOT_SUPPORTED;
++
++  return 0;
++}
++
 +static const struct ubus_method bss_methods[] = {
 +  UBUS_METHOD_NOARG(get_clients, hostapd_bss_get_clients),
 +  UBUS_METHOD(del_client, hostapd_bss_del_client, del_policy),
 +  UBUS_METHOD_NOARG(list_bans, hostapd_bss_list_bans),
++  UBUS_METHOD_NOARG(wps_start, hostapd_bss_wps_start),
++  UBUS_METHOD_NOARG(wps_cancel, hostapd_bss_wps_cancel),
 +};
 +
 +static struct ubus_object_type bss_object_type =
@@ -612,7 +647,7 @@
sta-capability = capab_info;
sta-listen_interval = listen_interval;
  
-@@ -1765,7 +1791,7 @@ int ieee802_11_mgmt(struct hostapd_data 
+@@ -1765,7 +1791,7 @@ int ieee802_11_mgmt(struct hostapd_data
  
  
if (stype == WLAN_FC_STYPE_PROBE_REQ) {
@@ -621,7 +656,7 @@
return 1;
}
  
-@@ -1780,17 +1806,17 @@ int ieee802_11_mgmt(struct hostapd_data 
+@@ -1780,17 +1806,17 @@ int ieee802_11_mgmt(struct hostapd_data
switch (stype) {
case WLAN_FC_STYPE_AUTH:
wpa_printf(MSG_DEBUG, mgmt::auth);
-- 
2.1.0
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] Missing packages from packages feed on GitHub repository

2014-09-02 Thread Federico Di Marco
Hi,

I have noticed that the GITHUB repository of package feed (
https://github.com/openwrt/packages ) some packages which had already
been ported to Openwrt are missing (e.g. libs/neon, net/lftp,
net/sshfs, etc.) and instead they are present in the SVN repository (
https://dev.openwrt.org/browser/packages ). Can anybody explain me why
? I would like to add Davfs2 to github, yet I can't due to missing
neon library.

Federico
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH v2] iwinfo: handle 802.11ac mode for lua

2014-09-02 Thread Bartosz Markowski
Signed-off-by: Bartosz Markowski bartosz.markow...@tieto.com
---
 package/network/utils/iwinfo/src/iwinfo_lua.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/network/utils/iwinfo/src/iwinfo_lua.c 
b/package/network/utils/iwinfo/src/iwinfo_lua.c
index 9b7d655..b5842b2 100644
--- a/package/network/utils/iwinfo/src/iwinfo_lua.c
+++ b/package/network/utils/iwinfo/src/iwinfo_lua.c
@@ -499,6 +499,9 @@ static int iwinfo_L_hwmodelist(lua_State *L, int 
(*func)(const char *, int *))
lua_pushboolean(L, hwmodes  IWINFO_80211_N);
lua_setfield(L, -2, n);
 
+   lua_pushboolean(L, hwmodes  IWINFO_80211_AC);
+   lua_setfield(L, -2, ac);
+
return 1;
}
 
-- 
1.8.2
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH v2] luci: initial luCI 802.11ac support

2014-09-02 Thread Bartosz Markowski
While working with 802.11ac (ath10k) I've noticed the web interface
configuration missing basic support for 11ac devices - unable to set VHT
(htmode) and 11ac (hwmode).

This patch adds initial support for luci admin-full page and 802.11ac
MAC80211 devices.

v2:
* replace obsolete 11nac mode with 11a + vhtmode (jow in ticket: #17323)

Signed-off-by: Bartosz Markowski bartosz.markow...@tieto.com
---
 modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua| 11 ++-
 .../admin-full/luasrc/view/admin_network/wifi_overview.htm|  1 +
 modules/base/luasrc/model/network.lua |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua 
b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
index 5a5efa9..7cdfb70 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -192,7 +192,16 @@ if hwtype == mac80211 then
 
mode = s:taboption(advanced, ListValue, hwmode, translate(Band))
 
-   if hw_modes.n then
+   if hw_modes.ac then
+   if hw_modes.ac then mode:value(11a, 5GHz (802.11n+ac)) end
+
+   htmode = s:taboption(advanced, ListValue, htmode, 
translate(VHT mode (802.11ac)))
+   htmode:value(, translate(disabled))
+   htmode:value(VHT20, 20MHz)
+   htmode:value(VHT40, 40MHz)
+   htmode:value(VHT80, 80MHz)
+
+   elseif hw_modes.n then
if hw_modes.g then mode:value(11g, 2.4GHz (802.11g+n)) end
if hw_modes.a then mode:value(11a, 5GHz (802.11a+n)) end
 
diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm 
b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
index d528876..e407026 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
@@ -36,6 +36,7 @@ You may obtain a copy of the License at
if bl.b then bands = bands .. b end
if bl.g then bands = bands .. g end
if bl.n then bands = bands .. n end
+   if bl.ac then bands = bands .. ac end
end
 
local hw = dev.iwinfo.hardware_name
diff --git a/modules/base/luasrc/model/network.lua 
b/modules/base/luasrc/model/network.lua
index a409621..053b485 100644
--- a/modules/base/luasrc/model/network.lua
+++ b/modules/base/luasrc/model/network.lua
@@ -1274,6 +1274,7 @@ function wifidev.get_i18n(self)
if l.b then m = m .. b end
if l.g then m = m .. g end
if l.n then m = m .. n end
+   if l.ac then m = a end
 
return %s 802.11%s Wireless Controller (%s) %{ t, m, self:name() }
 end
-- 
1.8.2
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] Missing packages from packages feed on GitHub repository

2014-09-02 Thread Hannu Nyman
To my knowledge those packages (e.g. neon) have never been imported to the 
new packages in Github.
They are still in the old packages repo in svn, better known now as 
oldpackages.


None of the packages have been imported automatically. Transferring any 
package from oldpackages to Github requires somebody to be active, to create 
a pull request and to assume maintainership.


If you need other packages, you need to import also them (and to become the 
maintainer for them).

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH][RFC]mac80211: rt2x00 correctly set ht20/ht40 filter

2014-09-02 Thread Alpha Sparc
Hi, wifi performance RT3052 is lacking bitrates are fine but throughput is
below 10Mbits/s
On Sep 1, 2014 9:25 PM, Сергей Василюгин vasilu...@yandex.ru wrote:

 I'm double sorry. My patch need sed 's/RF3320/RF3322/g' :(.

 01.09.2014, 17:04, John Crispin blo...@openwrt.org:

 On 01/09/2014 01:22, Daniel Golle wrote:

  Hi Serge!

  Please do not send HTML emails. Your submissions are not useful for
  anyone if the mail body is HTML formatted and your mail application
  corrupted the white-space formatting. That's sad because your work
  will not be appreciated due to formalities which are easy to
  fulfil. Please read https://dev.openwrt.org/wiki/SubmittingPatches
  and have a look at the archive to get an impression why this is
  needed:
  https://lists.openwrt.org/pipermail/openwrt-devel/2014-August/027718.html

 also note that your patch was dropped by patchwork.openwrt.org for the

  same reasons and thus cannot be easily applied and merged. I
  suggest you should consider using git send-email to avoid these
  difficulties in future.

  It required quite some manual work to even read your patch. First
  of all, your patch applies to rt2x00, so please send it to the
  rt2x00 users mailing list.

 http://rt2x00.serialmonkey.com/mailman/listinfo/users_rt2x00.serialmonkey.com

   To add it to patches applied to mac80211 in OpenWrt, you'd have to
  create a patch adding a patch-file to
  package/kernel/mac80211/patches/ Please read
  http://wiki.openwrt.org/doc/devel/patches


  Anyway, I'm still glad you figured out why rt2x00 performs bad in
  HT40 mode on these chips.

  Thank you for that!

  I manually applied your patch and am about to test it on DIR-615-H1
  ;)



  Cheers


  Daniel

 Hi,

 valid critique, i am manually merging it into BB and CC now. please do
 not use html emails next time

 John
 ___
 openwrt-devel mailing list
 openwrt-devel@lists.openwrt.org
 https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel



 ---
 serge


 ___
 openwrt-devel mailing list
 openwrt-devel@lists.openwrt.org
 https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH] mtd: Fix trx check after partition rename (linux to firmware)

2014-09-02 Thread Mathias Adam
On brcm47xx (Huawei E970), I noticed that sysupgrade now tries to flash trx 
images which don't fit into the flash, resulting in non-booting system.

I found that mtd does trx size checking only when flashing to a partition 
called linux. This patch changes this to be firmware.

This matches the following patch which changed partition name in bcm47xxpart.c 
driver to firmware:

commit 86b4d5ef68ca77ff6724ebb9bddd6b93239c87fc
Author: hauke hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73
Date:   Sun Dec 1 16:32:32 2013 +

brcm47xx: use firmware partition name
...
Signed-off-by: Rafał Miłecki zaj...@gmail.com

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38973 
3c298f89-4303-0410-b956-a3cf2f4a3e73


Signed-off-by: Mathias Adam m.adam--open...@adamis.de
---
 package/system/mtd/src/trx.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/system/mtd/src/trx.c b/package/system/mtd/src/trx.c
index 65c2440..86d62fc 100644
--- a/package/system/mtd/src/trx.c
+++ b/package/system/mtd/src/trx.c
@@ -107,7 +107,7 @@ trx_check(int imagefd, const char *mtd, char *buf, int *len)
const struct trx_header *trx = (const struct trx_header *) buf;
int fd;
 
-   if (strcmp(mtd, linux) != 0)
+   if (strcmp(mtd, firmware) != 0)
return 1;
 
*len = read(imagefd, buf, 32);
-- 
1.7.10.4
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] mtd: Fix trx check after partition rename (linux to firmware)

2014-09-02 Thread Felix Fietkau
On 2014-09-02 18:47, Mathias Adam wrote:
 On brcm47xx (Huawei E970), I noticed that sysupgrade now tries to flash trx 
 images which don't fit into the flash, resulting in non-booting system.
 
 I found that mtd does trx size checking only when flashing to a partition 
 called linux. This patch changes this to be firmware.
 
 This matches the following patch which changed partition name in 
 bcm47xxpart.c driver to firmware:
 
 commit 86b4d5ef68ca77ff6724ebb9bddd6b93239c87fc
 Author: hauke hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73
 Date:   Sun Dec 1 16:32:32 2013 +
 
 brcm47xx: use firmware partition name
 ...
 Signed-off-by: Rafał Miłecki zaj...@gmail.com
 
 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38973 
 3c298f89-4303-0410-b956-a3cf2f4a3e73
 
 
 Signed-off-by: Mathias Adam m.adam--open...@adamis.de
Committed in r42403, thanks.

- Felix
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH 2/2] ar71xx: add board support for ubnt loco m xw

2014-09-02 Thread Alexander Couzens
Signed-off-by: Alexander Couzens lyn...@fe80.eu
---
 target/linux/ar71xx/base-files/etc/diag.sh |  2 +-
 .../ar71xx/base-files/etc/uci-defaults/01_leds |  3 ++-
 .../ar71xx/base-files/etc/uci-defaults/02_network  |  1 +
 target/linux/ar71xx/base-files/lib/ar71xx.sh   |  3 +++
 .../ar71xx/base-files/lib/upgrade/platform.sh  |  1 +
 target/linux/ar71xx/image/Makefile |  3 ++-
 .../patches-3.10/616-MIPS-ath79-ubnt-xw.patch  | 22 --
 .../722-MIPS-ath79-add-airGateway-support.patch|  8 
 8 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/target/linux/ar71xx/base-files/etc/diag.sh 
b/target/linux/ar71xx/base-files/etc/diag.sh
index 1864b11..fba6032 100755
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -34,7 +34,7 @@ get_status_led() {
aw-nr580)
status_led=aw-nr580:green:ready
;;
-   bullet-m | rocket-m | nano-m | nanostation-m | nanostation-m-xw)
+   bullet-m | rocket-m | nano-m | nanostation-m | nanostation-m-xw | 
loco-m-xw)
status_led=ubnt:green:link4
;;
bxu2000n-2-a1)
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds 
b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
index d3b766d..3f97d37 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
@@ -38,7 +38,8 @@ ap113)
 bullet-m | \
 nanostation-m | \
 rocket-m | \
-nanostation-m-xw)
+nanostation-m-xw | \
+loco-m-xw)
ucidef_set_led_rssi rssilow RSSILOW ubnt:red:link1 wlan0 1 
100 0 13
ucidef_set_led_rssi rssimediumlow RSSIMEDIUMLOW ubnt:orange:link2 
wlan0 26 100 -25 13
ucidef_set_led_rssi rssimediumhigh RSSIMEDIUMHIGH 
ubnt:green:link3 wlan0 51 100 -50 13
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network 
b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
index c5cfd67..8a0159c 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
@@ -286,6 +286,7 @@ bullet-m |\
 cap4200ag |\
 eap300v2 |\
 eap7660d |\
+loco-m-xw |\
 mr600 |\
 mr600v2 |\
 rb-411 |\
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh 
b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 1e96b6d..a7cbb80 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -352,6 +352,9 @@ ar71xx_board_detect() {
*Bullet M)
name=bullet-m
;;
+   *Loco M XW)
+   name=loco-m-xw
+   ;;
*Nanostation M)
name=nanostation-m
;;
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh 
b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 846954c..d1617bf 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -190,6 +190,7 @@ platform_check_image() {
airgateway | \
airrouter | \
bullet-m | \
+   loco-m-xw | \
nanostation-m | \
rocket-m | \
nanostation-m-xw | \
diff --git a/target/linux/ar71xx/image/Makefile 
b/target/linux/ar71xx/image/Makefile
index 683c238..41c125a 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -1246,6 +1246,7 @@ $(eval $(call 
SingleProfile,UBNTXM,64kraw,UBNTNANOM,ubnt-nano-m,UBNT-NM,ttyS0,11
 $(eval $(call 
SingleProfile,UBNTXM,64kraw,UBNTUNIFI,ubnt-unifi,UBNT-UF,ttyS0,115200,XM,BZ,ar7240))
 $(eval $(call 
SingleProfile,UBNTXM,64kraw,UBNTUNIFIOUTDOOR,ubnt-unifi-outdoor,UBNT-U20,ttyS0,115200,XM,BZ,ar7240))
 $(eval $(call 
SingleProfile,UBNTXM,64kraw,UBNTNANOMXW,ubnt-nano-m-xw,UBNT-NM-XW,ttyS0,115200,XM,XW,ar934x))
+$(eval $(call 
SingleProfile,UBNTXM,64kraw,UBNTLOCOXW,ubnt-loco-m-xw,UBNT-LOCO-XW,ttyS0,115200,XM,XW,ar934x))
 $(eval $(call 
SingleProfile,UBNTXM,64kraw,UBNTAIRGW,ubnt-air-gateway,UBNT-AGW,ttyATH0,115200,XM,AirGW,ar933x))
 
 $(eval $(call 
SingleProfile,WHRHPG300N,64kraw,WHRG301N,whr-g301n,WHR-G301N,ttyS0,115200,$$(whrhpg300n_mtdlayout),WHR-G301N))
@@ -1291,7 +1292,7 @@ $(eval $(call MultiProfile,TLWR941,TLWR941NV2 TLWR941NV3 
TLWR941NV4 TLWR941NV6))
 $(eval $(call MultiProfile,TLWR1043,TLWR1043V1 TLWR1043V2))
 $(eval $(call MultiProfile,TLWDR4300,TLWDR3500V1 TLWDR3600V1 TLWDR4300V1 
TLWDR4300V1IL TLWDR4310V1 MW4530RV1))
 $(eval $(call MultiProfile,TUBE2H,TUBE2H8M TUBE2H16M))
-$(eval $(call MultiProfile,UBNT,UBNTAIRROUTER UBNTRS UBNTRSPRO UBNTLSSR71 
UBNTBULLETM UBNTROCKETM UBNTNANOM UBNTNANOMXW UBNTUNIFI UBNTUNIFIOUTDOOR UAPPRO 
UBNTAIRGW))
+$(eval $(call MultiProfile,UBNT,UBNTAIRROUTER UBNTRS UBNTRSPRO UBNTLSSR71 
UBNTBULLETM UBNTROCKETM UBNTNANOM UBNTNANOMXW UBNTLOCOXW UBNTUNIFI 
UBNTUNIFIOUTDOOR UAPPRO UBNTAIRGW))
 $(eval $(call MultiProfile,WNDR3700,WNDR3700V1 

[OpenWrt-Devel] [PATCH 1/2] ar71xx: refactor ubnt xw board setup

2014-09-02 Thread Alexander Couzens
Signed-off-by: Alexander Couzens lyn...@fe80.eu
---
 .../patches-3.10/616-MIPS-ath79-ubnt-xw.patch  | 28 +++---
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/target/linux/ar71xx/patches-3.10/616-MIPS-ath79-ubnt-xw.patch 
b/target/linux/ar71xx/patches-3.10/616-MIPS-ath79-ubnt-xw.patch
index ed2fd24..9413bd8 100644
--- a/target/linux/ar71xx/patches-3.10/616-MIPS-ath79-ubnt-xw.patch
+++ b/target/linux/ar71xx/patches-3.10/616-MIPS-ath79-ubnt-xw.patch
@@ -1,6 +1,8 @@
 a/arch/mips/ath79/mach-ubnt-xm.c
-+++ b/arch/mips/ath79/mach-ubnt-xm.c
-@@ -332,3 +332,60 @@ static void __init ubnt_uap_pro_setup(vo
+Index: linux-3.10.49/arch/mips/ath79/mach-ubnt-xm.c
+===
+--- linux-3.10.49.orig/arch/mips/ath79/mach-ubnt-xm.c  2014-08-15 
22:55:37.890080659 +0200
 linux-3.10.49/arch/mips/ath79/mach-ubnt-xm.c   2014-08-15 
22:58:31.061570912 +0200
+@@ -332,3 +332,67 @@
  MIPS_MACHINE(ATH79_MACH_UBNT_UAP_PRO, UAP-PRO, Ubiquiti UniFi AP Pro,
 ubnt_uap_pro_setup);
  
@@ -29,7 +31,7 @@
 +  },
 +};
 +
-+static void __init ubnt_nano_m_xw_setup(void)
++static void __init ubnt_xw_init(void)
 +{
 +  u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff);
 +
@@ -44,26 +46,36 @@
 +  ath79_register_wmac(eeprom + UAP_PRO_WMAC_CALDATA_OFFSET, NULL);
 +  ap91_pci_init(eeprom + UAP_PRO_PCI_CALDATA_OFFSET, NULL);
 +
-+  ath79_register_mdio(0, ~(BIT(0) | BIT(1) | BIT(5)));
 +
 +  ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_MII_GMAC0 | 
AR934X_ETH_CFG_MII_GMAC0_SLAVE);
 +  ath79_init_mac(ath79_eth0_data.mac_addr,
 + eeprom + UAP_PRO_MAC0_OFFSET, 0);
 +
-+  /* GMAC0 is connected to an AR8326 switch */
 +  ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
++  ath79_eth0_data.mii_bus_dev = ath79_mdio0_device.dev;
++}
++
++static void __init ubnt_nano_m_xw_setup(void)
++{
++  ubnt_xw_init();
++
++  /* GMAC0 is connected to an AR8326 switch */
++  ath79_register_mdio(0, ~(BIT(0) | BIT(1) | BIT(5)));
 +  ath79_eth0_data.phy_mask = (BIT(0) | BIT(1) | BIT(5));
 +  ath79_eth0_data.speed = SPEED_100;
 +  ath79_eth0_data.duplex = DUPLEX_FULL;
-+  ath79_eth0_data.mii_bus_dev = ath79_mdio0_device.dev;
 +  ath79_register_eth(0);
 +}
 +
 +MIPS_MACHINE(ATH79_MACH_UBNT_NANO_M_XW, UBNT-NM-XW, Ubiquiti Nanostation M 
XW,
 +   ubnt_nano_m_xw_setup);
++
 --- a/arch/mips/ath79/machtypes.h
 +++ b/arch/mips/ath79/machtypes.h
-@@ -124,6 +124,7 @@ enum ath79_mach_type {
+@@ -121,9 +121,10 @@ enum ath79_mach_type {
+   ATH79_MACH_TL_WR941ND,  /* TP-LINK TL-WR941ND */
+   ATH79_MACH_UBNT_AIRROUTER,  /* Ubiquiti AirRouter */
+   ATH79_MACH_UBNT_BULLET_M,   /* Ubiquiti Bullet M */
ATH79_MACH_UBNT_LSSR71, /* Ubiquiti LS-SR71 */
ATH79_MACH_UBNT_LSX,/* Ubiquiti LSX */
ATH79_MACH_UBNT_NANO_M, /* Ubiquiti NanoStation M */
-- 
2.1.0
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel