Re: [OpenWrt-Devel] [PATCH] ar71xx: add support for Cisco's MR18

2015-12-17 Thread Christian Lamparter 
Hello,

On Saturday, December 12, 2015 04:06:51 PM Christian Lamparter wrote:
> On Saturday, December 12, 2015 03:03:55 PM John Crispin wrote:

> > which ones are missing ? i merged a total of 5 now.

> here they are (the missing ones):
> 
> "ar71xx: refactor 10-ath9k-eeprom"
> 
> 
> "ar71xx: scan nand ubi partition for ath9k eeprom files"
> 
> 
> "base-files: cleanup mtd_get_mac_binary hexdump"
> 
> 

We found another issue in one of the three patches!
I'll make updates and post "v8" patches shortly. 
(I won't spam the ML with patches that have been 
accepted already)

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

Re: [OpenWrt-Devel] [PATCH] ar71xx: add support for Cisco's MR18

2015-12-12 Thread Christian Lamparter 
On Saturday, December 12, 2015 07:28:35 AM John Crispin wrote:
> 
> On 12/12/2015 01:15, Christian Lamparter wrote:
> > From: Chris R Blake 
> > 
> > This patch adds support for Cisco's MR18.
> > Detailed instructions for the flashing the device can
> > be found in the OpenWrt forum thread:
> > 
> > 
> > Signed-off-by: Chris R Blake 
> > ---
> > in before complains about "not using the latest method". ;-)
> > (yes, this is because of r47874 - I'm not spamming the ML
> > just because of this.)
> > 
> > Regards,
> > Christian
> 
> looks like you had to rebase quite often without actually being the
> cause ;) anyhow its now merged and i assume this patch obsoletes all
> previous still open ones ?
> 
Oh no, sorry. I didn't include the other parts in that. I just updated
this patch (my bad for dropping the subject [PATCH v7.1 4/5]). nbd just
fixed the break. but in order to get the MR18 to work, we will need the
other patches as well (please).

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

Re: [OpenWrt-Devel] [PATCH] ar71xx: add support for Cisco's MR18

2015-12-12 Thread John Crispin 


On 12/12/2015 12:32, Christian Lamparter wrote:
> On Saturday, December 12, 2015 07:28:35 AM John Crispin wrote:
>>
>> On 12/12/2015 01:15, Christian Lamparter wrote:
>>> From: Chris R Blake 
>>>
>>> This patch adds support for Cisco's MR18.
>>> Detailed instructions for the flashing the device can
>>> be found in the OpenWrt forum thread:
>>> 
>>>
>>> Signed-off-by: Chris R Blake 
>>> ---
>>> in before complains about "not using the latest method". ;-)
>>> (yes, this is because of r47874 - I'm not spamming the ML
>>> just because of this.)
>>>
>>> Regards,
>>> Christian
>>
>> looks like you had to rebase quite often without actually being the
>> cause ;) anyhow its now merged and i assume this patch obsoletes all
>> previous still open ones ?
>>
> Oh no, sorry. I didn't include the other parts in that. I just updated
> this patch (my bad for dropping the subject [PATCH v7.1 4/5]). nbd just
> fixed the break. but in order to get the MR18 to work, we will need the
> other patches as well (please).
> 
> Regards,
> Christian
> 

which ones are missing ? i merged a total of 5 now.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH] ar71xx: add support for Cisco's MR18

