Skip to content

Commit 5578eb6

Browse files
halmartinrobimarko
halmartin
authored and
robimarko
committed
ipq40xx: add support for Cisco Meraki MR20
This commit adds support for the Cisco Meraki MR20/Go GR10. The Meraki MR20 is a Cisco 802.11ac/WiFi 5 AP with 1 Ethernet port. It can be powered by a 12V DC barrel jack (5.5x2.5mm, center positive) or via 802.3af POE. The Meraki Go GR10 (codename: Maggot) is identical to the MR20 (codename: Grub), so this document will refer to both devices as the MR20. MR20 hardware info: * CPU: Qualcomm IPQ4029 * RAM: 256MB DDR3 * Storage: 128 MB (MX30LF1G18AC) * Networking: 1 Gigabit Ethernet * WiFi: QCA4019 802.11b/g/n/ac * Serial: Internal header (J10, 2.54mm, unpopulated) This device ships with secure boot, and cannot be flashed without external programmers (TSOP48 NAND and I2C EEEPROM)! Disassembly: Remove the four rubber feet on the rear of the AP and the four Torx T8 screws under the feet. Using a guitar pick or similar plastic tool, insert it on the side along the seam around the edge. Push in gently while gently lifting the front of the housing to release the plastic retention clips. There are 15 clips in total. Once you have removed the plastic front (shown above already removed so you know where the clips are), remove the 4 Philips screws holding down the two metal WiFi antennas. Lift the PCB gently while pushing the Ethernet port into the housing to release it. The PCB should come free from the metal heat spreader. The TSOP48 NAND flash (U9, Macronix/MXIC MX30LF1G18AC) is located on the opposite side of the PCB. To flash, you need to desolder the TSOP48 or use a 360 clip. You also need to reprogram the I2C EEPROM (U20, Atmel 24c64). Installation: The dumps to flash can be found in this repository: https://github.com/halmartin/meraki-openwrt-docs/tree/main/mr20_gr10 The device has the following flash layout (offsets with OOB data): ``` 0x000000000000-0x000000100000 : "sbl1" 0x000000100000-0x000000200000 : "mibib" 0x000000200000-0x000000300000 : "bootconfig" 0x000000300000-0x000000400000 : "qsee" 0x000000400000-0x000000500000 : "qsee_alt" 0x000000500000-0x000000580000 : "cdt" 0x000000580000-0x000000600000 : "cdt_alt" 0x000000600000-0x000000680000 : "ddrparams" 0x000000700000-0x000000900000 : "u-boot" 0x000000900000-0x000000b00000 : "u-boot-backup" 0x000000b00000-0x000000b80000 : "ART" 0x000000c00000-0x000007c00000 : "ubi" ``` * Dump your original NAND (if using nanddump, include OOB data). * Decompress `u-boot.bin.gz` dump from the GitHub repository above (dump contains OOB data) and overwrite the `u-boot` portion of NAND from `0x738000`-`0x948000` (length `0x210000`). Offsets here include OOB data. * Decompress `ubi.bin.gz` dump from the GitHub repository above (dump contains OOB data) and overwrite the `ubi` portion of NAND from `0xc60000`-`0x8400000` (length `0x77a0000`). Offsets here include OOB data. * Dump your original EEPROM. Change the byte at offset `0x49` to `0x1e` (originally `0x2c` or `0x25`). Remember to re-write the EEPROM with the modified data. * This can be done on Linux via the following command: `printf "\x1e" | dd of=/tmp/eeprom.bin bs=1 seek=$((0x49)) conv=notrunc` **Note**: the device will not boot if you modify the board major number and have not yet overwritten the `ubi` and `u-boot` regions of NAND. * Resolder the NAND after overwriting the `u-boot` and `ubi` regions. OpenWrt Installation: * After flashing NAND and EEPROM with external programmers. Plug in an Ethernet cable and power up the device. * The new U-Boot build uses the space character `" "` (without quotes) to interrupt boot. * Interrupt U-Boot and `tftpboot` the OpenWrt initramfs image from your tftp server ``` dhcp setenv serverip <your_tftp> tftpboot openwrt-ipq40xx-generic-meraki_mr20-initramfs-uImage.itb ``` * Once booted into the OpenWrt initramfs, created the `ART` ubivol with the WiFi radio calibration from the mtd partition: ``` cat /dev/mtd10 > /tmp/ART.bin ubiupdatevol /dev/ubi0_1 /tmp/ART.bin ``` * `scp` the `sysupgrade` image to the device and run the normal `sysupgrade` procedure: ``` scp -O openwrt-ipq40xx-generic-meraki_mr20-squashfs-sysupgrade.bin [email protected]:/tmp/ ssh [email protected] "sysupgrade -n /tmp/openwrt-ipq40xx-generic-meraki_mr20-squashfs-sysupgrade.bin" ``` * OpenWrt should now be installed on the device. Signed-off-by: Hal Martin <[email protected]> Link: openwrt/openwrt#20646 Signed-off-by: Robert Marko <[email protected]>
1 parent 593e399 commit 5578eb6

