[openwrt/openwrt] ramips: Add support for Xiaomi Mi Router(Black, R2100)

LEDE Commits lede-commits at lists.infradead.org
Wed Jul 8 10:07:28 EDT 2020


ynezz pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/53a1fede1f9856b61092ce4693e7610a515d562b

commit 53a1fede1f9856b61092ce4693e7610a515d562b
Author: Emir Efe Kucuk <emirefek at gmail.com>
AuthorDate: Sat May 30 12:18:50 2020 +0300

    ramips: Add support for Xiaomi Mi Router(Black,R2100)
    
    The Xiaomi Mi Router AC2100 is a *black* cylindrical router that shares many
    characteristics (apart from its looks and the GPIO ports) with the 6-antenna
    *white* "Xiaomi Redmi Router AC2100"
    
    See the visual comparison of the two routers here:
    https://github.com/emirefek/openwrt-R2100/raw/imgcdn/rm2100-r2100.jpg
    
    Specification of R2100:
    - CPU: MediaTek MT7621A
    - RAM: 128 MB DDR3
    - FLASH: 128 MB ESMT NAND
    - WIFI: 2x2 802.11bgn (MT7603)
    - WIFI: 4x4 802.11ac (MT7615)
    - ETH: 3xLAN+1xWAN 1000base-T
    - LED: Power, WAN in Yellow and Blue
    - UART: On board (Don't know where is should be confirmed by anybody else)
    - Modified u-boot
    
    Hacking of official firmware process is same at both RM2100 and R2100.
    Thanks to @namidairo
    
    Here is the detailed guide Hack: https://github.com/impulse/ac2100-openwrt-guide
    Guide is written for MacOS but it will work at linux.
    needed packages: python3(with scapy), netcat, http server, telnet client
    
    1. Run PPPoE&exploit to get nc and wget busybox, get telnet and wget firmware
    2. mtd write openwrt-ramips-mt7621-xiaomi_mi-router-ac2100-kernel1.bin kernel1
    3. nvram set uart_en=1
    4. nvram set bootdelay=5
    5. nvram set flag_try_sys1_failed=1
    6. nvram commit
    7. mtd -r write openwrt-ramips-mt7621-xiaomi_mi-router-ac2100-rootfs0.bin rootfs0
    
    other than these I specified in here. Everything is same with:
    https://github.com/openwrt/openwrt/commit/f3792690c4f0567a8965d82898295b9d50c3bb7e
    Thanks for all community and especially for this device:
    @Ilyas @scp07 @namidairo @Percy @thorsten97 @impulse (names at forum.openwrt.com)
    
    MAC Locations:
    WAN *:b5 = factory 0xe006
    LAN *:b6 = factory 0xe000
    WIFI 5ghz *:b8 = factory 0x8004
    WIFI 2.4ghz *:b7 = factory 0x0004
    
    Signed-off-by: Emir Efe Kucuk <emirefek at gmail.com>
    [refactored common image bits into Device/xiaomi-ac2100, fixed From:]
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 package/boot/uboot-envtools/files/ramips           |   1 +
 .../ramips/dts/mt7621_xiaomi_mi-router-ac2100.dts  |  41 ++++++
 .../dts/mt7621_xiaomi_redmi-router-ac2100.dts      | 144 +--------------------
 ...ac2100.dts => mt7621_xiaomi_router-ac2100.dtsi} |  37 ------
 target/linux/ramips/image/mt7621.mk                |  34 +++--
 .../ramips/mt7621/base-files/etc/board.d/01_leds   |   3 +
 .../mt7621/base-files/etc/board.d/02_network       |   1 +
 .../mt7621/base-files/lib/upgrade/platform.sh      |   1 +
 8 files changed, 70 insertions(+), 192 deletions(-)

diff --git a/package/boot/uboot-envtools/files/ramips b/package/boot/uboot-envtools/files/ramips
index d48be8d27c..701f051f77 100644
--- a/package/boot/uboot-envtools/files/ramips
+++ b/package/boot/uboot-envtools/files/ramips
@@ -34,6 +34,7 @@ zbtlink,zbt-wg2626)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x1000" "0x10000"
 	;;
 linksys,ea7500-v2|\
