Skip to content
This repository was archived by the owner on Jul 16, 2021. It is now read-only.

Commit cf71407

Browse files
chunkeeychunkeey
committed
Update to r47665
1 parent 8b03b89 commit cf71407

File tree

7 files changed

+226
-166
lines changed

7 files changed

+226
-166
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Bringup repo for the Cisco Meraki MR18 on OpenWRT!
44

5-
Code is based on revision http://git.openwrt.org/?p=openwrt.git;a=commit;h=19cc7583f050ea411e30b0bf203a8801e5ee45ae
5+
Code is based on revision http://git.openwrt.org/?p=openwrt.git;a=commit;h=25f469813e597e5648479731eeea7ee2544f9f62
66

77
Building
88
-----

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if [ ! -d $clonedir ]; then
2323
Msg "Cloning Repo..."
2424
git clone git://git.openwrt.org/openwrt.git $clonedir
2525
cd $clonedir
26-
git reset --hard 19cc7583f050ea411e30b0bf203a8801e5ee45ae
26+
git reset --hard 25f469813e597e5648479731eeea7ee2544f9f62
2727
cd - > /dev/null
2828
fi
2929

‎overlay/target/linux/ar71xx/base-files/etc/diag.sh‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ get_status_led() {
1212
all0305)
1313
status_led="eap7660d:green:ds4"
1414
;;
15-
antminer-s1|\
15+
antminer-s1)
16+
status_led="antminer-s1:green:system"
17+
;;
1618
antminer-s3)
17-
status_led="bitmain:green:system"
19+
status_led="antminer-s3:green:system"
1820
;;
1921
ap132)
2022
status_led="ap132:green:status"
@@ -84,6 +86,9 @@ get_status_led() {
8486
dir-835-a1)
8587
status_led="d-link:amber:power"
8688
;;
89+
dlan-hotspot)
90+
status_led="devolo:green:wifi"
91+
;;
8792
dlan-pro-500-wp)
8893
status_led="devolo:green:wlan-2g"
8994
;;
@@ -174,8 +179,11 @@ get_status_led() {
174179
nbg460n_550n_550nh)
175180
status_led="nbg460n:green:power"
176181
;;
182+
nbg6616)
183+
status_led="nbg6616:green:power"
184+
;;
177185
nbg6716)
178-
status_led="zyxel:white:power"
186+
status_led="nbg6716:white:power"
179187
;;
180188
om2p | \
181189
om2pv2 | \
@@ -228,6 +236,9 @@ get_status_led() {
228236
smart-300)
229237
status_led="nc-link:green:system"
230238
;;
239+
minibox-v1)
240+
status_led="minibox-v1:green:system"
241+
;;
231242
oolite)
232243
status_led="oolite:red:system"
233244
;;
@@ -290,7 +301,8 @@ get_status_led() {
290301
tl-wdr4300 | \
291302
tl-wr703n | \
292303
tl-wr710n | \
293-
tl-wr720n-v3)
304+
tl-wr720n-v3 | \
305+
tl-wr941nd-v6)
294306
status_led="tp-link:blue:system"
295307
;;
296308
tl-wr841n-v9)

‎overlay/target/linux/ar71xx/base-files/lib/ar71xx.sh‎

Lines changed: 44 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ wndr3700_board_detect() {
3737
machine="NETGEAR WNDR3700"
3838
;;
3939
"33373031")
40-
# Use awk to remove everything after the first zero byte
41-
model="$(ar71xx_get_mtd_offset_size_format art 41 32 %c | LC_CTYPE=C awk -v 'FS=[^[:print:]]' '{print $1; exit}')"
40+
model="$(ar71xx_get_mtd_offset_size_format art 41 32 %c)"
41+
# Use awk to remove everything unprintable
42+
model_stripped="$(echo -n "$model" | LC_CTYPE=C awk -v 'FS=[^[:print:]]' '{print $1; exit}')"
4243
case $model in
4344
$'\xff'*)
4445
if [ "${model:24:1}" = 'N' ]; then
@@ -48,14 +49,14 @@ wndr3700_board_detect() {
4849
fi
4950
;;
5051
'29763654+16+64'*)
51-
machine="NETGEAR ${model:14}"
52+
machine="NETGEAR ${model_stripped:14}"
5253
;;
5354
'29763654+16+128'*)
54-
machine="NETGEAR ${model:15}"
55+
machine="NETGEAR ${model_stripped:15}"
5556
;;
5657
*)
5758
# Unknown ID
58-
machine="NETGEAR $model"
59+
machine="NETGEAR ${model_stripped}"
5960
esac
6061
esac
6162

