From cc78b0c4a729868638257374f1cbad81233cddeb Mon Sep 17 00:00:00 2001 From: Tim Wilkinson Date: Fri, 7 Apr 2023 12:46:09 -0700 Subject: [PATCH] Mikrotik SXT Lite2 support --- SUPPORTED_DEVICES.md | 2 +- configs/ath79-mikrotik.config | 1 + files/etc/radios.json | 9 +++++++ patches/801-mikrotik-lhg-variants.patch | 31 +++++++++++++++++++++---- 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/SUPPORTED_DEVICES.md b/SUPPORTED_DEVICES.md index 7cb01d36..6d1522d7 100644 --- a/SUPPORTED_DEVICES.md +++ b/SUPPORTED_DEVICES.md @@ -6,7 +6,7 @@ Device | SKUs | Band | Target | Subtarget | Image | RAM | Stability | Status hAP ac lite
hAP ac lite TC | RB952Ui-5ac2nD
RB952Ui-5ac2nD-TC | 2 | ath79 | mikrotik | mikrotik-952ui-5ac2nd | 64MB | stable | released hAP ac² | RBD52G-5HacD2HnD-TC | 2 | ipq40xx | mikrotik | mikrotik_hap-ac2 | 128MB | stable | nightly hAP ac³ | RBD53iG-5HacD2HnD | 2 | ipq40xx | mikrotik | mikrotik_hap-ac3 | 256MB | stable | nightly -SXTsq Lite2 | RBSXTsq2nD | 2 | ath79 | mikrotik | - | 64MB | unknown | released +SXTsq Lite2 | RBSXTsq2nD | 2 | ath79 | mikrotik | mikrotik-sxt-2nd | 64MB | unknown | released SXTsq Lite5 | RBSXTsq5nD | 5 | ath79 | mikrotik | mikrotik-sxt-5nd | 64MB | stable | released SXTsq 5 High Power | RBSXTsq5HPnD | 5 | ath79 | mikrotik | mikrotik-sxt-5hpnd | 64MB | stable | released SXTsq 5 ac | RBSXTsqG-5acD | 5 | ipq40xx | mikrotik | mikrotik_sxtsq-5-ac | 256MB | stable | nightly diff --git a/configs/ath79-mikrotik.config b/configs/ath79-mikrotik.config index 7c47058e..ed4fc8a6 100644 --- a/configs/ath79-mikrotik.config +++ b/configs/ath79-mikrotik.config @@ -3,6 +3,7 @@ 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-2nd-xl=y +CONFIG_TARGET_DEVICE_ath79_mikrotik_DEVICE_mikrotik_routerboard-sxt-2nd=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 diff --git a/files/etc/radios.json b/files/etc/radios.json index d092daa2..c9cc752d 100644 --- a/files/etc/radios.json +++ b/files/etc/radios.json @@ -556,6 +556,15 @@ "usechains" : true, "rfband" : "2400" }, + "MikroTik RouterBOARD SXT 2nD (SXT Lite2)": { + "name" : "MikroTik RouterBOARD SXT 2nD (SXT Lite2)", + "comment" : "", + "supported" : "1", + "maxpower" : "30", + "pwroffset" : "0", + "usechains" : true, + "rfband" : "2400" + }, "MikroTik RouterBOARD SXTsq 5HPnD" : { "name" : "MikroTik RouterBOARD SXTsq 5HPnD", "comment" : "", diff --git a/patches/801-mikrotik-lhg-variants.patch b/patches/801-mikrotik-lhg-variants.patch index e61027c2..71d5cb78 100755 --- a/patches/801-mikrotik-lhg-variants.patch +++ b/patches/801-mikrotik-lhg-variants.patch @@ -1,6 +1,6 @@ --- a/target/linux/ath79/image/mikrotik.mk +++ b/target/linux/ath79/image/mikrotik.mk -@@ -96,6 +96,15 @@ +@@ -96,6 +96,24 @@ endef TARGET_DEVICES += mikrotik_routerboard-lhg-2nd @@ -12,6 +12,15 @@ + SUPPORTED_DEVICES += rb-lhg-2nd-xl mikrotik,routerboard-lhg-2nd +endef +TARGET_DEVICES += mikrotik_routerboard-lhg-2nd-xl ++ ++define Device/mikrotik_routerboard-sxt-2nd ++ $(Device/mikrotik_nor) ++ SOC := qca9533 ++ DEVICE_MODEL := RouterBOARD SXT 2nD (SXT Lite2) ++ IMAGE_SIZE := 16256k ++ SUPPORTED_DEVICES += rb-sxt-2nd ++endef ++TARGET_DEVICES += mikrotik_routerboard-sxt-2nd + define Device/mikrotik_routerboard-lhg-5nd $(Device/mikrotik_nor) @@ -76,9 +85,20 @@ + compatible = "mikrotik,routerboard-lhg-5hpnd-xl", "qca,qca9533"; + model = "MikroTik RouterBOARD LHG 5HPnD-XL"; +}; +--- /dev/null ++++ b/target/linux/ath79/dts/qca9533_mikrotik_routerboard-sxt-2nd.dts +@@ -0,0 +1,8 @@ ++// SPDX-License-Identifier: GPL-2.0-only ++ ++#include "qca9533_mikrotik_routerboard-lhg-2nd.dts" ++ ++/ { ++ compatible = "mikrotik,routerboard-sxt-2nd", "qca,qca9533"; ++ model = "MikroTik RouterBOARD SXT 2nD (SXT Lite2)"; ++}; --- 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,10 @@ +@@ -17,7 +17,11 @@ mikrotik,routerboard-912uag-2hpnd|\ mikrotik,routerboard-912uag-5hpnd|\ mikrotik,routerboard-lhg-2nd|\ @@ -86,10 +106,11 @@ mikrotik,routerboard-lhg-5nd|\ + mikrotik,routerboard-lhg-5hpnd|\ + mikrotik,routerboard-lhg-5hpnd-xl|\ ++ mikrotik,routerboard-sxt-2nd|\ mikrotik,routerboard-mapl-2nd|\ mikrotik,routerboard-sxt-5nd-r2|\ mikrotik,routerboard-sxt-5nd|\ -@@ -73,7 +77,10 @@ +@@ -73,7 +77,11 @@ mikrotik,routerboard-912uag-2hpnd|\ mikrotik,routerboard-912uag-5hpnd|\ mikrotik,routerboard-lhg-2nd|\ @@ -97,12 +118,13 @@ mikrotik,routerboard-lhg-5nd|\ + mikrotik,routerboard-lhg-5hpnd|\ + mikrotik,routerboard-lhg-5hpnd-xl|\ ++ mikrotik,routerboard-sxt-2nd|\ 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,10 @@ +@@ -26,7 +26,11 @@ mikrotik,routerboard-912uag-2hpnd|\ mikrotik,routerboard-912uag-5hpnd|\ mikrotik,routerboard-lhg-2nd|\ @@ -110,6 +132,7 @@ mikrotik,routerboard-lhg-5nd|\ + mikrotik,routerboard-lhg-5hpnd|\ + mikrotik,routerboard-lhg-5hpnd-xl|\ ++ mikrotik,routerboard-sxt-2nd|\ mikrotik,routerboard-sxt-5nd|\ mikrotik,routerboard-ldf-5nd|\ mikrotik,routerboard-sxt-5nd-r2|\