Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Split the various Mikrotik radios into their individual variants (#677)

This commit is contained in:
Tim Wilkinson 2023-01-26 13:34:48 -08:00 committed by GitHub
parent 0277b5e7ba
commit ee3fa7f955
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 220 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SUPPORTED_DEVICES.md
View File

@ -6,10 +6,14 @@ Device | Band | Target | Subtarget | Image | RAM | Stability | Status
Mikrotik Basebox RB912UAG-2HPnD | 2 | ath79 | mikrotik | mikrotik-912uag-2hpnd | 64MB | unknown | released
Mikrotik Basebox RB912UAG-5HPnD | 5 | ath79 | mikrotik | mikrotik-912uag-5hpnd | 64MB | stable | reinstall
Mikrotik hAP ac lite 952Ui-5ac2nD | 2 | ath79 | mikrotik | mikrotik-952ui-5ac2nd | 64MB | stable | released
Mikrotik RBLHG-2nD(-XL) | 2 | ath79 | mikrotik | mikrotik-lhg-2nd | 64MB | stable | released
Mikrotik RBLHG-2nD | 2 | ath79 | mikrotik | mikrotik-lhg-2nd | 64MB | stable | released
Mikrotik RBLHG-2HPnD | 2 | ath79 | mikrotik | mikrotik-lhg-2hpnd | 64MB | stable | released
Mikrotik RBLHG-2HPnD-XL | 2 | ath79 | mikrotik | mikrotik-lhg-2hpnd-xl | 64MB | stable | released
Mikrotik RBLHG-5nD | 5 | ath79 | mikrotik | mikrotik-lhg-5nd | 64MB | stable | released
Mikrotik RBLHG-5HPnD(-XL) | 5 | ath79 | mikrotik | mikrotik-lhg-5nd | 64MB | stable | released
MikroTik RBLHGG-5acD(-XL) | 5 | ipq40xx | mikrotik | mikrotik_lhgg-5acd | 256MB | stable | nightly
Mikrotik RBLHG-5HPnD | 5 | ath79 | mikrotik | mikrotik-lhg-5hpnd | 64MB | stable | released
Mikrotik RBLHG-5HPnD-XL | 5 | ath79 | mikrotik | mikrotik-lhg-5hpnd-xl | 64MB | stable | released
MikroTik RBLHGG-5acD | 5 | ipq40xx | mikrotik | mikrotik_lhgg-5acd | 256MB | stable | nightly
MikroTik RBLHGG-5acD-XL | 5 | ipq40xx | mikrotik | mikrotik_lhgg-5acd-xl | 256MB | stable | nightly
Mikrotik RBLDF-2nD | 2 | ath79 | mikrotik | - | 64MB | unknown | released
Mikrotik RBLDF-5nD | 5 | ath79 | mikrotik | mikrotik-ldf-5nd | 64MB | stable | nightly
Mikrotik QRT5 RB911G-5HPnD-QRT | 5 | ath79 | mikrotik | - | 64MB | unknown | released
@ -19,7 +23,7 @@ Mikrotik mANTBox RB912UAG-2HPnD | 2 | ath79 | mikrotik | mikrotik-912uag-2hpnd |
Mikrotik mANTBox RB912UAG-5HPnD | 5 | ath79 | mikrotik | mikrotik-912uag-5hpnd | 128MB | stable | released
Mikrotik mANTBox RB921GS-5HPacD 15s | 5 | ath79 | mikrotik | mikrotik-921gs-5hpacd-15s | 128MB | stable | nightly
Mikrotik mANTBox RB921GS-5HPacD 19s | 5 | ath79 | mikrotik | mikrotik-921gs-5hpacd-19s | 128MB | stable | nightly
Mikrotik SXTsq 5HPnD | 5 | ath79 | mikrotik | mikrotik-sxt-5nd | 64MB | stable | released
Mikrotik SXTsq 5HPnD | 5 | ath79 | mikrotik | mikrotik-sxt-5hpnd | 64MB | stable | released
Mikrotik SXTsq 5nD | 5 | ath79 | mikrotik | mikrotik-sxt-5nd | 64MB | stable | released
Mikrotik SXTsq 2nD | 2 | ath79 | mikrotik | - | 64MB | unknown | released
MikroTik RouterBOARD D52G-5HacD2HnD | 2 | ipq40xx | mikrotik | mikrotik_hap-ac2 | 128MB | stable | nightly

6
configs/ath79-mikrotik.config
View File

@ -2,9 +2,13 @@ CONFIG_TARGET_ath79=y
CONFIG_TARGET_ath79_mikrotik=y
CONFIG_TARGET_DEVICE_ath79_mikrotik_DEVICE_mikrotik_routerboard-952ui-5ac2nd=y
CONFIG_TARGET_DEVICE_ath79_mikrotik_DEVICE_mikrotik_routerboard-lhg-2nd=y
CONFIG_TARGET_DEVICE_ath79_mikrotik_DEVICE_mikrotik_routerboard-lhg-2hpnd=y
CONFIG_TARGET_DEVICE_ath79_mikrotik_DEVICE_mikrotik_routerboard-lhg-2hpnd-xl=y
CONFIG_TARGET_DEVICE_ath79_mikrotik_DEVICE_mikrotik_routerboard-lhg-5nd=y
CONFIG_TARGET_DEVICE_ath79_mikrotik_DEVICE_mikrotik_routerboard-lhg-5hpnd=y
CONFIG_TARGET_DEVICE_ath79_mikrotik_DEVICE_mikrotik_routerboard-lhg-5hpnd-xl=y
CONFIG_TARGET_DEVICE_ath79_mikrotik_DEVICE_mikrotik_routerboard-sxt-5nd=y
CONFIG_TARGET_DEVICE_ath79_mikrotik_DEVICE_mikrotik_routerboard-sxt-5nd-r2=y
CONFIG_TARGET_DEVICE_ath79_mikrotik_DEVICE_mikrotik_routerboard-sxt-5hpnd=y
CONFIG_TARGET_DEVICE_ath79_mikrotik_DEVICE_mikrotik_routerboard-ldf-5nd=y
#

1
configs/ipq40xx-mikrotik.config
View File

@ -3,6 +3,7 @@ CONFIG_TARGET_ipq40xx_mikrotik=y
CONFIG_TARGET_DEVICE_ipq40xx_mikrotik_DEVICE_mikrotik_hap-ac2=y
CONFIG_TARGET_DEVICE_ipq40xx_mikrotik_DEVICE_mikrotik_hap-ac3=y
CONFIG_TARGET_DEVICE_ipq40xx_mikrotik_DEVICE_mikrotik_lhgg-5acd=y
CONFIG_TARGET_DEVICE_ipq40xx_mikrotik_DEVICE_mikrotik_lhgg-5acd-xl=y
CONFIG_TARGET_DEVICE_ipq40xx_mikrotik_DEVICE_mikrotik_sxtsq-5-ac=y
#

18
files/etc/radios.json
View File

@ -493,6 +493,15 @@
"usechains" : true,
"rfband" : "5800ubntus"
},
"MikroTik LHG 5 ac XL (RBLHGG-5acD-XL)": {
"name" : "MikroTik LHG 5 ac XL (RBLHGG-5acD-XL)",
"comment" : "",
"supported" : "1",
"maxpower" : "25",
"pwroffset" : "0",
"usechains" : true,
"rfband" : "5800ubntus"
},
"MikroTik RouterBOARD SXTsq 5nD" : {
"name" : "MikroTik RouterBOARD SXTsq 5nD",
"comment" : "",
@ -551,6 +560,15 @@
"name" : "MikroTik RouterBOARD SXT 5nD (SXT Lite5)",
"comment" : "",
"supported" : "1",
"maxpower" : "25",
"pwroffset" : "0",
"usechains" : true,
"rfband" : "5800ubntus"
},
"MikroTik RouterBOARD SXT 5HPnD (SXT 5 High Power)": {
"name" : "MikroTik RouterBOARD SXT 5HPnD (SXT 5 High Power)",
"comment" : "",
"supported" : "1",
"maxpower" : "28",
"pwroffset" : "0",
"usechains" : true,

9
patches/708-define-aredn-ath79-networks.patch
View File

@ -210,11 +210,12 @@
ucidef_set_interface_wan "eth1"
--- a/target/linux/ath79/mikrotik/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/mikrotik/base-files/etc/board.d/02_network
@@ -19,6 +19,8 @@
@@ -19,6 +19,9 @@
mikrotik,routerboard-lhg-5nd|\
mikrotik,routerboard-mapl-2nd|\
mikrotik,routerboard-sxt-5nd-r2|\
+ mikrotik,routerboard-sxt-5nd|\
+ mikrotik,routerboard-sxt-5hpnd|\
+ mikrotik,routerboard-ldf-5nd|\
mikrotik,routerboard-wap-2nd|\
mikrotik,routerboard-wap-g-5hact2hnd|\
@ -280,11 +281,12 @@
--- a/target/linux/ath79/mikrotik/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/mikrotik/base-files/etc/board.d/02_network
@@ -67,6 +68,8 @@
@@ -67,6 +68,9 @@
mikrotik,routerboard-map-2nd|\
mikrotik,routerboard-mapl-2nd|\
mikrotik,routerboard-sxt-5nd-r2|\
+ mikrotik,routerboard-sxt-5nd|\
+ mikrotik,routerboard-sxt-5hpnd|\
+ mikrotik,routerboard-ldf-5nd|\
mikrotik,routerboard-wap-2nd|\
mikrotik,routerboard-wap-g-5hact2hnd|\
@ -318,11 +320,12 @@
--- a/target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
+++ b/target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
@@ -26,6 +26,8 @@
@@ -26,6 +26,9 @@
mikrotik,routerboard-912uag-2hpnd|\
mikrotik,routerboard-lhg-2nd|\
mikrotik,routerboard-lhg-5nd|\
+ mikrotik,routerboard-sxt-5nd|\
+ mikrotik,routerboard-sxt-5hpnd|\
+ mikrotik,routerboard-ldf-5nd|\
mikrotik,routerboard-sxt-5nd-r2|\
mikrotik,routerboard-wap-2nd|\

47
patches/747-mikrotik-extra-support.patch
View File

@ -1,6 +1,6 @@
--- a/target/linux/ath79/image/mikrotik.mk
+++ a/target/linux/ath79/image/mikrotik.mk
@@ -102,6 +102,25 @@
@@ -102,6 +102,34 @@
endef
TARGET_DEVICES += mikrotik_routerboard-mapl-2nd
@ -14,6 +14,15 @@
+endef
+TARGET_DEVICES += mikrotik_routerboard-ldf-5nd
+
+define Device/mikrotik_routerboard-sxt-5hpnd
+ $(Device/mikrotik_nor)
+ SOC := ar9344
+ DEVICE_MODEL := RouterBOARD SXT 5HPnD (SXT 5 High Power)
+ DEVICE_PACKAGES += rssileds
+ IMAGE_SIZE := 16256k
+endef
+TARGET_DEVICES += mikrotik_routerboard-sxt-5hpnd
+
+define Device/mikrotik_routerboard-sxt-5nd
+ $(Device/mikrotik_nor)
+ SOC := ar9344
@ -215,9 +224,20 @@
+
+ compatible = "syscon", "simple-mfd";
+};
--- /dev/null
+++ b/target/linux/ath79/dts/ar9344_mikrotik_routerboard-sxt-5hpnd.dts
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include "ar9344_mikrotik_routerboard-sxt-5nd.dts"
+
+/ {
+ compatible = "mikrotik,routerboard-sxt-5hpnd", "qca,ar9344";
+ model = "MikroTik RouterBOARD SXT 5HPnD (SXT 5 High Power)";
+};
--- a/target/linux/ipq40xx/image/mikrotik.mk
+++ b/target/linux/ipq40xx/image/mikrotik.mk
@@ -62,3 +62,11 @@
@@ -62,3 +62,19 @@
DEVICE_PACKAGES := rssileds
endef
TARGET_DEVICES += mikrotik_sxtsq-5-ac
@ -229,13 +249,21 @@
+ DEVICE_PACKAGES := rssileds
+endef
+TARGET_DEVICES += mikrotik_lhgg-5acd
+
+define Device/mikrotik_lhgg-5acd-xl
+ $(call Device/mikrotik_nor)
+ DEVICE_MODEL := RouterBOARD LHG 5 AC XL
+ SOC := qcom-ipq4018
+ DEVICE_PACKAGES := rssileds
+endef
+TARGET_DEVICES += mikrotik_lhgg-5acd-xl
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -35,6 +35,7 @@
zyxel,wre6606)
ucidef_set_interface_lan "eth0"
;;
+ mikrotik,lhgg-5acd|\
+ mikrotik,lhgg-5acd*|\
mikrotik,sxtsq-5-ac)
ucidef_set_interfaces_lan_wan "lan" "lan.1"
ucidef_set_interface "wifi" device "wlan0" protocol "static"
@ -243,7 +271,7 @@
label_mac="$wan_mac"
;;
mikrotik,lhgg-60ad|\
+ mikrotik,lhgg-5acd|\
+ mikrotik,lhgg-5acd*|\
mikrotik,sxtsq-5-ac)
lan_mac=$(cat /sys/firmware/mikrotik/hard_config/mac_base)
label_mac="$lan_mac"
@ -489,6 +517,17 @@
+ label = "lan";
+ phy-mode = "rgmii";
+};
--- /dev/null
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-lhgg-5acd-xl.dts
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include "qcom-ipq4018-lhgg-5acd.dts"
+
+/ {
+ compatible = "mikrotik,lhgg-5acd-xl";
+ model = "MikroTik LHG 5 ac XL (RBLHGG-5acD-XL)";
+};
--- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -197,6 +197,7 @@