File tree

6 files changed

+172
-0
lines changed

6 files changed

+172
-0
lines changed

‎package/firmware/ipq-wifi/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ ALLWIFIBOARDS:= \
6060
linksys_spnmx56 \
6161
linksys_whw03 \
6262
meraki_mr30h \
63+
meraki_underdog \
6364
meraki_z3 \
6465
netgear_lbr20 \
6566
netgear_rax120v2 \
@@ -241,6 +242,7 @@ $(eval $(call generate-ipq-wifi-package,linksys_mx8500,Linksys MX8500))
241242
$(eval $(call generate-ipq-wifi-package,linksys_spnmx56,Linksys SPNMX56))
242243
$(eval $(call generate-ipq-wifi-package,linksys_whw03,Linksys WHW03))
243244
$(eval $(call generate-ipq-wifi-package,meraki_mr30h,Meraki MR30H))
245+
$(eval $(call generate-ipq-wifi-package,meraki_underdog,Meraki underdog))
244246
$(eval $(call generate-ipq-wifi-package,meraki_z3,Meraki Z3))
245247
$(eval $(call generate-ipq-wifi-package,netgear_lbr20,Netgear LBR20))
246248
$(eval $(call generate-ipq-wifi-package,netgear_rax120v2,Netgear RAX120v2))

‎target/linux/ipq40xx/base-files/etc/board.d/02_network‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ ipq40xx_setup_interfaces()
5757
dlink,dap-2610|\
5858
engenius,eap1300|\
5959
extreme-networks,ws-ap3915i|\
60+
meraki,mr20|\
6061
meraki,mr33|\
6162
meraki,mr74|\
6263
mikrotik,lhgg-60ad|\

‎target/linux/ipq40xx/base-files/lib/upgrade/platform.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ platform_do_upgrade() {
178178
linksys,whw03)
179179
platform_do_upgrade_linksys_emmc "$1"
180180
;;
181+
meraki,mr20|\
181182
meraki,gx20|\
182183
meraki,z3)
183184
# DO NOT set CI_KERNPART to part.safe,

