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>
(cherry picked from commit 1b7e62b20b1735fcdc498a35e005afcd775abcf4)

diff --git a/package/boot/uboot-envtools/files/mediatek_filogic b/package/boot/uboot-envtools/files/mediatek_filogic
index 65a17bde0ea1a4f6deaecfa8480d310bda8f7543..48e59d6a6a6efa119c8960a3ca9c979beb4421ba 100644 (file)
--- a/package/boot/uboot-envtools/files/mediatek_filogic
+++ b/package/boot/uboot-envtools/files/mediatek_filogic
@@ -78,7 +78,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 (file)
index 7244cdf..0000000
--- 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 163300699821091aeafea26a3c496ef62469d6e9..7d7d41362cfdea984c761629176499fbafed104a 100644 (file)
--- a/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
+++ b/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
@@ -36,7 +36,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 687a5b3f8d439cd78fc8f4384aa311391211e0f5..0eb27744e9d54d5bf4cfc1988751cf93ecca0dd6 100644 (file)
--- a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
+++ b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
@@ -70,7 +70,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|\
@@ -145,7 +144,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 1a8f0b37456d56f5e1045cf6d6e1388ba554209c..872a5592f4145fdd24970b633380948ca99848a5 100644 (file)
--- a/target/linux/mediatek/image/filogic.mk
+++ b/target/linux/mediatek/image/filogic.mk
@@ -761,23 +761,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)