2015-12-12 Thread Christian Lamparter 
On Saturday, December 12, 2015 03:03:55 PM John Crispin wrote:
> 
> On 12/12/2015 12:32, Christian Lamparter wrote:
> > On Saturday, December 12, 2015 07:28:35 AM John Crispin wrote:
> >>
> >> On 12/12/2015 01:15, Christian Lamparter wrote:
> >>> From: Chris R Blake 
> >>>
> >>> This patch adds support for Cisco's MR18.
> >>> Detailed instructions for the flashing the device can
> >>> be found in the OpenWrt forum thread:
> >>> 
> >>>
> >>> Signed-off-by: Chris R Blake 
> >>> ---
> >>> in before complains about "not using the latest method". ;-)
> >>> (yes, this is because of r47874 - I'm not spamming the ML
> >>> just because of this.)
> >>>
> >>> Regards,
> >>> Christian
> >>
> >> looks like you had to rebase quite often without actually being the
> >> cause ;) anyhow its now merged and i assume this patch obsoletes all
> >> previous still open ones ?
> >>
> > Oh no, sorry. I didn't include the other parts in that. I just updated
> > this patch (my bad for dropping the subject [PATCH v7.1 4/5]). nbd just
> > fixed the break. but in order to get the MR18 to work, we will need the
> > other patches as well (please).
> > 
> > Regards,
> > Christian
> > 
> 
> which ones are missing ? i merged a total of 5 now.
here they are (the missing ones):

"ar71xx: refactor 10-ath9k-eeprom"


"ar71xx: scan nand ubi partition for ath9k eeprom files"


"base-files: cleanup mtd_get_mac_binary hexdump"


Note:
I removed the LED and firmware-tool patches from the
series as they have been merged. So we have a total of
9 patches. In case you wonder why not 8: Felix has 
merged one too (the QCA955x register definitions - r47882). 

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

[OpenWrt-Devel] [PATCH] ar71xx: add support for Cisco's MR18

2015-12-11 Thread Christian Lamparter 
From: Chris R Blake 

This patch adds support for Cisco's MR18.
Detailed instructions for the flashing the device can
be found in the OpenWrt forum thread:


Signed-off-by: Chris R Blake 
---
in before complains about "not using the latest method". ;-)
(yes, this is because of r47874 - I'm not spamming the ML
just because of this.)

Regards,
Christian
---
 target/linux/ar71xx/base-files/etc/board.d/01_leds |   4 +
 .../linux/ar71xx/base-files/etc/board.d/02_network |   1 +
 target/linux/ar71xx/base-files/etc/diag.sh |   3 +
 .../etc/hotplug.d/firmware/10-ath9k-eeprom |  32 +++
 target/linux/ar71xx/base-files/lib/ar71xx.sh   |   3 +
 .../base-files/lib/preinit/05_set_iface_mac_ar71xx |   4 +
 .../ar71xx/base-files/lib/upgrade/merakinand.sh| 137 ++
 .../ar71xx/base-files/lib/upgrade/platform.sh  |   7 +
 target/linux/ar71xx/config-4.1 |   1 +
 .../ar71xx/files/arch/mips/ath79/Kconfig.openwrt   |  11 +
 target/linux/ar71xx/files/arch/mips/ath79/Makefile |   1 +
 .../linux/ar71xx/files/arch/mips/ath79/mach-mr18.c | 297 +
 .../linux/ar71xx/files/arch/mips/ath79/machtypes.h |   1 +
 target/linux/ar71xx/image/Makefile |  21 ++
 target/linux/ar71xx/nand/config-default|   1 +
 target/linux/ar71xx/nand/profiles/meraki.mk|  17 ++
 16 files changed, 541 insertions(+)
 create mode 100644 target/linux/ar71xx/base-files/lib/upgrade/merakinand.sh
 create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-mr18.c
 create mode 100644 target/linux/ar71xx/nand/profiles/meraki.mk

diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds 
b/target/linux/ar71xx/base-files/etc/board.d/01_leds
index 33f8377..d4f226e 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
@@ -283,6 +283,10 @@ mr16)
ucidef_set_led_wlan "wlan4" "WLAN4" "mr16:green:wifi4" "phy0tpt"
;;
 
+mr18)
+   ucidef_set_led_netdev "wlan0" "WLAN0" "mr18:blue:tricolor0" "wlan0"
+   ;;
+
 mr600)
ucidef_set_led_wlan "wlan58" "WLAN58" "mr600:green:wlan58" "phy0tpt"
;;
diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network 
b/target/linux/ar71xx/base-files/etc/board.d/02_network
index 0e77e93..11c4341 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -313,6 +313,7 @@ eap7660d |\
 el-mini |\
 loco-m-xw |\
 mr1750 |\