‎target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4029-meraki-underdog.dtsi‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
/*
3+
* Device Tree Source for Meraki devices
4+
*
5+
* Copyright (C) 2017 Chris Blake <[email protected]>
6+
* Copyright (C) 2017 Christian Lamparter <[email protected]>
7+
* Copyright (C) 2025 Hal Martin <[email protected]>
8+
*
9+
* Based on Cisco Meraki DTS from GPL release r25-linux-3.14-20170427
10+
*
11+
* This file is licensed under the terms of the GNU General Public
12+
* License version 2. This program is licensed "as is" without
13+
* any warranty of any kind, whether express or implied.
14+
*/
15+
16+
#include "qcom-ipq4029-meraki-common.dtsi"
17+
18+
/ {
19+
aliases {
20+
led-boot = &status_green;
21+
led-failsafe = &status_red;
22+
led-running = &status_green;
23+
led-upgrade = &power_orange;
24+
};
25+
26+
leds {
27+
compatible = "gpio-leds";
28+
29+
power_orange: power {
30+
function = LED_FUNCTION_POWER;
31+
color = <LED_COLOR_ID_ORANGE>;
32+
gpios = <&tlmm 49 GPIO_ACTIVE_HIGH>;
33+
panic-indicator;
34+
};
35+
};
36+
};
37+
38+
&blsp1_i2c3 {
39+
eeprom@56 {
40+
compatible = "atmel,24c64";
41+
pagesize = <32>;
42+
reg = <0x56>;
43+
read-only; /* This holds our MAC & Meraki board-data */
44+
45+
nvmem-layout {
46+
compatible = "fixed-layout";
47+
#address-cells = <1>;
48+
#size-cells = <1>;
49+
50+
mac_address: mac-address@66 {
51+
compatible = "mac-base";
52+
reg = <0x66 0x6>;
53+
#nvmem-cell-cells = <1>;
54+
};
55+
};
56+
};
57+
};
58+
59+
&tlmm {
60+
i2c_0_pins: i2c_0_pinmux {
61+
function = "blsp_i2c0";
62+
pins = "gpio10", "gpio11";
63+
drive-strength = <16>;
64+
bias-disable;
65+
};
66+
};
67+
68+
&mdio {
69+
ethernet-phy-package@0 {
70+
status = "disabled";
71+
};
72+
};
73+
74+
&switch {
75+
/delete-property/ psgmii-ethphy;
76+
};
77+
78+
&ethphy0 {
79+
status = "disabled";
80+
};
81+
82+
&ethphy1 {
83+
status = "disabled";
84+
};
85+
86+
&ethphy2 {
87+
status = "disabled";
88+
};
89+
90+
&ethphy3 {
91+
status = "disabled";
92+
};
93+
94+
&ethphy4 {
95+
status = "disabled";
96+
};
97+
98+
&psgmiiphy {
99+
status = "disabled";
100+
};
101+

‎target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4029-mr20.dts‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
// Device Tree Source for Meraki MR20 (Grub) / Go GR10 (Maggot)
3+
4+
#include "qcom-ipq4029-meraki-underdog.dtsi"
5+
6+
/ {
7+
model = "Meraki MR20";
8+
compatible = "meraki,mr20";
9+
10+
leds {
11+
compatible = "gpio-leds";
12+
13+
status_green: led_green {
14+
color = <LED_COLOR_ID_GREEN>;
15+
gpios = <&tlmm 34 GPIO_ACTIVE_HIGH>;
16+
};
17+
18+
status_blue: led_blue {
19+
color = <LED_COLOR_ID_BLUE>;
20+
gpios = <&tlmm 35 GPIO_ACTIVE_HIGH>;
21+
};
22+
23+
status_red: led_red {
24+
color = <LED_COLOR_ID_RED>;
25+
gpios = <&tlmm 8 GPIO_ACTIVE_HIGH>;
26+
};
27+
28+
};
29+
30+
soc {
31+
ess_tcsr@1953000 {
32+
qcom,ess-interface-select = <TCSR_ESS_PSGMII_RGMII5>;
33+
};
34+
};
35+
};
36+
37+
&mdio {
38+
ar8035: ethernet-phy@0 {
39+
compatible = "ethernet-phy-ieee802.3-c22";
40+
reg = <0>;
41+
};
42+
};
43+
44+
&swport5 {
45+
status = "okay";
46+
label = "lan";
47+
phy-handle = <&ar8035>;
48+
phy-mode = "rgmii-id";
49+
};
50+
51+
&wifi0 {
52+
status = "okay";
53+
qcom,ath10k-calibration-variant = "Meraki-underdog";
54+
};
55+
56+
&wifi1 {
57+
status = "okay";
58+
qcom,ath10k-calibration-variant = "Meraki-underdog";
59+
};

‎target/linux/ipq40xx/image/generic.mk‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -822,6 +822,14 @@ define Device/meraki_common
822822
DEVICE_PACKAGES := ath10k-firmware-qca9887-ct
823823
endef
824824

825+
define Device/meraki_mr20
826+
$(call Device/meraki_common)
827+
DEVICE_MODEL := MR20
828+
DEVICE_DTS_CONFIG := config@4
829+
DEVICE_PACKAGES := ipq-wifi-meraki_underdog
830+
endef
831+
TARGET_DEVICES += meraki_mr20
832+
825833
define Device/meraki_mr30h
826834
$(call Device/meraki_common)
827835
DEVICE_MODEL := MR30H

0 commit comments

Comments
 (0)