diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-mt7976-ax6000-rfb2.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-mt7976-ax6000-rfb2.dts
deleted file mode 100644
index cbd9c6e..0000000
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-mt7976-ax6000-rfb2.dts
+++ /dev/null
@@ -1,11 +0,0 @@
-/dts-v1/;
-#include "mt7986a-rfb.dtsi"
-/ {
-	model = "MediaTek MT7986a RFB";
-	compatible = "mediatek,mt7986a-rfb";
-};
-
-&wbsys {
-	mediatek,mtd-eeprom = <&factory 0x0000>;
-	status = "okay";
-};
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-mt7976-ax7800-rfb2.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-mt7976-ax7800-rfb2.dts
deleted file mode 100644
index f6f8cbc..0000000
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-mt7976-ax7800-rfb2.dts
+++ /dev/null
@@ -1,6 +0,0 @@
-/dts-v1/;
-#include "mt7986a-rfb.dtsi"
-/ {
-	model = "MediaTek MT7986a RFB";
-	compatible = "mediatek,mt7986a-rfb";
-};
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-mt7975-ax6000-rfb1.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-nor-rfb.dts
similarity index 78%
rename from target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-mt7975-ax6000-rfb1.dts
rename to target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-nor-rfb.dts
index cbd9c6e..b273fee 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-mt7975-ax6000-rfb1.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-nor-rfb.dts
@@ -2,7 +2,7 @@
 #include "mt7986a-rfb.dtsi"
 / {
 	model = "MediaTek MT7986a RFB";
-	compatible = "mediatek,mt7986a-rfb";
+	compatible = "mediatek,mt7986a-nor-rfb";
 };
 
 &wbsys {
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-mt7975-ax6000-rfb1.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-snand-rfb.dts
similarity index 77%
copy from target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-mt7975-ax6000-rfb1.dts
copy to target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-snand-rfb.dts
index cbd9c6e..fc2b997 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-mt7975-ax6000-rfb1.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-snand-rfb.dts
@@ -2,7 +2,7 @@
 #include "mt7986a-rfb.dtsi"
 / {
 	model = "MediaTek MT7986a RFB";
-	compatible = "mediatek,mt7986a-rfb";
+	compatible = "mediatek,mt7986a-snand-rfb";
 };
 
 &wbsys {
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-mt7976-ax6000-rfb4.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-mt7976-ax6000-rfb4.dts
index ea024ae..6a0fa7c 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-mt7976-ax6000-rfb4.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-mt7976-ax6000-rfb4.dts
@@ -2,7 +2,7 @@
 #include "mt7986b-rfb.dtsi"
 / {
 	model = "MediaTek MT7986b RFB";
-	compatible = "mediatek,mt7986b-rfb";
+	compatible = "mediatek,mt7986b-snand-rfb";
 };
 
 &wbsys {
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-mt7975-ax6000-rfb1.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-nor-rfb.dts
similarity index 67%
copy from target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-mt7975-ax6000-rfb1.dts
copy to target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-nor-rfb.dts
index d4c8cef..5d76ced 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-mt7975-ax6000-rfb1.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-nor-rfb.dts
@@ -2,10 +2,10 @@
 #include "mt7986b-rfb.dtsi"
 / {
 	model = "MediaTek MT7986b RFB";
-	compatible = "mediatek,mt7986b-rfb";
+	compatible = "mediatek,mt7986b-nor-rfb";
 };
 
 &wbsys {
 	mediatek,mtd-eeprom = <&factory 0x0000>;
-	status = "okay";
+	status = "disabled";
 };
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-mt7975-ax6000-rfb1.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-snand-rfb.dts
similarity index 77%
rename from target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-mt7975-ax6000-rfb1.dts
rename to target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-snand-rfb.dts
index d4c8cef..383e649 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-mt7975-ax6000-rfb1.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986b-snand-rfb.dts
@@ -2,7 +2,7 @@
 #include "mt7986b-rfb.dtsi"
 / {
 	model = "MediaTek MT7986b RFB";
-	compatible = "mediatek,mt7986b-rfb";
+	compatible = "mediatek,mt7986b-snand-rfb";
 };
 
 &wbsys {
diff --git a/target/linux/mediatek/image/mt7986.mk b/target/linux/mediatek/image/mt7986.mk
index 5d1ae25..e1617be 100644
--- a/target/linux/mediatek/image/mt7986.mk
+++ b/target/linux/mediatek/image/mt7986.mk
@@ -1,19 +1,19 @@
 KERNEL_LOADADDR := 0x44080000
 
-define Device/mt7986a-mt7975-ax6000-rfb1
+define Device/mt7986a-ax6000-nor-rfb
   DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := mt7986a-mt7975-ax6000-rfb1
-  DEVICE_DTS := mt7986a-mt7975-ax6000-rfb1
+  DEVICE_MODEL := mt7986a-ax6000-nor-rfb
+  DEVICE_DTS := mt7986a-nor-rfb
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
 endef
-TARGET_DEVICES += mt7986a-mt7975-ax6000-rfb1
+TARGET_DEVICES += mt7986a-ax6000-nor-rfb
 
-define Device/mt7986a-mt7975-ax6000-rfb1-snand
+define Device/mt7986a-ax6000-snand-rfb
   DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := mt7986a-mt7975-ax6000-rfb1 (SPI-NAND,UBI)
-  DEVICE_DTS := mt7986a-mt7975-ax6000-rfb1
+  DEVICE_MODEL := mt7986a-ax6000-snand-rfb (SPI-NAND,UBI)
+  DEVICE_DTS := mt7986a-snand-rfb
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-  SUPPORTED_DEVICES := mediatek,mt7986-rfb-snand
+  SUPPORTED_DEVICES := mediatek,mt7986a-snand-rfb
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 128k
   PAGESIZE := 2048
@@ -23,22 +23,22 @@
   IMAGE/factory.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
 endef
-TARGET_DEVICES += mt7986a-mt7975-ax6000-rfb1-snand
+TARGET_DEVICES += mt7986a-ax6000-snand-rfb
 
-define Device/mt7986a-mt7976-ax6000-rfb2
+define Device/mt7986a-ax7800-nor-rfb
   DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := mt7986a-mt7976-ax6000-rfb2
-  DEVICE_DTS := mt7986a-mt7976-ax6000-rfb2
+  DEVICE_MODEL := mt7986a-ax7800-nor-rfb
+  DEVICE_DTS := mt7986a-nor-rfb
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
 endef
-TARGET_DEVICES += mt7986a-mt7976-ax6000-rfb2
+TARGET_DEVICES += mt7986a-ax7800-nor-rfb
 
-define Device/mt7986a-mt7976-ax6000-rfb2-snand
+define Device/mt7986a-ax7800-snand-rfb
   DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := mt7986a-mt7976-ax6000-rfb2 (SPI-NAND,UBI)
-  DEVICE_DTS := mt7986a-mt7976-ax6000-rfb2
+  DEVICE_MODEL := mt7986a-ax7800-snand-rfb (SPI-NAND,UBI)
+  DEVICE_DTS := mt7986a-snand-rfb
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-  SUPPORTED_DEVICES := mediatek,mt7986-rfb-snand
+  SUPPORTED_DEVICES := mediatek,mt7986a-snand-rfb
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 128k
   PAGESIZE := 2048
@@ -48,22 +48,22 @@
   IMAGE/factory.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
 endef
-TARGET_DEVICES += mt7986a-mt7976-ax6000-rfb2-snand
+TARGET_DEVICES += mt7986a-ax7800-snand-rfb
 
-define Device/mt7986a-mt7976-ax7800-rfb2
+define Device/mt7986b-ax6000-nor-rfb
   DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := mt7986a-mt7976-ax7800-rfb2
-  DEVICE_DTS := mt7986a-mt7976-ax7800-rfb2
+  DEVICE_MODEL := mt7986b-ax6000-nor-rfb
+  DEVICE_DTS := mt7986b-nor-rfb
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
 endef
-TARGET_DEVICES += mt7986a-mt7976-ax7800-rfb2
+TARGET_DEVICES += mt7986b-ax6000-nor-rfb
 
-define Device/mt7986a-mt7976-ax7800-rfb2-snand
+define Device/mt7986b-ax6000-snand-rfb
   DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := mt7986a-mt7976-ax7800-rfb2 (SPI-NAND,UBI)
-  DEVICE_DTS := mt7986a-mt7976-ax7800-rfb2
+  DEVICE_MODEL := mt7986b-ax6000-snand-rfb (SPI-NAND,UBI)
+  DEVICE_DTS := mt7986b-snand-rfb
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-  SUPPORTED_DEVICES := mediatek,mt7986-rfb-snand
+  SUPPORTED_DEVICES := mediatek,mt7986b-snand-rfb
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 128k
   PAGESIZE := 2048
@@ -73,47 +73,14 @@
   IMAGE/factory.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
 endef
-TARGET_DEVICES += mt7986a-mt7976-ax7800-rfb2-snand
-
-define Device/mt7986b-mt7975-ax6000-rfb1
-  DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := mt7986b-mt7975-ax6000-rfb1
-  DEVICE_DTS := mt7986b-mt7975-ax6000-rfb1
-  DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-endef
-TARGET_DEVICES += mt7986b-mt7975-ax6000-rfb1
-
-define Device/mt7986b-mt7975-ax6000-rfb1-snand
-  DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := mt7986b-mt7975-ax6000-rfb1 (SPI-NAND,UBI)
-  DEVICE_DTS := mt7986b-mt7975-ax6000-rfb1
-  DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-  SUPPORTED_DEVICES := mediatek,mt7986-rfb-snand
-  UBINIZE_OPTS := -E 5
-  BLOCKSIZE := 128k
-  PAGESIZE := 2048
-  IMAGE_SIZE := 65536k
-  KERNEL_IN_UBI := 1
-  IMAGES += factory.bin
-  IMAGE/factory.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
-  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
-endef
-TARGET_DEVICES += mt7986b-mt7975-ax6000-rfb1-snand
-
-define Device/mt7986b-mt7976-ax6000-rfb4
-  DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := mt7986b-mt7976-ax6000-rfb4
-  DEVICE_DTS := mt7986b-mt7976-ax6000-rfb4
-  DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-endef
-TARGET_DEVICES += mt7986b-mt7976-ax6000-rfb4
+TARGET_DEVICES += mt7986b-ax6000-snand-rfb
 
 define Device/mt7986b-mt7976-ax6000-rfb4-snand
   DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := mt7986b-mt7976-ax6000-rfb4 (SPI-NAND,UBI)
+  DEVICE_MODEL := mt7986b-mt7976-ax6000-rfb4-snand (SPI-NAND,UBI)
   DEVICE_DTS := mt7986b-mt7976-ax6000-rfb4
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-  SUPPORTED_DEVICES := mediatek,mt7986-rfb-snand
+  SUPPORTED_DEVICES := mediatek,mt7986b-snand-rfb
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 128k
   PAGESIZE := 2048
diff --git a/target/linux/mediatek/mt7986/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/mt7986/base-files/lib/upgrade/platform.sh
old mode 100755
new mode 100644
index 1b4de86..2ee99c7
--- a/target/linux/mediatek/mt7986/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/mt7986/base-files/lib/upgrade/platform.sh
@@ -2,8 +2,7 @@
 	local board=$(board_name)
 
 	case "$board" in
-	mediatek,mt7986-fpga,ubi |\
-	mediatek,mt7986-rfb-snand)
+	*snand*)
 		nand_do_upgrade "$1"
 		;;
 	*)
@@ -21,8 +20,7 @@
 	[ "$#" -gt 1 ] && return 1
 
 	case "$board" in
-	mediatek,mt7986-fpga,ubi |\
-	mediatek,mt7986-rfb-snand)
+	*snand*)
 		# tar magic `ustar`
 		magic="$(dd if="$1" bs=1 skip=257 count=5 2>/dev/null)"