+mr18 |\
 mr600 |\
 mr600v2 |\
 mr900 |\
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh 
b/target/linux/ar71xx/base-files/etc/diag.sh
index 5b997e0..0e1df10 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -152,6 +152,9 @@ get_status_led() {
mr16)
status_led="mr16:green:power"
;;
+   mr18)
+   status_led="mr18:green:tricolor0"
+   ;;
mr600)
status_led="mr600:orange:power"
;;
diff --git 
a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom 
b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
index 72f7858..f41c3de 100644
--- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
@@ -54,6 +54,14 @@ board=$(ar71xx_board_name)
 case "$FIRMWARE" in
 "soc_wmac.eeprom")
case $board in
+   mr18)
+   if [ -n "$(nand_find_volume ubi0 caldata)" ]; then
+   ath9k_ubi_eeprom_extract "caldata" 4096 2048
+   else
+   ath9k_eeprom_extract "odm-caldata" 4096 2048
+   fi
+   ath9k_patch_firmware_mac $(macaddr_add $(mtd_get_mac_binary_ubi 
board-config 102) +1)
+   ;;
r6100 | \
wndr3700v4 | \
wndr4300)
@@ -68,6 +76,14 @@ case "$FIRMWARE" in
 
 "pci_wmac0.eeprom")
case $board in
+   mr18)
+   if [ -n "$(nand_find_volume ubi0 caldata)" ]; then
+   ath9k_ubi_eeprom_extract "caldata" 20480 2048
+   else
+   ath9k_eeprom_extract "odm-caldata" 20480 2048
+   fi
+   ath9k_patch_firmware_mac $(macaddr_add $(mtd_get_mac_binary_ubi 
board-config 102) +2)
+   ;;
wndr3700v4 | \
wndr4300)
ath9k_eeprom_extract "caldata" 20480 2048
@@ -78,4 +94,20 @@ case "$FIRMWARE" in
;;
esac
;;
+
+"pci_wmac1.eeprom")
+   case $board in
+   mr18)
+   if [ -n "$(nand_find_volume ubi0 caldata)" ]; then
+   ath9k_ubi_eeprom_extract "caldata" 36864 2048
+   else
+   ath9k_eeprom_extract "odm-caldata" 36864 2048
+

Re: [OpenWrt-Devel] [PATCH] ar71xx: add support for Cisco's MR18

2015-12-11 Thread John Crispin 


On 12/12/2015 01:15, Christian Lamparter wrote:
> From: Chris R Blake 
> 
> This patch adds support for Cisco's MR18.
> Detailed instructions for the flashing the device can
> be found in the OpenWrt forum thread:
> 
> 
> Signed-off-by: Chris R Blake 
> ---
> in before complains about "not using the latest method". ;-)
> (yes, this is because of r47874 - I'm not spamming the ML
> just because of this.)
> 
> Regards,
> Christian

looks like you had to rebase quite often without actually being the
cause ;) anyhow its now merged and i assume this patch obsoletes all
previous still open ones ?