@@ -107,19 +108,22 @@ tplink_board_detect() {
107108
"015300"*)
108109
model="EasyLink EL-MINI"
109110
;;
110-
"04440001"*)
111-
model="BITMAIN ANTMINER S1"
111+
"044401"*)
112+
model="ANTMINER-S1"
112113
;;
113-
"04440003"*)
114-
model="BITMAIN ANTMINER S3"
114+
"044403"*)
115+
model="ANTMINER-S3"
115116
;;
116117
"120000"*)
117118
model="MERCURY MAC1200R"
118119
;;
119120
"3C0001"*)
120121
model="OOLITE"
121122
;;
122-
"070300"*)
123+
"3C0002"*)
124+
model="MINIBOX_V1"
125+
;;
126+
"070301"*)
123127
model="TP-Link TL-WR703N"
124128
;;
125129
"071000"*)
@@ -350,6 +354,15 @@ ar71xx_board_detect() {
350354
*ALL0315N)
351355
name="all0315n"
352356
;;
357+
*Antminer-S1)
358+
name="antminer-s1"
359+
;;
360+
*Antminer-S3)
361+
name="antminer-s3"
362+
;;
363+
*"Arduino Yun")
364+
name="arduino-yun"
365+
;;
353366
*AP113)
354367
name="ap113"
355368
;;
@@ -441,6 +454,9 @@ ar71xx_board_detect() {
441454
*"DIR-835 rev. A1")
442455
name="dir-835-a1"
443456
;;
457+
*"dLAN Hotspot")
458+
name="dlan-hotspot"
459+
;;
444460
*"dLAN pro 500 Wireless+")
445461
name="dlan-pro-500-wp"
446462
;;
@@ -450,6 +466,9 @@ ar71xx_board_detect() {
450466
*"Dragino v2")
451467
name="dragino2"
452468
;;
469+
*"Domino Pi")
470+
name="gl-domino"
471+
;;
453472
*"EAP300 v2")
454473
name="eap300v2"
455474
;;
@@ -466,6 +485,12 @@ ar71xx_board_detect() {
466485
name="gl-inet"
467486
gl_inet_board_detect
468487
;;
488+
*"GL AR150")
489+
name="gl-ar150"
490+
;;
491+
*"GL AR300")
492+
name="gl-ar300"
493+
;;
469494
*"EnGenius EPG5000")
470495
name="epg5000"
471496
;;
@@ -514,6 +539,9 @@ ar71xx_board_detect() {
514539
*"MAC1200R")
515540
name="mc-mac1200r"
516541
;;
542+
*"MiniBox V1.0")
543+
name="minibox-v1"
544+
;;
517545
*MR12)
518546
name="mr12"
519547
;;
@@ -556,6 +584,9 @@ ar71xx_board_detect() {
556584
*"NBG460N/550N/550NH")
557585
name="nbg460n_550n_550nh"
558586
;;
587+
*"Zyxel NBG6616")
588+
name="nbg6616"
589+
;;
559590
*"Zyxel NBG6716")
560591
name="nbg6716"
561592
;;
@@ -823,6 +854,9 @@ ar71xx_board_detect() {
823854
*"TL-WR941N/ND v5")
824855
name="tl-wr941nd-v5"
825856
;;
857+
*"TL-WR941N/ND v6")
858+
name="tl-wr941nd-v6"
859+
;;
826860
*"TL-WR703N v1")
827861
name="tl-wr703n"
828862
;;

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ platform_check_image() {
173173
;;
174174
alfa-ap96 | \
175175
alfa-nx | \
176+
arduino-yun | \
176177
ap113 | \
177178
ap121 | \
178179
ap121-mini | \
@@ -210,6 +211,7 @@ platform_check_image() {
210211
dir-615-i1 | \
211212
dir-825-c1 | \
212213
dir-835-a1 | \
214+
dlan-hotspot | \
213215
dlan-pro-500-wp | \
214216
dlan-pro-1200-ac | \
215217
dragino2 | \
@@ -218,6 +220,9 @@ platform_check_image() {
218220
esr900 | \
219221
ew-dorin | \
220222
ew-dorin-router | \
223+
gl-ar150 | \
224+
gl-ar300 | \
225+
gl-domino | \
221226
hiwifi-hc6361 | \
222227
hornet-ub-x2 | \
223228
mzk-w04nu | \
@@ -318,6 +323,7 @@ platform_check_image() {
318323
el-mini | \
319324
gl-inet | \
320325
mc-mac1200r | \
326+
minibox-v1 |\
321327
onion-omega | \
322328
oolite | \
323329
smart-300 | \
@@ -360,6 +366,7 @@ platform_check_image() {
360366
tl-wr842n-v2 | \
361367
tl-wr941nd | \
362368
tl-wr941nd-v5 | \
369+
tl-wr941nd-v6 | \
363370
tl-wr1041n-v2 | \
364371
tl-wr1043nd | \
365372
tl-wr1043nd-v2 | \
@@ -404,6 +411,7 @@ platform_check_image() {
404411
return 1
405412
;;
406413

414+
nbg6616 | \
407415
unifi-outdoor-plus | \
408416
uap-pro)
409417
[ "$magic_long" != "19852003" ] && {

‎overlay/target/linux/ar71xx/config-4.1‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ CONFIG_ATH79_MACH_AP81=y
4646
CONFIG_ATH79_MACH_AP83=y
4747
CONFIG_ATH79_MACH_AP96=y
4848
CONFIG_ATH79_MACH_ARCHER_C7=y
49+
CONFIG_ATH79_MACH_ARDUINO_YUN=y
4950
CONFIG_ATH79_MACH_AW_NR580=y
5051
CONFIG_ATH79_MACH_BHU_BXU2000N2_A=y
5152
CONFIG_ATH79_MACH_BSB=y
@@ -62,8 +63,10 @@ CONFIG_ATH79_MACH_DIR_615_C1=y
6263
CONFIG_ATH79_MACH_DIR_615_I1=y
6364
CONFIG_ATH79_MACH_DIR_825_B1=y
6465
CONFIG_ATH79_MACH_DIR_825_C1=y
66+
CONFIG_ATH79_MACH_DLAN_HOTSPOT=y
6567
CONFIG_ATH79_MACH_DLAN_PRO_1200_AC=y
6668
CONFIG_ATH79_MACH_DLAN_PRO_500_WP=y
69+
CONFIG_ATH79_MACH_GL_DOMINO=y
6770
CONFIG_ATH79_MACH_DRAGINO2=y
6871
CONFIG_ATH79_MACH_EAP300V2=y
6972
CONFIG_ATH79_MACH_EAP7660D=y
@@ -74,7 +77,10 @@ CONFIG_ATH79_MACH_ESR1750=y
7477
CONFIG_ATH79_MACH_ESR900=y
7578
CONFIG_ATH79_MACH_EW_DORIN=y
7679
CONFIG_ATH79_MACH_F9K1115V2=y
80+
CONFIG_ATH79_MACH_GL_AR150=y
81+
CONFIG_ATH79_MACH_GL_AR300=y
7782
CONFIG_ATH79_MACH_GL_INET=y
83+
CONFIG_ATH79_MACH_GS_MINIBOX_V1=y
7884
CONFIG_ATH79_MACH_GS_OOLITE=y
7985
CONFIG_ATH79_MACH_HIWIFI_HC6361=y
8086
CONFIG_ATH79_MACH_HORNET_UB=y
@@ -141,6 +147,7 @@ CONFIG_ATH79_MACH_TL_WR841N_V1=y
141147
CONFIG_ATH79_MACH_TL_WR841N_V8=y
142148
CONFIG_ATH79_MACH_TL_WR841N_V9=y
143149
CONFIG_ATH79_MACH_TL_WR941ND=y
150+
CONFIG_ATH79_MACH_TL_WR941ND_V6=y
144151
CONFIG_ATH79_MACH_TUBE2H=y
145152
CONFIG_ATH79_MACH_UBNT=y
146153
CONFIG_ATH79_MACH_UBNT_XM=y
@@ -192,6 +199,8 @@ CONFIG_CPU_R4K_FPU=y
192199
CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
193200
CONFIG_CPU_SUPPORTS_HIGHMEM=y
194201
CONFIG_CPU_SUPPORTS_MSA=y
202+
CONFIG_CRYPTO_RNG2=y
203+
CONFIG_CRYPTO_WORKQUEUE=y
195204
CONFIG_CSRC_R4K=y
196205
CONFIG_DMA_NONCOHERENT=y
197206
CONFIG_EARLY_PRINTK=y
@@ -333,7 +342,7 @@ CONFIG_SOC_AR933X=y
333342
CONFIG_SOC_AR934X=y
334343
CONFIG_SOC_QCA953X=y
335344
CONFIG_SOC_QCA955X=y
336-
# CONFIG_SOC_QCA956X is not set
345+
CONFIG_SOC_QCA956X=y
337346
CONFIG_SPI=y
338347
CONFIG_SPI_AP83=y
339348
CONFIG_SPI_ATH79=y

0 commit comments

Comments
 (0)