aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuanhong Guo <gch981213@gmail.com>2024-01-23 19:20:47 +0800
committerChuanhong Guo <gch981213@gmail.com>2024-01-23 19:24:32 +0800
commit1b7e62b20b1735fcdc498a35e005afcd775abcf4 (patch)
tree245bf94f3ca41ad5a29f28fb6e31d662bd0f2017
parent135e10762077d96a976c0b00311ce95e77082a5d (diff)
downloadupstream-1b7e62b20b1735fcdc498a35e005afcd775abcf4.tar.gz
upstream-1b7e62b20b1735fcdc498a35e005afcd775abcf4.tar.bz2
upstream-1b7e62b20b1735fcdc498a35e005afcd775abcf4.zip
mediatek: drop NMBM layout for Xiaomi WR30U
This reverts commit dcdcfc15115a1038e90f21f5aa41726d9c7e2fe5. This is a firmware for third-party u-boot mod, which should not be carried here by us. Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
-rw-r--r--package/boot/uboot-envtools/files/mediatek_filogic1
-rw-r--r--target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u-112m-nmbm.dts22
-rw-r--r--target/linux/mediatek/filogic/base-files/etc/board.d/01_leds1
-rw-r--r--target/linux/mediatek/filogic/base-files/etc/board.d/02_network2
-rw-r--r--target/linux/mediatek/image/filogic.mk17
5 files changed, 0 insertions, 43 deletions
diff --git a/package/boot/uboot-envtools/files/mediatek_filogic b/package/boot/uboot-envtools/files/mediatek_filogic
index cae761b4f9f..4c483ca6143 100644
--- a/package/boot/uboot-envtools/files/mediatek_filogic
+++ b/package/boot/uboot-envtools/files/mediatek_filogic
@@ -101,7 +101,6 @@ ubnt,unifi-6-plus)
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x80000" "0x10000"
;;
xiaomi,mi-router-ax3000t|\
-xiaomi,mi-router-wr30u-112m-nmbm|\
xiaomi,mi-router-wr30u-stock|\
xiaomi,redmi-router-ax6000-stock)
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x10000" "0x20000"
diff --git a/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u-112m-nmbm.dts b/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u-112m-nmbm.dts
deleted file mode 100644
index 7244cdfd610..00000000000
--- a/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u-112m-nmbm.dts
+++ /dev/null
@@ -1,22 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-/dts-v1/;
-#include "mt7981b-xiaomi-mi-router-wr30u.dtsi"
-
-/ {
- model = "Xiaomi Mi Router WR30U (112M UBI with NMBM-Enabled layout)";
- compatible = "xiaomi,mi-router-wr30u-112m-nmbm", "mediatek,mt7981";
-};
-
-&spi_nand {
- mediatek,nmbm;
- mediatek,bmt-max-ratio = <1>;
- mediatek,bmt-max-reserved-blocks = <64>;
-};
-
-&partitions {
- partition@600000 {
- label = "ubi";
- reg = <0x600000 0x7000000>;
- };
-};
diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds b/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
index 51654ae87f3..b9fac1bebfe 100644
--- a/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
+++ b/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
@@ -33,7 +33,6 @@ routerich,ax3000)
ucidef_set_led_netdev "wan" "wan" "blue:wan" "wan" "link tx rx"
ucidef_set_led_netdev "wan-off" "wan-off" "red:wan" "wan" "link"
;;
-xiaomi,mi-router-wr30u-112m-nmbm|\
xiaomi,mi-router-wr30u-stock|\
xiaomi,mi-router-wr30u-ubootmod)
ucidef_set_led_netdev "wan" "wan" "blue:wan" "wan" "link tx rx"
diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
index 47e7be971e7..a198fb98c99 100644
--- a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
+++ b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
@@ -76,7 +76,6 @@ mediatek_setup_interfaces()
;;
xiaomi,mi-router-ax3000t|\
xiaomi,mi-router-ax3000t-ubootmod|\
- xiaomi,mi-router-wr30u-112m-nmbm|\
xiaomi,mi-router-wr30u-stock|\
xiaomi,mi-router-wr30u-ubootmod|\
xiaomi,redmi-router-ax6000-stock|\
@@ -164,7 +163,6 @@ mediatek_setup_macs()
;;
xiaomi,mi-router-ax3000t|\
xiaomi,mi-router-ax3000t-ubootmod|\
- xiaomi,mi-router-wr30u-112m-nmbm|\
xiaomi,mi-router-wr30u-stock|\
xiaomi,mi-router-wr30u-ubootmod|\
xiaomi,redmi-router-ax6000-stock|\
diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk
index 8a8879ca32b..c64a46fe247 100644
--- a/target/linux/mediatek/image/filogic.mk
+++ b/target/linux/mediatek/image/filogic.mk
@@ -799,23 +799,6 @@ endif
endef
TARGET_DEVICES += xiaomi_mi-router-ax3000t-ubootmod
-define Device/xiaomi_mi-router-wr30u-112m-nmbm
- DEVICE_VENDOR := Xiaomi
- DEVICE_MODEL := Mi Router WR30U (112M UBI with NMBM-Enabled layout)
- DEVICE_DTS := mt7981b-xiaomi-mi-router-wr30u-112m-nmbm
- DEVICE_DTS_DIR := ../dts
- UBINIZE_OPTS := -E 5
- BLOCKSIZE := 128k
- PAGESIZE := 2048
- DEVICE_PACKAGES := kmod-mt7981-firmware mt7981-wo-firmware
-ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
- ARTIFACTS := initramfs-factory.ubi
- ARTIFACT/initramfs-factory.ubi := append-image-stage initramfs-kernel.bin | ubinize-kernel
-endif
- IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
-endef
-TARGET_DEVICES += xiaomi_mi-router-wr30u-112m-nmbm
-
define Device/xiaomi_mi-router-wr30u-stock
DEVICE_VENDOR := Xiaomi
DEVICE_MODEL := Mi Router WR30U (stock layout)