> ---
>  target/linux/ar71xx/base-files/etc/board.d/01_leds |   4 +
>  .../linux/ar71xx/base-files/etc/board.d/02_network |   1 +
>  target/linux/ar71xx/base-files/etc/diag.sh |   3 +
>  .../etc/hotplug.d/firmware/10-ath9k-eeprom |  32 +++
>  target/linux/ar71xx/base-files/lib/ar71xx.sh   |   3 +
>  .../base-files/lib/preinit/05_set_iface_mac_ar71xx |   4 +
>  .../ar71xx/base-files/lib/upgrade/merakinand.sh| 137 ++
>  .../ar71xx/base-files/lib/upgrade/platform.sh  |   7 +
>  target/linux/ar71xx/config-4.1 |   1 +
>  .../ar71xx/files/arch/mips/ath79/Kconfig.openwrt   |  11 +
>  target/linux/ar71xx/files/arch/mips/ath79/Makefile |   1 +
>  .../linux/ar71xx/files/arch/mips/ath79/mach-mr18.c | 297 
> +
>  .../linux/ar71xx/files/arch/mips/ath79/machtypes.h |   1 +
>  target/linux/ar71xx/image/Makefile |  21 ++
>  target/linux/ar71xx/nand/config-default|   1 +
>  target/linux/ar71xx/nand/profiles/meraki.mk|  17 ++
>  16 files changed, 541 insertions(+)
>  create mode 100644 target/linux/ar71xx/base-files/lib/upgrade/merakinand.sh
>  create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-mr18.c
>  create mode 100644 target/linux/ar71xx/nand/profiles/meraki.mk
> 
> diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds 
> b/target/linux/ar71xx/base-files/etc/board.d/01_leds
> index 33f8377..d4f226e 100755
> --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
> +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
> @@ -283,6 +283,10 @@ mr16)
>   ucidef_set_led_wlan "wlan4" "WLAN4" "mr16:green:wifi4" "phy0tpt"
>   ;;
>  
> +mr18)
> + ucidef_set_led_netdev "wlan0" "WLAN0" "mr18:blue:tricolor0" "wlan0"
> + ;;
> +
>  mr600)
>   ucidef_set_led_wlan "wlan58" "WLAN58" "mr600:green:wlan58" "phy0tpt"
>   ;;
> diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network 
> b/target/linux/ar71xx/base-files/etc/board.d/02_network
> index 0e77e93..11c4341 100755
> --- a/target/linux/ar71xx/base-files/etc/board.d/02_network
> +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
> @@ -313,6 +313,7 @@ eap7660d |\
>  el-mini |\
>  loco-m-xw |\
>  mr1750 |\
> +mr18 |\
>  mr600 |\
>  mr600v2 |\
>  mr900 |\
> diff --git a/target/linux/ar71xx/base-files/etc/diag.sh 
> b/target/linux/ar71xx/base-files/etc/diag.sh
> index 5b997e0..0e1df10 100644
> --- a/target/linux/ar71xx/base-files/etc/diag.sh
> +++ b/target/linux/ar71xx/base-files/etc/diag.sh
> @@ -152,6 +152,9 @@ get_status_led() {
>   mr16)
>   status_led="mr16:green:power"
>   ;;
> + mr18)
> + status_led="mr18:green:tricolor0"
> + ;;
>   mr600)
>   status_led="mr600:orange:power"
>   ;;
> diff --git 
> a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom 
> b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
> index 72f7858..f41c3de 100644
> --- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
> +++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
> @@ -54,6 +54,14 @@ board=$(ar71xx_board_name)
>  case "$FIRMWARE" in
>  "soc_wmac.eeprom")
>   case $board in
> + mr18)
> + if [ -n "$(nand_find_volume ubi0 caldata)" ]; then
> + ath9k_ubi_eeprom_extract "caldata" 4096 2048
> + else
> + ath9k_eeprom_extract "odm-caldata" 4096 2048
> + fi
> + ath9k_patch_firmware_mac $(macaddr_add $(mtd_get_mac_binary_ubi 
> board-config 102) +1)
> + ;;
>   r6100 | \
>   wndr3700v4 | \
>   wndr4300)
> @@ -68,6 +76,14 @@ case "$FIRMWARE" in
>  
>  "pci_wmac0.eeprom")
>   case $board in
> + mr18)
> + if [ -n "$(nand_find_volume ubi0 caldata)" ]; then
> + ath9k_ubi_eeprom_extract "caldata" 20480 2048
> + else
> + ath9k_eeprom_extract "odm-caldata" 20480 2048
> + fi
> + ath9k_patch_firmware_mac $(macaddr_add $(mtd_get_mac_binary_ubi 
> board-config 102) +2)
> + ;;
>   wndr3700v4 | \
>   wndr4300)
>   ath9k_eeprom_extract "caldata"