0d07d179d8
This reverts commit 582635b031.
The segfault issue has disappeared, so the workaround is not needed
anymore.
100 lines
2.8 KiB
Diff
100 lines
2.8 KiB
Diff
From: Mathias Kresin <dev@kresin.me>
|
|
Date: Fri, 7 Apr 2017 23:52:27 +0200
|
|
Subject: ramips: prepare ZBT-WG3526 for hardware variants
|
|
|
|
The ZBT-WG3526 is available with 16 or 32 MByte of flash. Rename the
|
|
current supported 16MByte version to indicate which flash size variant
|
|
is supported.
|
|
|
|
Signed-off-by: Mathias Kresin <dev@kresin.me>
|
|
|
|
Conflicts (Resolved):
|
|
target/linux/ramips/image/mt7621.mk
|
|
|
|
Signed-off-by: Vincent Wiemann <me@bibbl.com>
|
|
|
|
further adjustments for backport to lede-17.01 branch
|
|
|
|
Signed-off-by: Andreas Ziegler <github@andreas-ziegler.de>
|
|
|
|
diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
|
|
index b1091f66b2897a19bd01d4a26a1b3647656fa62b..8e27a79fc1744d6bed9db8d930207c418899cab1 100755
|
|
--- a/target/linux/ramips/base-files/lib/ramips.sh
|
|
+++ b/target/linux/ramips/base-files/lib/ramips.sh
|
|
@@ -637,8 +637,8 @@ ramips_board_detect() {
|
|
*"ZBT-WG2626")
|
|
name="zbt-wg2626"
|
|
;;
|
|
- *"ZBT-WG3526")
|
|
- name="zbt-wg3526"
|
|
+ *"ZBT-WG3526 (16M)")
|
|
+ name="zbt-wg3526-16M"
|
|
;;
|
|
*"ZBT-WR8305RT")
|
|
name="zbt-wr8305rt"
|
|
diff --git a/target/linux/ramips/dts/ZBT-WG3526-16M.dts b/target/linux/ramips/dts/ZBT-WG3526-16M.dts
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..fb644502071d6641194c66baf552035937f35669
|
|
--- /dev/null
|
|
+++ b/target/linux/ramips/dts/ZBT-WG3526-16M.dts
|
|
@@ -0,0 +1,15 @@
|
|
+/dts-v1/;
|
|
+
|
|
+#include "ZBT-WG3526.dtsi"
|
|
+
|
|
+/ {
|
|
+ model = "ZBT-WG3526 (16M)";
|
|
+};
|
|
+
|
|
+&firmware {
|
|
+ reg = <0x50000 0xfb0000>;
|
|
+};
|
|
+
|
|
+&status_led {
|
|
+ label = "zbt-wg3526:green:status";
|
|
+};
|
|
diff --git a/target/linux/ramips/dts/ZBT-WG3526.dts b/target/linux/ramips/dts/ZBT-WG3526.dts
|
|
deleted file mode 100644
|
|
index c361bdd827bffdc24405b1a1b191403ebeec46d0..0000000000000000000000000000000000000000
|
|
--- a/target/linux/ramips/dts/ZBT-WG3526.dts
|
|
+++ /dev/null
|
|
@@ -1,15 +0,0 @@
|
|
-/dts-v1/;
|
|
-
|
|
-#include "ZBT-WG3526.dtsi"
|
|
-
|
|
-/ {
|
|
- model = "ZBT-WG3526";
|
|
-};
|
|
-
|
|
-&firmware {
|
|
- reg = <0x50000 0xfb0000>;
|
|
-};
|
|
-
|
|
-&status_led {
|
|
- label = "zbt-wg3526:green:status";
|
|
-};
|
|
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
|
|
index 8218bea84410536151a216cd2cc0300369ad977a..cabc86b28eb040f0d1e58d917e6edc4a97e80db7 100644
|
|
--- a/target/linux/ramips/image/mt7621.mk
|
|
+++ b/target/linux/ramips/image/mt7621.mk
|
|
@@ -226,13 +226,14 @@ define Device/zbt-wg2626
|
|
endef
|
|
TARGET_DEVICES += zbt-wg2626
|
|
|
|
-define Device/zbt-wg3526
|
|
- DTS := ZBT-WG3526
|
|
+define Device/zbt-wg3526-16M
|
|
+ DTS := ZBT-WG3526-16M
|
|
IMAGE_SIZE := $(ralink_default_fw_size_16M)
|
|
- DEVICE_TITLE := ZBT WG3526
|
|
+ SUPPORTED_DEVICES += zbt-wg3526
|
|
+ DEVICE_TITLE := ZBT WG3526 (16MB flash)
|
|
DEVICE_PACKAGES := kmod-usb3 kmod-usb-ledtrig-usbport kmod-ata-core kmod-ata-ahci
|
|
endef
|
|
-TARGET_DEVICES += zbt-wg3526
|
|
+TARGET_DEVICES += zbt-wg3526-16M
|
|
|
|
# FIXME: is this still needed?
|
|
define Image/Prepare
|