[source] ramips: add ZBT-WE826 32MB variant
LEDE Commits
lede-commits at lists.infradead.org
Tue Apr 25 10:30:40 PDT 2017
mkresin pushed a commit to source.git, branch master:
https://git.lede-project.org/2ddaf96a77a92186447ca18935b8a36d46d3db95
commit 2ddaf96a77a92186447ca18935b8a36d46d3db95
Author: Mathias Kresin <dev at kresin.me>
AuthorDate: Wed Apr 12 07:53:56 2017 +0200
ramips: add ZBT-WE826 32MB variant
The ZBT-WG826 is available with 16 or 32 MByte of flash. Split the
device tree source file, rename the currently supported 16 MByte
version and add the 32 MByte variant.
Signed-off-by: Mathias Kresin <dev at kresin.me>
---
target/linux/ramips/base-files/etc/board.d/01_leds | 9 +++++----
target/linux/ramips/base-files/etc/board.d/02_network | 3 ++-
target/linux/ramips/base-files/etc/diag.sh | 7 +++++--
target/linux/ramips/base-files/lib/ramips.sh | 7 +++++--
target/linux/ramips/base-files/lib/upgrade/platform.sh | 3 ++-
target/linux/ramips/dts/ZBT-WE826-16M.dts | 12 ++++++++++++
target/linux/ramips/dts/ZBT-WE826-32M.dts | 12 ++++++++++++
.../linux/ramips/dts/{ZBT-WE826.dts => ZBT-WE826.dtsi} | 6 +-----
target/linux/ramips/image/mt7620.mk | 17 +++++++++++++----
9 files changed, 57 insertions(+), 19 deletions(-)
diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds
index 213f2ed..d11d9c3 100755
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -395,10 +395,11 @@ zbt-wa05)
zbt-we2026)
set_wifi_led "$board:green:wlan"
;;
-zbt-we826)
- ucidef_set_led_default "power" "power" "$board:green:power" "1"
- set_wifi_led "$board:green:wifi"
- set_usb_led "$board:green:usb"
+zbt-we826-16M|\
+zbt-we826-32M)
+ ucidef_set_led_default "power" "power" "zbt-we826:green:power" "1"
+ set_wifi_led "zbt-we826:green:wifi"
+ set_usb_led "zbt-we826:green:usb"
;;
zbt-wr8305rt)
ucidef_set_led_default "power" "power" "$board:green:sys" "1"
diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index 016d293..80a3bc2 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -112,7 +112,8 @@ ramips_setup_interfaces()
youku-yk1|\
zbt-ape522ii|\
zbt-we1326|\
- zbt-we826|\
+ zbt-we826-16M|\
+ zbt-we826-32M|\
zbt-wg2626|\
zbt-wg3526-16M|\
zbt-wg3526-32M|\
diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh
index 8b5e260..f2aca34 100644
--- a/target/linux/ramips/base-files/etc/diag.sh
+++ b/target/linux/ramips/base-files/etc/diag.sh
@@ -189,8 +189,7 @@ get_status_led() {
status_led="$board:amber:system"
;;
oy-0001|\
- sl-r7205|\
- zbt-we826)
+ sl-r7205)
status_led="$board:green:wifi"
;;
psr-680w)
@@ -273,6 +272,10 @@ get_status_led() {
zbt-cpe102)
status_led="$board:green:4g-0"
;;
+ zbt-we826-16M|\
+ zbt-we826-32M)
+ status_led="zbt-we826:green:wifi"
+ ;;
zbt-wg3526-16M|\
zbt-wg3526-32M)
status_led="zbt-wg3526:green:status"
diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index 3342a8f..87cb7ff 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -652,8 +652,11 @@ ramips_board_detect() {
*"ZBT-WE2026")
name="zbt-we2026"
;;
- *"ZBT-WE826")
- name="zbt-we826"
+ *"ZBT-WE826 (16M)")
+ name="zbt-we826-16M"
+ ;;
+ *"ZBT-WE826 (32M)")
+ name="zbt-we826-32M"
;;
*"ZBT-WG2626")
name="zbt-wg2626"
diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 8c7f959..adad8da 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -193,7 +193,8 @@ platform_check_image() {
zbt-wa05|\
zbt-we1326|\
zbt-we2026|\
- zbt-we826|\
+ zbt-we826-16M|\
+ zbt-we826-32M|\
zbt-wg2626|\
zbt-wg3526-16M|\
zbt-wg3526-32M|\
diff --git a/target/linux/ramips/dts/ZBT-WE826-16M.dts b/target/linux/ramips/dts/ZBT-WE826-16M.dts
new file mode 100644
index 0000000..de3c4c1
--- /dev/null
+++ b/target/linux/ramips/dts/ZBT-WE826-16M.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+
+#include "ZBT-WG3526.dtsi"
+
+/ {
+ compatible = "zbtlink,zbt-we826-16m", "zbtlink,zbt-we826", "ralink,mt7620a-soc";
+ model = "ZBT-WE826 (16M)";
+};
+
+&firmware {
+ reg = <0x50000 0xfb0000>;
+};
\ No newline at end of file
diff --git a/target/linux/ramips/dts/ZBT-WE826-32M.dts b/target/linux/ramips/dts/ZBT-WE826-32M.dts
new file mode 100644
index 0000000..c8383cb
--- /dev/null
+++ b/target/linux/ramips/dts/ZBT-WE826-32M.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+
+#include "ZBT-WG3526.dtsi"
+
+/ {
+ compatible = "zbtlink,zbt-we826-32m", "zbtlink,zbt-we826", "ralink,mt7620a-soc";
+ model = "ZBT-WE826 (32M)";
+};
+
+&firmware {
+ reg = <0x50000 0x1fb0000>;
+};
\ No newline at end of file
diff --git a/target/linux/ramips/dts/ZBT-WE826.dts b/target/linux/ramips/dts/ZBT-WE826.dtsi
similarity index 92%
rename from target/linux/ramips/dts/ZBT-WE826.dts
rename to target/linux/ramips/dts/ZBT-WE826.dtsi
index 8a453bc..62ea419 100644
--- a/target/linux/ramips/dts/ZBT-WE826.dts
+++ b/target/linux/ramips/dts/ZBT-WE826.dtsi
@@ -5,9 +5,6 @@
#include <dt-bindings/input/input.h>
/ {
- compatible = "zbtlink,zbt-we826", "ralink,mt7620a-soc";
- model = "ZBT-WE826";
-
chosen {
bootargs = "console=ttyS0,115200";
};
@@ -81,9 +78,8 @@
read-only;
};
- partition at 50000 {
+ firmware: partition at 50000 {
label = "firmware";
- reg = <0x50000 0xfb0000>;
};
};
};
diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk
index 83c9a7f..71b651c 100644
--- a/target/linux/ramips/image/mt7620.mk
+++ b/target/linux/ramips/image/mt7620.mk
@@ -484,13 +484,22 @@ define Device/zbt-we2026
endef
TARGET_DEVICES += zbt-we2026
-define Device/zbt-we826
- DTS := ZBT-WE826
+define Device/zbt-we826-16M
+ DTS := ZBT-WE826-16M
IMAGE_SIZE := $(ralink_default_fw_size_16M)
- DEVICE_TITLE := Zbtlink ZBT-WE826
+ SUPPORTED_DEVICES += zbt-we826
+ DEVICE_TITLE := Zbtlink ZBT-WE826 (16M)
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76 kmod-sdhci-mt7620
endef
-TARGET_DEVICES += zbt-we826
+TARGET_DEVICES += zbt-we826-16M
+
+define Device/zbt-we826-32M
+ DTS := ZBT-WE826-32M
+ IMAGE_SIZE := $(ralink_default_fw_size_32M)
+ DEVICE_TITLE := Zbtlink ZBT-WE826 (32M)
+ DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76 kmod-sdhci-mt7620
+endef
+TARGET_DEVICES += zbt-we826-32M
define Device/zbt-wr8305rt
DTS := ZBT-WR8305RT
More information about the lede-commits
mailing list