+xiaomi,mi-router-ac2100|\
 xiaomi,mir3p|\
 xiaomi,mir3g|\
 xiaomi,redmi-router-ac2100)
diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mi-router-ac2100.dts b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-ac2100.dts
new file mode 100644
index 0000000000..885ea05c62
--- /dev/null
+++ b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-ac2100.dts
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include "mt7621_xiaomi_router-ac2100.dtsi"
+
+/ {
+	compatible = "xiaomi,mi-router-ac2100", "mediatek,mt7621-soc";
+	model = "Xiaomi Mi Router AC2100";
+
+	aliases {
+		led-boot = &led_status_yellow;
+		led-failsafe = &led_status_yellow;
+		led-running = &led_status_blue;
+		led-upgrade = &led_status_blue;
+		label-mac-device = &gmac0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		wan_yellow {
+			label = "mi-router-ac2100:yellow:wan";
+			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
+		};
+
+		wan_blue {
+			label = "mi-router-ac2100:blue:wan";
+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
+		};
+
+		led_status_yellow: status_yellow {
+			label = "mi-router-ac2100:yellow:status";
+			gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
+		};
+
+		led_status_blue: status_blue {
+			label = "mi-router-ac2100:blue:status";
+			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
+		};
+	};
+};
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 f0bc1aeb96..ceaeec750c 100644
--- a/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts
+++ b/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts
@@ -1,10 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "mt7621.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include "mt7621_xiaomi_router-ac2100.dtsi"
 
 / {
 	compatible = "xiaomi,redmi-router-ac2100", "mediatek,mt7621-soc";
@@ -18,10 +15,6 @@
 		label-mac-device = &gmac0;
 	};
 
-	chosen {
-		bootargs = "console=ttyS0,115200n8";
-	};
-
 	leds {
 		compatible = "gpio-leds";
 
@@ -45,139 +38,4 @@
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 	};
-
-	keys {
-		compatible = "gpio-keys";
-
-		reset {
-			label = "reset";
-			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART>;
-		};
-	};
-
-};
-
-
-&nand {
-	status = "okay";
-
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition at 0 {
-			label = "Bootloader";
-			reg = <0x0 0x80000>;
-			read-only;
-		};
-
-		partition at 80000 {
-			label = "Config";
-			reg = <0x80000 0x40000>;
-		};
-
-		partition at c0000 {
-			label = "Bdata";
-			reg = <0xc0000 0x40000>;
-			read-only;
-		};
-
-		factory: partition at 100000 {
-			label = "factory";
-			reg = <0x100000 0x40000>;
-			read-only;
-		};
-
-		partition at 140000 {
-			label = "crash";
-			reg = <0x140000 0x40000>;
-		};
-
-		partition at 180000 {
-			label = "crash_syslog";
-			reg = <0x180000 0x40000>;
-		};
-
-		partition at 1c0000 {
-			label = "reserved0";
-			reg = <0x1c0000 0x40000>;
-			read-only;
-		};
-
-		/* We keep stock xiaomi firmware (kernel0) here */
-		partition at 200000 {
-			label = "kernel_stock";
-			reg = <0x200000 0x400000>;
-		};
-
-		partition at 600000 {
-			label = "kernel";
-			reg = <0x600000 0x400000>;
-		};
-
-		partition at a00000 {
-			label = "ubi";
-			reg = <0xa00000 0x7580000>;
-		};
-	};
-};
-
-&pcie {
-	status = "okay";
-};
-
-&pcie0 {
-	wifi at 0,0 {
-		compatible = "mediatek,mt76";
-		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
-		ieee80211-freq-limit = <5000000 6000000>;
-	};
-};
-
-&pcie1 {
-	wifi at 0,0 {
-		compatible = "mediatek,mt76";
-		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x0000>;
-		ieee80211-freq-limit = <2400000 2500000>;
-	};
-};
-
-&gmac0 {
-	mtd-mac-address = <&factory 0xe000>;
-};
-
-&switch0 {
-	ports {
-		port at 0 {
-			status = "okay";
-			label = "wan";
-			mtd-mac-address = <&factory 0xe006>;
-		};
-
-		port at 2 {
-			status = "okay";
-			label = "lan1";
-		};
-
-		port at 3 {
-			status = "okay";
-			label = "lan2";
-		};
-
-		port at 4 {
-			status = "okay";
-			label = "lan3";
-		};
-	};
-};
-
-&state_default {
-	gpio {
-		groups = "uart2", "uart3", "wdt";
-		function = "gpio";
-	};
 };
