There is another Zbtlink board (ZBT-WA05) supported in ramips target,
so use the same naming scheme for WR8305RT board and its DTS file.
Signed-off-by: Piotr Dymacz <pep...@gmail.com>
---
target/linux/ramips/base-files/etc/board.d/01_leds | 2 +-
.../linux/ramips/base-files/etc/board.d/02_network | 2 +-
target/linux/ramips/base-files/etc/diag.sh | 2 +-
target/linux/ramips/base-files/lib/ramips.sh | 4 +-
.../ramips/base-files/lib/upgrade/platform.sh | 4 +-
target/linux/ramips/dts/WR8305RT.dts | 112 ---------------------
target/linux/ramips/dts/ZBT-WR8305RT.dts | 112 +++++++++++++++++++++
target/linux/ramips/image/Makefile | 4 +-
8 files changed, 121 insertions(+), 121 deletions(-)
delete mode 100644 target/linux/ramips/dts/WR8305RT.dts
create mode 100644 target/linux/ramips/dts/ZBT-WR8305RT.dts
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 d73ffe2..52da1ff 100755
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -232,7 +232,7 @@ whr-600d)
wnce2001)
set_wifi_led "netgear:green:wlan"
;;
-wr8305rt)
+zbt-wr8305rt)
ucidef_set_led_default "power" "power" "zbtlink:green:sys" "1"
set_usb_led "zbtlink:green:usb"
set_wifi_led "zbtlink:green:wifi"
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 a781f46..038a66e 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -218,7 +218,7 @@ ramips_setup_interfaces()
ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 6t"
ucidef_add_switch_vlan "switch0" "2" "5 6t"
;;
- wr8305rt)
+ zbt-wr8305rt)
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
ucidef_add_switch "switch0" "1" "1"
ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4 6t"
diff --git a/target/linux/ramips/base-files/etc/diag.sh
b/target/linux/ramips/base-files/etc/diag.sh
index 91a931b..8c96b3b 100644
--- a/target/linux/ramips/base-files/etc/diag.sh
+++ b/target/linux/ramips/base-files/etc/diag.sh
@@ -228,7 +228,7 @@ get_status_led() {
wr512-3gn)
status_led="wr512:green:wps"
;;
- wr8305rt)
+ zbt-wr8305rt)
status_led="zbtlink:green:sys"
;;
wt3020)
diff --git a/target/linux/ramips/base-files/lib/ramips.sh
b/target/linux/ramips/base-files/lib/ramips.sh
index 8643613..f9f3b5c 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -421,8 +421,8 @@ ramips_board_detect() {
*"Xiaomi MiWiFi Mini")
name="xiaomi-miwifi-mini"
;;
- *"ZBT WR8305RT")
- name="wr8305rt"
+ *"Zbtlink ZBT-WR8305RT")
+ name="zbt-wr8305rt"
;;
*"Zbtlink ZBT-WA05")
name="zbt-wa05"
diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh
b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 8221997..7aab6a1 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -116,7 +116,6 @@ platform_check_image() {
wnce2001 | \
wr512-3gn |\
wr6202 |\
- wr8305rt |\
wrtnode |\
oy-0001 |\
wt1520 |\
@@ -127,7 +126,8 @@ platform_check_image() {
y1 |\
y1s |\
zte-q7 |\
- zbt-wa05)
+ zbt-wa05|\
+ zbt-wr8305rt)
[ "$magic" != "27051956" ] && {
echo "Invalid image type."
return 1
diff --git a/target/linux/ramips/dts/WR8305RT.dts
b/target/linux/ramips/dts/WR8305RT.dts
deleted file mode 100644
index 007473f..0000000
--- a/target/linux/ramips/dts/WR8305RT.dts
+++ /dev/null
@@ -1,112 +0,0 @@
-/dts-v1/;
-
-/include/ "mt7620n.dtsi"
-
-/ {
- compatible = "wr8305rt", "ralink,mt7620n-soc";
- model = "ZBT WR8305RT";
-
- palmbus@10000000 {
- gpio1: gpio@638 {
- status = "okay";
- };
- gpio3: gpio@688 {
- status = "okay";
- };
-
- spi@b00 {
- status = "okay";
-
- m25p80@0 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "mx25l6405d";
- reg = <0 0>;
- linux,modalias = "m25p80", "en25q64";
- spi-max-frequency = <10000000>;
-
- partition@0 {
- label = "u-boot";
- reg = <0x0 0x30000>;
- read-only;
- };
-
- partition@30000 {
- label = "u-boot-env";
- reg = <0x30000 0x10000>;
- read-only;
- };
-
- factory: partition@40000 {
- label = "factory";
- reg = <0x40000 0x10000>;
- read-only;
- };
-
- partition@50000 {
- label = "firmware";
- reg = <0x50000 0x7b0000>;
- };
- };
- };
- };
-
- ehci@101c0000 {
- status = "okay";
- };
-
- ohci@101c1000 {
- status = "okay";
- };
-
- ethernet@10100000 {
- mtd-mac-address = <&factory 0x4>;
- ralink,port-map = "llllw";
- };
-
- wmac@10180000 {
- ralink,mtd-eeprom = <&factory 0>;
- };
-
- pinctrl {
- state_default: pinctrl0 {
- ephy {
- ralink,group = "ephy";
- ralink,function = "ephy";
- };
- default {
- ralink,group = "i2c", "uartf", "spi refclk",
"wled";
- ralink,function = "gpio";
- };
- };
- };
-
- gpio-leds {
- compatible = "gpio-leds";
- sys {
- label = "zbtlink:green:sys";
- gpios = <&gpio1 14 1>;
- };
- lan {
- label = "zbtlink:green:usb";
- gpios = <&gpio1 15 1>;
- };
- wifi {
- label = "zbtlink:green:wifi";
- gpios = <&gpio3 0 1>;
- };
- };
-
- gpio-keys-polled {
- compatible = "gpio-keys-polled";
- #address-cells = <1>;
- #size-cells = <0>;
- poll-interval = <20>;
- reset {
- label = "reset";
- gpios = <&gpio0 1 1>;
- linux,code = <0x198>;
- };
- };
-};
-
diff --git a/target/linux/ramips/dts/ZBT-WR8305RT.dts
b/target/linux/ramips/dts/ZBT-WR8305RT.dts
new file mode 100644
index 0000000..a75fcd8
--- /dev/null
+++ b/target/linux/ramips/dts/ZBT-WR8305RT.dts
@@ -0,0 +1,112 @@
+/dts-v1/;
+
+/include/ "mt7620n.dtsi"
+
+/ {
+ compatible = "zbtlink,zbt-wr8305rt", "ralink,mt7620n-soc";
+ model = "Zbtlink ZBT-WR8305RT";
+
+ palmbus@10000000 {
+ gpio1: gpio@638 {
+ status = "okay";
+ };
+ gpio3: gpio@688 {
+ status = "okay";
+ };
+
+ spi@b00 {
+ status = "okay";
+
+ m25p80@0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "mx25l6405d";
+ reg = <0 0>;
+ linux,modalias = "m25p80", "en25q64";
+ spi-max-frequency = <10000000>;
+
+ partition@0 {
+ label = "u-boot";
+ reg = <0x0 0x30000>;
+ read-only;
+ };
+
+ partition@30000 {
+ label = "u-boot-env";
+ reg = <0x30000 0x10000>;
+ read-only;
+ };
+
+ factory: partition@40000 {
+ label = "factory";
+ reg = <0x40000 0x10000>;
+ read-only;
+ };
+
+ partition@50000 {
+ label = "firmware";
+ reg = <0x50000 0x7b0000>;
+ };
+ };
+ };
+ };
+
+ ehci@101c0000 {
+ status = "okay";
+ };
+
+ ohci@101c1000 {
+ status = "okay";
+ };
+
+ ethernet@10100000 {
+ mtd-mac-address = <&factory 0x4>;
+ ralink,port-map = "llllw";
+ };
+
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
+ pinctrl {
+ state_default: pinctrl0 {
+ ephy {
+ ralink,group = "ephy";
+ ralink,function = "ephy";
+ };
+ default {
+ ralink,group = "i2c", "uartf", "spi refclk",
"wled";
+ ralink,function = "gpio";
+ };
+ };
+ };
+
+ gpio-leds {
+ compatible = "gpio-leds";
+ sys {
+ label = "zbtlink:green:sys";
+ gpios = <&gpio1 14 1>;
+ };
+ lan {
+ label = "zbtlink:green:usb";
+ gpios = <&gpio1 15 1>;
+ };
+ wifi {
+ label = "zbtlink:green:wifi";
+ gpios = <&gpio3 0 1>;
+ };
+ };
+
+ gpio-keys-polled {
+ compatible = "gpio-keys-polled";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ poll-interval = <20>;
+ reset {
+ label = "reset";
+ gpios = <&gpio0 1 1>;
+ linux,code = <0x198>;
+ };
+ };
+};
+
diff --git a/target/linux/ramips/image/Makefile
b/target/linux/ramips/image/Makefile
index 409ff26..6071ae7 100644
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -876,12 +876,12 @@ Image/Build/Profile/MLW221=$(call
BuildFirmware/Default16M/$(1),$(1),mlw221,MLW2
Image/Build/Profile/MLWG2=$(call
BuildFirmware/Default16M/$(1),$(1),mlwg2,MLWG2)
Image/Build/Profile/WMR300=$(call
BuildFirmware/Default8M/$(1),$(1),wmr-300,WMR300)
Image/Build/Profile/RT-N14U=$(call
BuildFirmware/Default8M/$(1),$(1),rt-n14u,RT-N14U)
-Image/Build/Profile/WR8305RT=$(call
BuildFirmware/Default8M/$(1),$(1),wr8305rt,WR8305RT)
Image/Build/Profile/WRTNODE=$(call
BuildFirmware/Default16M/$(1),$(1),wrtnode,WRTNODE)
Image/Build/Profile/WT3020=$(call
BuildFirmware/PorayDualSize/$(1),$(1),wt3020,WT3020)
Image/Build/Profile/XIAOMI-MIWIFI-MINI=$(call
BuildFirmware/Default16M/$(1),$(1),xiaomi-miwifi-mini,XIAOMI-MIWIFI-MINI)
Image/Build/Profile/ZTE-Q7=$(call
BuildFirmware/Default8M/$(1),$(1),zte-q7,ZTE-Q7)
Image/Build/Profile/ZBT-WA05=$(call
BuildFirmware/Default8M/$(1),$(1),zbt-wa05,ZBT-WA05)
+Image/Build/Profile/ZBT-WR8305RT=$(call
BuildFirmware/Default8M/$(1),$(1),zbt-wr8305rt,ZBT-WR8305RT)
Image/Build/Profile/ArcherC20i=$(call
BuildFirmware/Tplink/$(1),$(1),ArcherC20i,ArcherC20i)
microwrt_mtd_size=16515072
Image/Build/Profile/MicroWRT=$(call
BuildFirmware/CustomFlash/$(1),$(1),microwrt,MicroWRT,$(microwrt_mtd_size))
@@ -910,12 +910,12 @@ define Image/Build/Profile/Default
$(call Image/Build/Profile/MLWG2,$(1))
$(call Image/Build/Profile/WMR300,$(1))
$(call Image/Build/Profile/RT-N14U,$(1))
- $(call Image/Build/Profile/WR8305RT,$(1))
$(call Image/Build/Profile/WRTNODE,$(1))
$(call Image/Build/Profile/WT3020,$(1))
$(call Image/Build/Profile/XIAOMI-MIWIFI-MINI,$(1))
$(call Image/Build/Profile/ZTE-Q7,$(1))
$(call Image/Build/Profile/ZBT-WA05,$(1))
+ $(call Image/Build/Profile/ZBT-WR8305RT,$(1))
$(call Image/Build/Profile/ArcherC20i,$(1))
$(call Image/Build/Profile/MicroWRT,$(1))
endef
--
2.4.6
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