138
patches/801-mikrotik-lhg-variants.patch Executable file
View File

@ -0,0 +1,138 @@
--- a/target/linux/ath79/image/mikrotik.mk
+++ b/target/linux/ath79/image/mikrotik.mk
@@ -96,6 +96,24 @@
endef
TARGET_DEVICES += mikrotik_routerboard-lhg-2nd
+define Device/mikrotik_routerboard-lhg-2hpnd
+ $(Device/mikrotik_nor)
+ SOC := qca9533
+ DEVICE_MODEL := RouterBOARD LHG 2HPnD (LHG 2)
+ IMAGE_SIZE := 16256k
+ SUPPORTED_DEVICES += rb-lhg-2hpnd mikrotik,routerboard-lhg-2nd
+endef
+TARGET_DEVICES += mikrotik_routerboard-lhg-2hpnd
+
+define Device/mikrotik_routerboard-lhg-2hpnd-xl
+ $(Device/mikrotik_nor)
+ SOC := qca9533
+ DEVICE_MODEL := RouterBOARD LHG 2HPnD-XL (LHG 2)
+ IMAGE_SIZE := 16256k
+ SUPPORTED_DEVICES += rb-lhg-2hpnd-xl mikrotik,routerboard-lhg-2nd
+endef
+TARGET_DEVICES += mikrotik_routerboard-lhg-2hpnd-xl
+
define Device/mikrotik_routerboard-lhg-5nd
$(Device/mikrotik_nor)
SOC := ar9344
@@ -106,6 +124,26 @@
endef
TARGET_DEVICES += mikrotik_routerboard-lhg-5nd
+define Device/mikrotik_routerboard-lhg-5hpnd
+ $(Device/mikrotik_nor)
+ SOC := ar9344
+ DEVICE_MODEL := RouterBOARD LHG 5HPnD (LHG 5)
+ DEVICE_PACKAGES += rssileds
+ IMAGE_SIZE := 16256k
+ SUPPORTED_DEVICES += rb-lhg-5hpnd mikrotik,routerboard-lhg-5nd
+endef
+TARGET_DEVICES += mikrotik_routerboard-lhg-5hpnd
+
+define Device/mikrotik_routerboard-lhg-5hpnd-xl
+ $(Device/mikrotik_nor)
+ SOC := ar9344
+ DEVICE_MODEL := RouterBOARD LHG 5HPnD-XL (LHG 5)
+ DEVICE_PACKAGES += rssileds
+ IMAGE_SIZE := 16256k
+ SUPPORTED_DEVICES += rb-lhg-5hpnd-xl mikrotik,routerboard-lhg-5nd
+endef
+TARGET_DEVICES += mikrotik_routerboard-lhg-5hpnd-xl
+
define Device/mikrotik_routerboard-map-2nd
$(Device/mikrotik_nor)
SOC := qca9533
--- /dev/null
+++ b/target/linux/ath79/dts/qca9533_mikrotik_routerboard-lhg-2hpnd.dts
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include "qca9533_mikrotik_routerboard-lhg-2nd.dts"
+
+/ {
+ compatible = "mikrotik,routerboard-lhg-2hpnd", "qca,qca9533";
+ model = "MikroTik RouterBOARD LHG 2HPnD";
+};
--- /dev/null
+++ b/target/linux/ath79/dts/qca9533_mikrotik_routerboard-lhg-2hpnd-xl.dts
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include "qca9533_mikrotik_routerboard-lhg-2nd.dts"
+
+/ {
+ compatible = "mikrotik,routerboard-lhg-2hpnd-xl", "qca,qca9533";
+ model = "MikroTik RouterBOARD LHG 2HPnD-XL";
+};
--- /dev/null
+++ b/target/linux/ath79/dts/ar9344_mikrotik_routerboard-lhg-5hpnd.dts
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include "ar9344_mikrotik_routerboard-lhg-5nd.dts"
+
+/ {
+ compatible = "mikrotik,routerboard-lhg-5hpnd", "qca,qca9533";
+ model = "MikroTik RouterBOARD LHG 5HPnD";
+};
--- /dev/null
+++ b/target/linux/ath79/dts/ar9344_mikrotik_routerboard-lhg-5hpnd-xl.dts
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include "ar9344_mikrotik_routerboard-lhg-5nd.dts"
+
+/ {
+ compatible = "mikrotik,routerboard-lhg-5hpnd-xl", "qca,qca9533";
+ model = "MikroTik RouterBOARD LHG 5HPnD-XL";
+};
--- a/target/linux/ath79/mikrotik/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/mikrotik/base-files/etc/board.d/02_network
@@ -17,7 +17,11 @@
mikrotik,routerboard-912uag-2hpnd|\
mikrotik,routerboard-912uag-5hpnd|\
mikrotik,routerboard-lhg-2nd|\
+ mikrotik,routerboard-lhg-2hpnd|\
+ mikrotik,routerboard-lhg-2hpnd-xl|\
mikrotik,routerboard-lhg-5nd|\
+ mikrotik,routerboard-lhg-5hpnd|\
+ mikrotik,routerboard-lhg-5hpnd-xl|\
mikrotik,routerboard-mapl-2nd|\
mikrotik,routerboard-sxt-5nd-r2|\
mikrotik,routerboard-sxt-5nd|\
@@ -73,7 +77,11 @@
mikrotik,routerboard-912uag-2hpnd|\
mikrotik,routerboard-912uag-5hpnd|\
mikrotik,routerboard-lhg-2nd|\
+ mikrotik,routerboard-lhg-2hpnd|\
+ mikrotik,routerboard-lhg-2hpnd-xl|\
mikrotik,routerboard-lhg-5nd|\
+ mikrotik,routerboard-lhg-5hpnd|\
+ mikrotik,routerboard-lhg-5hpnd-xl|\
mikrotik,routerboard-map-2nd|\
mikrotik,routerboard-mapl-2nd|\
mikrotik,routerboard-sxt-5nd-r2|\
--- a/target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
+++ b/target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
@@ -26,7 +26,11 @@
mikrotik,routerboard-912uag-2hpnd|\
mikrotik,routerboard-912uag-5hpnd|\
mikrotik,routerboard-lhg-2nd|\
+ mikrotik,routerboard-lhg-2hpnd|\
+ mikrotik,routerboard-lhg-2hpnd-xl|\
mikrotik,routerboard-lhg-5nd|\
+ mikrotik,routerboard-lhg-5hpnd|\
+ mikrotik,routerboard-lhg-5hpnd-xl|\
mikrotik,routerboard-sxt-5nd|\
mikrotik,routerboard-ldf-5nd|\
mikrotik,routerboard-sxt-5nd-r2|\

1
patches/series
View File

@ -36,3 +36,4 @@
749-fix-tiny.patch
750-ibss-2g-fix.patch
800-upgrade-compatibility.patch
801-mikrotik-lhg-variants.patch