diff --git a/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts b/target/linux/ramips/dts/mt7621_xiaomi_router-ac2100.dtsi
similarity index 73%
copy from target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts
copy to target/linux/ramips/dts/mt7621_xiaomi_router-ac2100.dtsi
index f0bc1aeb96..d19a3440b5 100644
--- a/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts
+++ b/target/linux/ramips/dts/mt7621_xiaomi_router-ac2100.dtsi
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
 
 #include "mt7621.dtsi"
 
@@ -7,45 +6,11 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	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 = "redmi-router-ac2100:amber:status";
-			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
-		};
-
-		led_status_white: status_white {
-			label = "redmi-router-ac2100:white:status";
-			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-		};
-
-		wan_amber {
-			label = "redmi-router-ac2100:amber:wan";
-			gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
-		};
-
-		wan_white {
-			label = "redmi-router-ac2100:white:wan";
-			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
-		};
-	};
-
 	keys {
 		compatible = "gpio-keys";
 
@@ -55,10 +20,8 @@
 			linux,code = <KEY_RESTART>;
 		};
 	};
-
 };
 
-
 &nand {
 	status = "okay";
 
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index 728b2efb24..9103fd6762 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -957,6 +957,27 @@ define Device/wevo_w2914ns-v2
 endef
 TARGET_DEVICES += wevo_w2914ns-v2
 
+define Device/xiaomi-ac2100
+  $(Device/uimage-lzma-loader)
+  BLOCKSIZE := 128k
+  PAGESIZE := 2048
+  KERNEL_SIZE := 4096k
+  IMAGE_SIZE := 120320k
+  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_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7615-firmware wpad-basic uboot-envtools
+endef
+
+define Device/xiaomi_mi-router-ac2100
+  $(Device/xiaomi-ac2100)
+  DEVICE_MODEL := Mi Router AC2100
+endef
+TARGET_DEVICES += xiaomi_mi-router-ac2100
+
 define Device/xiaomi_mir3g
   $(Device/uimage-lzma-loader)
   BLOCKSIZE := 128k
@@ -1009,19 +1030,8 @@ 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/xiaomi-ac2100)
   DEVICE_MODEL := Redmi Router AC2100
-  DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7615-firmware wpad-basic uboot-envtools
 endef
 TARGET_DEVICES += xiaomi_redmi-router-ac2100
 
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 37ebd0fb64..a0f9b2b10d 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
@@ -82,6 +82,9 @@ tplink,re650-v1)
 xzwifi,creativebox-v1)
 	ucidef_set_led_netdev "internet" "internet" "$boardname:blue:internet" "wan"
 	;;
+xiaomi,mi-router-ac2100)
+	ucidef_set_led_netdev "wan-blue" "WAN (blue)" "$boardname:blue:wan" "wan"
+	;;
 xiaomi,redmi-router-ac2100)
 	ucidef_set_led_netdev "wan" "wan" "$boardname:white:wan" "wan"
 	;;
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 9665993297..4b65dd2364 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
@@ -31,6 +31,7 @@ ramips_setup_interfaces()
 		;;
 	gehua,ghl-r-001|\
 	hiwifi,hc5962|\
+	xiaomi,mi-router-ac2100|\
 	xiaomi,mir3p|\
 	xiaomi,redmi-router-ac2100)
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"
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 233ed80b4e..00b2ffa89e 100755
--- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
@@ -55,6 +55,7 @@ platform_do_upgrade() {
 	netgear,wac104|\
 	netgear,wac124|\
 	netis,wf2881|\
+	xiaomi,mi-router-ac2100|\
 	xiaomi,mir3g|\
 	xiaomi,mir3p|\
 	xiaomi,redmi-router-ac2100)



More information about the lede-commits mailing list