Fix lhg 2nd versions 01/27/2023 (#682)

This commit is contained in:
Tim Wilkinson 2023-01-27 20:09:37 -08:00 committed by GitHub
parent d6a6261a46
commit 1db2012470
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 41 deletions

View File

@ -7,8 +7,7 @@ Mikrotik Basebox RB912UAG-2HPnD | 2 | ath79 | mikrotik | mikrotik-912uag-2hpnd |
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 | 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-2nD-XL | 2 | ath79 | mikrotik | mikrotik-lhg-2nd-xl | 64MB | stable | released
Mikrotik RBLHG-5nD | 5 | ath79 | mikrotik | mikrotik-lhg-5nd | 64MB | stable | released
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

View File

@ -2,8 +2,7 @@ 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-2nd-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

View File

@ -1,26 +1,17 @@
--- a/target/linux/ath79/image/mikrotik.mk
+++ b/target/linux/ath79/image/mikrotik.mk
@@ -96,6 +96,24 @@
@@ -96,6 +96,15 @@
endef
TARGET_DEVICES += mikrotik_routerboard-lhg-2nd
+define Device/mikrotik_routerboard-lhg-2hpnd
+define Device/mikrotik_routerboard-lhg-2nd-xl
+ $(Device/mikrotik_nor)
+ SOC := qca9533
+ DEVICE_MODEL := RouterBOARD LHG 2HPnD (LHG 2)
+ DEVICE_MODEL := RouterBOARD LHG 2nD-XL (LHG 2)
+ IMAGE_SIZE := 16256k
+ SUPPORTED_DEVICES += rb-lhg-2hpnd mikrotik,routerboard-lhg-2nd
+ SUPPORTED_DEVICES += rb-lhg-2nd-xl 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
+TARGET_DEVICES += mikrotik_routerboard-lhg-2nd-xl
+
define Device/mikrotik_routerboard-lhg-5nd
$(Device/mikrotik_nor)
@ -53,26 +44,15 @@
$(Device/mikrotik_nor)
SOC := qca9533
--- /dev/null
+++ b/target/linux/ath79/dts/qca9533_mikrotik_routerboard-lhg-2hpnd.dts
+++ b/target/linux/ath79/dts/qca9533_mikrotik_routerboard-lhg-2nd-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", "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";
+ compatible = "mikrotik,routerboard-lhg-2nd-xl", "qca,qca9533";
+ model = "MikroTik RouterBOARD LHG 2nD-XL";
+};
--- /dev/null
+++ b/target/linux/ath79/dts/ar9344_mikrotik_routerboard-lhg-5hpnd.dts
@ -98,24 +78,22 @@
+};
--- 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 @@
@@ -17,7 +17,10 @@
mikrotik,routerboard-912uag-2hpnd|\
mikrotik,routerboard-912uag-5hpnd|\
mikrotik,routerboard-lhg-2nd|\
+ mikrotik,routerboard-lhg-2hpnd|\
+ mikrotik,routerboard-lhg-2hpnd-xl|\
+ mikrotik,routerboard-lhg-2nd-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 @@
@@ -73,7 +77,10 @@
mikrotik,routerboard-912uag-2hpnd|\
mikrotik,routerboard-912uag-5hpnd|\
mikrotik,routerboard-lhg-2nd|\
+ mikrotik,routerboard-lhg-2hpnd|\
+ mikrotik,routerboard-lhg-2hpnd-xl|\
+ mikrotik,routerboard-lhg-2nd-xl|\
mikrotik,routerboard-lhg-5nd|\
+ mikrotik,routerboard-lhg-5hpnd|\
+ mikrotik,routerboard-lhg-5hpnd-xl|\
@ -124,12 +102,11 @@
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 @@
@@ -26,7 +26,10 @@
mikrotik,routerboard-912uag-2hpnd|\
mikrotik,routerboard-912uag-5hpnd|\
mikrotik,routerboard-lhg-2nd|\
+ mikrotik,routerboard-lhg-2hpnd|\
+ mikrotik,routerboard-lhg-2hpnd-xl|\
+ mikrotik,routerboard-lhg-2nd-xl|\
mikrotik,routerboard-lhg-5nd|\
+ mikrotik,routerboard-lhg-5hpnd|\
+ mikrotik,routerboard-lhg-5hpnd-xl|\