From a5c4c8899c8d69c014cfcf3a061d142c90c957eb Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Fri, 1 May 2020 11:47:50 +0800 Subject: [PATCH 1/6] linux-firmware: enable qca4019 (#4488) --- package/firmware/linux-firmware/qca_ath10k.mk | 2 +- package/kernel/mac80211/ath.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/firmware/linux-firmware/qca_ath10k.mk b/package/firmware/linux-firmware/qca_ath10k.mk index 6019ce26ec..72735819fd 100644 --- a/package/firmware/linux-firmware/qca_ath10k.mk +++ b/package/firmware/linux-firmware/qca_ath10k.mk @@ -19,7 +19,7 @@ define Package/ath10k-firmware-qca4019/install $(PKG_BUILD_DIR)/ath10k/QCA4019/hw1.0/firmware-5.bin \ $(1)/lib/firmware/ath10k/QCA4019/hw1.0/firmware-5.bin endef -# $(eval $(call BuildPackage,ath10k-firmware-qca4019)) +$(eval $(call BuildPackage,ath10k-firmware-qca4019)) Package/ath10k-firmware-qca9887 = $(call Package/firmware-default,ath10k qca9887 firmware) define Package/ath10k-firmware-qca9887/install diff --git a/package/kernel/mac80211/ath.mk b/package/kernel/mac80211/ath.mk index 788131b751..0c25d23bb2 100644 --- a/package/kernel/mac80211/ath.mk +++ b/package/kernel/mac80211/ath.mk @@ -264,6 +264,7 @@ define KernelPackage/ath10k/config config ATH10K_THERMAL bool "Enable thermal sensors and throttling support" + default y depends on PACKAGE_kmod-ath10k endef From 21b36d6f9f29fa9ea8f8a160fc9ec0aabc173308 Mon Sep 17 00:00:00 2001 From: ardanzhu <31897806+ardanzhu@users.noreply.github.com> Date: Fri, 1 May 2020 11:48:08 +0800 Subject: [PATCH 2/6] Update to frp 0.33.0 version (#4486) --- package/lean/frp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/frp/Makefile b/package/lean/frp/Makefile index 26162847fd..5e16cebf32 100644 --- a/package/lean/frp/Makefile +++ b/package/lean/frp/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=frp -PKG_VERSION:=0.32.1 +PKG_VERSION:=0.33.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/fatedier/frp/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=3a6ef59163f5a1d41b67908269e924000a8ccb2984e4bdfc18bd1405b5dbaf22 +PKG_HASH:=9c773ab4bbd208705c795599c5e69302a379734921c90489ed8ae331c24836cb PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE From d0cc3d0230f3ce0edc1120621ccf62c192f89562 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Fri, 1 May 2020 11:53:30 +0800 Subject: [PATCH 3/6] luci-app-qbittorrent: update python3 for search --- package/lean/luci-app-qbittorrent/Makefile | 4 ++-- .../luci-app-qbittorrent/luasrc/model/cbi/qbittorrent.lua | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/lean/luci-app-qbittorrent/Makefile b/package/lean/luci-app-qbittorrent/Makefile index 343d888466..cbb12515e2 100644 --- a/package/lean/luci-app-qbittorrent/Makefile +++ b/package/lean/luci-app-qbittorrent/Makefile @@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for qBittorrent -LUCI_DEPENDS:=+qBittorrent +python +LUCI_DEPENDS:=+qBittorrent +python3 LUCI_PKGARCH:=all PKG_VERSION=1.0 -PKG_RELEASE:=18 +PKG_RELEASE:=19 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-qbittorrent/luasrc/model/cbi/qbittorrent.lua b/package/lean/luci-app-qbittorrent/luasrc/model/cbi/qbittorrent.lua index 7431394f24..8563e6d268 100644 --- a/package/lean/luci-app-qbittorrent/luasrc/model/cbi/qbittorrent.lua +++ b/package/lean/luci-app-qbittorrent/luasrc/model/cbi/qbittorrent.lua @@ -249,11 +249,11 @@ o.enabled = "true" o.disabled = "false" o.default = o.disabled -o = s:taboption("webgui", Value, "Username", translate("Username"), translate("The login name for WebUI.")) -o.placeholder = "admin" +--o = s:taboption("webgui", Value, "Username", translate("Username"), translate("The login name for WebUI.")) +--o.placeholder = "admin" -o = s:taboption("webgui", Value, "Password", translate("Password"), translate("The login password for WebUI.")) -o.password = true +--o = s:taboption("webgui", Value, "Password", translate("Password"), translate("The login password for WebUI.")) +--o.password = true o = s:taboption("webgui", Value, "Locale", translate("Locale Language")) o:value("en", translate("English")) From 01aeb5df0ed4c2119c9cbdb072872089d4739a58 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Fri, 1 May 2020 12:23:28 +0800 Subject: [PATCH 4/6] ramips: Add support for Xiaomi Redmi Router AC2100 (RM2100) --- package/boot/uboot-envtools/Makefile | 15 +- package/boot/uboot-envtools/files/ath79 | 4 + package/boot/uboot-envtools/files/mvebu | 3 + package/boot/uboot-envtools/files/mxs | 3 + package/boot/uboot-envtools/files/ramips | 2 +- .../dts/mt7621_xiaomi_redmi-router-ac2100.dts | 158 ++++++++++++++++++ target/linux/ramips/image/mt7621.mk | 17 ++ .../mt7621/base-files/etc/board.d/01_leds | 3 + .../mt7621/base-files/etc/board.d/02_network | 2 + .../mt7621/base-files/lib/upgrade/platform.sh | 3 +- 10 files changed, 201 insertions(+), 9 deletions(-) create mode 100644 target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile index 1c6b789716..b032e07c37 100644 --- a/package/boot/uboot-envtools/Makefile +++ b/package/boot/uboot-envtools/Makefile @@ -9,16 +9,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uboot-envtools PKG_DISTNAME:=u-boot -PKG_VERSION:=2019.07 -PKG_RELEASE:=2 +PKG_VERSION:=2020.04 +PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:= \ + https://ftp.denx.de/pub/u-boot \ + https://mirror.cyberbits.eu/u-boot \ + ftp://ftp.denx.de/pub/u-boot +PKG_HASH:=fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372 PKG_SOURCE_SUBDIR:=$(PKG_DISTNAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_DISTNAME)-$(PKG_VERSION) -PKG_SOURCE_URL:=https://git.denx.de/u-boot.git -PKG_SOURCE_VERSION:=e5aee22e4be75e75a854ab64503fc80598bc2004 -PKG_MIRROR_HASH:=58c1ecaf901b6bf65c5e872b5449b642694ae5acebf61f91f0d4bc20b4c654b7 PKG_BUILD_DEPENDS:=fstools diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79 index 15bd9ffb6e..aebfeca85d 100644 --- a/package/boot/uboot-envtools/files/ath79 +++ b/package/boot/uboot-envtools/files/ath79 @@ -15,6 +15,7 @@ board=$(board_name) case "$board" in alfa-network,ap121f|\ buffalo,bhr-4grv2|\ +devolo,magic-2-wifi|\ engenius,ecb1750|\ etactica,eg200|\ glinet,gl-ar300m-lite|\ @@ -44,6 +45,9 @@ yuncore,xd4200) buffalo,wzr-hp-ag300h) ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x10000" "0x10000" ;; +domywifi,dw33d) + ubootenv_add_uci_config "/dev/mtd4" "0x0" "0x10000" "0x10000" + ;; glinet,gl-ar150) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x8000" "0x10000" ;; diff --git a/package/boot/uboot-envtools/files/mvebu b/package/boot/uboot-envtools/files/mvebu index 7902384a37..10f31b05a1 100644 --- a/package/boot/uboot-envtools/files/mvebu +++ b/package/boot/uboot-envtools/files/mvebu @@ -17,6 +17,9 @@ case "$board" in cznic,turris-omnia) ubootenv_add_uci_config "/dev/mtd0" "0xC0000" "0x10000" "0x40000" ;; +glinet,gl-mv1000) + ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x8000" "0x8000" "1" + ;; globalscale,espressobin|\ globalscale,espressobin-emmc|\ globalscale,espressobin-v7|\ diff --git a/package/boot/uboot-envtools/files/mxs b/package/boot/uboot-envtools/files/mxs index ecfb5de162..e087d60783 100644 --- a/package/boot/uboot-envtools/files/mxs +++ b/package/boot/uboot-envtools/files/mxs @@ -17,6 +17,9 @@ i2se,duckbill) ubootenv_add_uci_config "/dev/mmcblk0" "0x20000" "0x20000" ubootenv_add_uci_config "/dev/mmcblk0" "0x40000" "0x20000" ;; +olimex,imx23-olinuxino) + ubootenv_add_uci_config "/dev/mmcblk0" "0x40000" "0x4000" + ;; esac config_load ubootenv diff --git a/package/boot/uboot-envtools/files/ramips b/package/boot/uboot-envtools/files/ramips index 2078aff0b4..5c4730670d 100644 --- a/package/boot/uboot-envtools/files/ramips +++ b/package/boot/uboot-envtools/files/ramips @@ -35,7 +35,7 @@ zbtlink,zbt-wg2626) ;; xiaomi,mir3p|\ xiaomi,mir3g|\ -xiaomi,miwifi-r3) +xiaomi,redmi-router-ac2100) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x1000" "0x20000" ;; esac diff --git a/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts b/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts new file mode 100644 index 0000000000..d5669b5841 --- /dev/null +++ b/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts @@ -0,0 +1,158 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "mt7621.dtsi" + +#include +#include + +/ { + compatible = "xiaomi,redmi-router-ac2100", "mediatek,mt7621-soc"; + model = "Xiaomi Redmi Router AC2100"; + + aliases { + led-boot = &led_status_amber; + led-failsafe = &led_status_amber; + led-running = &led_status_white; + led-upgrade = &led_status_white; + label-mac-device = &gmac0; + }; + + chosen { + bootargs = "console=ttyS0,115200n8"; + }; + + leds { + compatible = "gpio-leds"; + + led_status_amber: status_amber { + label = "rm2100:amber:status"; + gpios = <&gpio 6 GPIO_ACTIVE_LOW>; + }; + + led_status_white: status_white { + label = "rm2100:white:status"; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; + }; + + wan_amber { + label = "rm2100:amber:wan"; + gpios = <&gpio 10 GPIO_ACTIVE_LOW>; + }; + + wan_white { + label = "rm2100:white:wan"; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + +}; + + +&nand { + status = "okay"; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "Bootloader"; + reg = <0x0 0x80000>; + read-only; + }; + + partition@80000 { + label = "Config"; + reg = <0x80000 0x40000>; + }; + + partition@c0000 { + label = "Bdata"; + reg = <0xc0000 0x40000>; + read-only; + }; + + factory: partition@100000 { + label = "factory"; + reg = <0x100000 0x40000>; + read-only; + }; + + partition@140000 { + label = "crash"; + reg = <0x140000 0x40000>; + }; + + partition@180000 { + label = "crash_syslog"; + reg = <0x180000 0x40000>; + }; + + partition@1c0000 { + label = "reserved0"; + reg = <0x1c0000 0x40000>; + read-only; + }; + + /* We keep stock xiaomi firmware (kernel0) here */ + partition@200000 { + label = "kernel_stock"; + reg = <0x200000 0x400000>; + }; + + partition@600000 { + label = "kernel"; + reg = <0x600000 0x400000>; + }; + + partition@a00000 { + label = "ubi"; + reg = <0xa00000 0x7580000>; + }; + }; +}; + +&pcie { + status = "okay"; +}; + +&pcie0 { + wifi@0,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + mediatek,mtd-eeprom = <&factory 0x8000>; + ieee80211-freq-limit = <5000000 6000000>; + }; +}; + +&pcie1 { + wifi@0,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + mediatek,mtd-eeprom = <&factory 0x0000>; + ieee80211-freq-limit = <2400000 2500000>; + }; +}; + +ðernet { + mtd-mac-address = <&factory 0xe000>; +}; + +&state_default { + gpio { + groups = "uart2", "uart3", "wdt"; + function = "gpio"; + }; +}; diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 47945bd07d..72e0c58986 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -892,6 +892,23 @@ define Device/xiaomi_mir3p endef TARGET_DEVICES += xiaomi_mir3p +define Device/xiaomi_redmi-router-ac2100 + $(Device/uimage-lzma-loader) + BLOCKSIZE := 128k + PAGESIZE := 2048 + KERNEL_SIZE := 4096k + IMAGE_SIZE := 124416k + UBINIZE_OPTS := -E 5 + IMAGES += kernel1.bin rootfs0.bin + IMAGE/kernel1.bin := append-kernel + IMAGE/rootfs0.bin := append-ubi | check-size + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata + DEVICE_VENDOR := Xiaomi + DEVICE_MODEL := Redmi Router AC2100 + DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e wpad-basic uboot-envtools +endef +TARGET_DEVICES += xiaomi_redmi-router-ac2100 + define Device/xiaoyu_xy-c5 IMAGE_SIZE := 32448k DEVICE_VENDOR := XiaoYu diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds index 7695cb9918..b67dfb0783 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds @@ -81,6 +81,9 @@ xiaomi,mir3p) xzwifi,creativebox-v1) ucidef_set_led_switch "internet" "internet" "$boardname:blue:internet" "switch0" "0x10" ;; +xiaomi,redmi-router-ac2100) + ucidef_set_led_netdev "wan" "wan" "$boardname:white:wan" "wan" + ;; youhua,wr1200js) ucidef_set_led_switch "internet" "INTERNET" "$boardname:green:wan" "switch0" "0x01" ;; diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network index d4d662a964..c49969846f 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network @@ -109,6 +109,8 @@ ramips_setup_interfaces() ucidef_add_switch "switch0" \ "0:lan" "4:lan" "6@eth0" ;; + xiaomi,mir3p|\ + xiaomi,redmi-router-ac2100|\ hiwifi,hc5962) ucidef_add_switch "switch0" \ "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0" diff --git a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh index ad10dcbdaa..facc89beed 100755 --- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh @@ -53,7 +53,8 @@ platform_do_upgrade() { netgear,r6850|\ netis,wf2881|\ xiaomi,mir3g|\ - xiaomi,mir3p) + xiaomi,mir3p|\ + xiaomi,redmi-router-ac2100) nand_do_upgrade "$1" ;; iodata,wn-ax1167gr2|\ From 3c510baf470508f340a11600edd4296813b54687 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Fri, 1 May 2020 22:37:45 +0800 Subject: [PATCH 5/6] ramips: fix support for Redmi AC2100 (#4500) This commit fix switch and image config for Redmi AC2100. Signed-off-by: AmadeusGhost --- package/boot/uboot-envtools/files/ath79 | 3 --- package/boot/uboot-envtools/files/ramips | 1 + .../ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts | 7 ++----- target/linux/ramips/image/mt7621.mk | 5 ++--- .../ramips/mt7621/base-files/etc/board.d/02_network | 9 ++++++--- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79 index aebfeca85d..63f02975e3 100644 --- a/package/boot/uboot-envtools/files/ath79 +++ b/package/boot/uboot-envtools/files/ath79 @@ -45,9 +45,6 @@ yuncore,xd4200) buffalo,wzr-hp-ag300h) ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x10000" "0x10000" ;; -domywifi,dw33d) - ubootenv_add_uci_config "/dev/mtd4" "0x0" "0x10000" "0x10000" - ;; glinet,gl-ar150) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x8000" "0x10000" ;; diff --git a/package/boot/uboot-envtools/files/ramips b/package/boot/uboot-envtools/files/ramips index 5c4730670d..b81ad91bdf 100644 --- a/package/boot/uboot-envtools/files/ramips +++ b/package/boot/uboot-envtools/files/ramips @@ -35,6 +35,7 @@ zbtlink,zbt-wg2626) ;; xiaomi,mir3p|\ xiaomi,mir3g|\ +xiaomi,miwifi-r3|\ xiaomi,redmi-router-ac2100) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x1000" "0x20000" ;; diff --git a/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts b/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts index d5669b5841..7b17a9b38e 100644 --- a/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts +++ b/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts @@ -15,7 +15,6 @@ led-failsafe = &led_status_amber; led-running = &led_status_white; led-upgrade = &led_status_white; - label-mac-device = &gmac0; }; chosen { @@ -55,10 +54,8 @@ linux,code = ; }; }; - }; - &nand { status = "okay"; @@ -152,7 +149,7 @@ &state_default { gpio { - groups = "uart2", "uart3", "wdt"; - function = "gpio"; + ralink,group = "uart2", "uart3", "wdt"; + ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 72e0c58986..72a231c640 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -893,7 +893,6 @@ endef TARGET_DEVICES += xiaomi_mir3p define Device/xiaomi_redmi-router-ac2100 - $(Device/uimage-lzma-loader) BLOCKSIZE := 128k PAGESIZE := 2048 KERNEL_SIZE := 4096k @@ -901,11 +900,11 @@ define Device/xiaomi_redmi-router-ac2100 UBINIZE_OPTS := -E 5 IMAGES += kernel1.bin rootfs0.bin IMAGE/kernel1.bin := append-kernel - IMAGE/rootfs0.bin := append-ubi | check-size + IMAGE/rootfs0.bin := append-ubi | check-size $$$$(IMAGE_SIZE) IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_VENDOR := Xiaomi DEVICE_MODEL := Redmi Router AC2100 - DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e wpad-basic uboot-envtools + DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e wpad-openssl uboot-envtools endef TARGET_DEVICES += xiaomi_redmi-router-ac2100 diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network index c49969846f..43d3b1a9a9 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network @@ -109,8 +109,6 @@ ramips_setup_interfaces() ucidef_add_switch "switch0" \ "0:lan" "4:lan" "6@eth0" ;; - xiaomi,mir3p|\ - xiaomi,redmi-router-ac2100|\ hiwifi,hc5962) ucidef_add_switch "switch0" \ "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0" @@ -153,6 +151,10 @@ ramips_setup_interfaces() ucidef_add_switch "switch0" \ "1:lan:3" "2:lan:2" "3:lan:1" "4:wan" "6@eth0" ;; + xiaomi,redmi-router-ac2100) + ucidef_add_switch "switch0" \ + "1:lan:2" "2:lan:3" "3:lan:4" "0:wan" "6@eth0" + ;; *) ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ;; @@ -236,7 +238,8 @@ ramips_setup_macs() ;; iodata,wn-ax1167gr2|\ iodata,wn-dx1167r|\ - xiaomi,mir3g-v2) + xiaomi,mir3g-v2|\ + xiaomi,redmi-router-ac2100) wan_mac=$(mtd_get_mac_binary factory 0xe006) label_mac=$wan_mac ;; From 1a44b8d74fc5cb6f8481a82290ab132259ae57c2 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sat, 2 May 2020 07:30:25 +0800 Subject: [PATCH 6/6] ramips: fix build error (#4508) --- .../ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts b/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts index 7b17a9b38e..7dcd10ab68 100644 --- a/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts +++ b/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts @@ -26,22 +26,22 @@ led_status_amber: status_amber { label = "rm2100:amber:status"; - gpios = <&gpio 6 GPIO_ACTIVE_LOW>; + gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; }; led_status_white: status_white { label = "rm2100:white:status"; - gpios = <&gpio 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; wan_amber { label = "rm2100:amber:wan"; - gpios = <&gpio 10 GPIO_ACTIVE_LOW>; + gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; }; wan_white { label = "rm2100:white:wan"; - gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; }; @@ -50,7 +50,7 @@ reset { label = "reset"; - gpios = <&gpio 18 GPIO_ACTIVE_LOW>; + gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; linux,code = ; }; };