diff --git a/package/boot/uboot-envtools/files/qualcommax_ipq60xx b/package/boot/uboot-envtools/files/qualcommax_ipq60xx
index 2f8126a1424..2c1cbbda1e3 100644
--- a/package/boot/uboot-envtools/files/qualcommax_ipq60xx
+++ b/package/boot/uboot-envtools/files/qualcommax_ipq60xx
@@ -14,9 +14,6 @@ case "$board" in
 	[ -n "$idx" ] && \
 		ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x10000" "0x10000"
 	;;
-cmiot,ax18|\
-zn,m2|\
-qihoo,v6|\
 redmi,ax5|\
 xiaomi,ax1800|\
 netgear,wax214)
diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
index 56554662102..51a65c2d846 100644
--- a/package/firmware/ipq-wifi/Makefile
+++ b/package/firmware/ipq-wifi/Makefile
@@ -31,7 +31,6 @@ ALLWIFIBOARDS:= \
 	8devices_mango \
 	arcadyan_aw1000 \
 	buffalo_wxr-5950ax12 \
-  cmiot_ax18 \
 	cmcc_rm2-6 \
 	compex_wpq873 \
 	dynalink_dl-wrx36 \
@@ -46,21 +45,19 @@ ALLWIFIBOARDS:= \
 	netgear_wax620 \
 	netgear_wax630 \
 	prpl_haze \
-  qihoo_v6 \
 	qnap_301w \
-  redmi_ax5 \
+  redmi_ax5
 	redmi_ax6 \
 	wallys_dr40x9 \
-  xiaomi_ax1800 \
+  xiaomi_ax1800
 	xiaomi_ax3600 \
 	xiaomi_ax9000 \
 	yyets_le1 \
 	yuncore_ax880 \
-  zn_m2 \
 	zte_mf269 \
 	zte_mf287 \
 	zte_mf287plus \
-	zyxel_nbg7815 \
+	zyxel_nbg7815
 
 ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))
 
@@ -153,7 +150,6 @@ endef
 $(eval $(call generate-ipq-wifi-package,8devices_mango,8devices Mango))
 $(eval $(call generate-ipq-wifi-package,arcadyan_aw1000,Arcadyan AW1000))
 $(eval $(call generate-ipq-wifi-package,buffalo_wxr-5950ax12,Buffalo WXR-5950AX12))
-$(eval $(call generate-ipq-wifi-package,cmiot_ax18,CMIOT AX18))
 $(eval $(call generate-ipq-wifi-package,cmcc_rm2-6,CMCC RM2-6))
 $(eval $(call generate-ipq-wifi-package,compex_wpq873,Compex WPQ-873))
 $(eval $(call generate-ipq-wifi-package,dynalink_dl-wrx36,Dynalink DL-WRX36))
@@ -167,7 +163,6 @@ $(eval $(call generate-ipq-wifi-package,netgear_wax214,Netgear WAX214))
 $(eval $(call generate-ipq-wifi-package,netgear_wax218,Netgear WAX218))
 $(eval $(call generate-ipq-wifi-package,netgear_wax620,Netgear WAX620))
 $(eval $(call generate-ipq-wifi-package,netgear_wax630,Netgear WAX630))
-$(eval $(call generate-ipq-wifi-package,qihoo_v6,Qihoo V6))
 $(eval $(call generate-ipq-wifi-package,qnap_301w,QNAP 301w))
 $(eval $(call generate-ipq-wifi-package,prpl_haze,prpl Haze))
 $(eval $(call generate-ipq-wifi-package,redmi_ax5,Redmi AX5))
@@ -178,7 +173,6 @@ $(eval $(call generate-ipq-wifi-package,xiaomi_ax3600,Xiaomi AX3600))
 $(eval $(call generate-ipq-wifi-package,xiaomi_ax9000,Xiaomi AX9000))
 $(eval $(call generate-ipq-wifi-package,yyets_le1,YYeTs LE1))
 $(eval $(call generate-ipq-wifi-package,yuncore_ax880,Yuncore AX880))
-$(eval $(call generate-ipq-wifi-package,zn_m2,ZN M2))
 $(eval $(call generate-ipq-wifi-package,zte_mf269,ZTE MF269))
 $(eval $(call generate-ipq-wifi-package,zte_mf287,ZTE MF287))
 $(eval $(call generate-ipq-wifi-package,zte_mf287plus,ZTE MF287Plus))
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-ax18.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-ax18.dts
deleted file mode 100644
index f42754f4f34..00000000000
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-ax18.dts
+++ /dev/null
@@ -1,71 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+)
-
-/dts-v1/;
-
-#include "ipq6018-cmiot.dtsi"
-
-/ {
-	model = "CMIOT AX18";
-	compatible = "cmiot,ax18", "qcom,ipq6018";
-
-	aliases {
- 		led-boot = &led_power;
- 		led-failsafe = &led_power;
- 		led-running = &led_power;
- 		led-upgrade = &led_power;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		pinctrl-0 = <&leds_pins>;
-		pinctrl-names = "default";
-
-		led_power: power {
-			label = "ax18:blue:power";
-			gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>;
-		};
-
-		wan {
-			label = "ax18:blue:wan";
-			gpio = <&tlmm 74 GPIO_ACTIVE_HIGH>;
-		};
-
-		wlan2g {
-			label = "ax18:blue:wlan2g";
-			gpio = <&tlmm 37 GPIO_ACTIVE_HIGH>;
-		};
-
-		wlan5g {
-			label = "ax18:blue:wlan5g";
-			gpio = <&tlmm 35 GPIO_ACTIVE_HIGH>;
-		};
-
-		wps {
-			label = "ax18:red:wps";
-			gpio = <&tlmm 69 GPIO_ACTIVE_HIGH>;
-		};
-	};
-};
-
-&tlmm {
-	leds_pins: leds_pins {
-		mux_0 {
-			pins = "gpio35", "gpio37",
-				"gpio69", "gpio74";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-
-		mux_1 {
-			pins = "gpio73";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-	};
-};
-
-&wifi {
-	qcom,ath11k-calibration-variant = "CMIOT-AX18";
-};
\ No newline at end of file
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-m2.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-m2.dts
deleted file mode 100644
index 3282e8028c7..00000000000
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-m2.dts
+++ /dev/null
@@ -1,70 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+)
-
-/dts-v1/;
-
-#include "ipq6018-cmiot.dtsi"
-
-/ {
-	model = "ZN M2";
-	compatible = "zn,m2", "qcom,ipq6018";
-
-	aliases {
-		led-boot = &led_power;
-		led-failsafe = &led_power;
-		led-running = &led_power;
-		led-upgrade = &led_power;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		pinctrl-0 = <&leds_pins>;
-		pinctrl-names = "default";
-
-		led_power: power {
-			label = "m2:blue:power";
-			gpio = <&tlmm 58 GPIO_ACTIVE_HIGH>;
-		};
-
-		mesh {
-			label = "m2:blue:mesh";
-			gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>;
-		};
-
-		lan {
-			label = "m2:blue:lan";
-			gpio = <&tlmm 74 GPIO_ACTIVE_HIGH>;
-		};
-
-		wan {
-			label = "m2:blue:wan";
-			gpio = <&tlmm 37 GPIO_ACTIVE_HIGH>;
-		};
-
-		wlan5g {
-			label = "m2:blue:wlan5g";
-			gpio = <&tlmm 35 GPIO_ACTIVE_HIGH>;
-		};
-
-		wlan2g {
-			label = "m2:blue:wlan2g";
-			gpio = <&tlmm 70 GPIO_ACTIVE_HIGH>;
-		};
-	};
-};
-
-&tlmm {
-	leds_pins: leds_pins {
-		mux {
-			pins = "gpio35", "gpio37",
-				"gpio58", "gpio70",
-				"gpio73", "gpio74";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-	};
-};
-
-&wifi {
-	qcom,ath11k-calibration-variant = "ZN-M2";
-};
\ No newline at end of file
diff --git a/target/linux/qualcommax/image/ipq60xx.mk b/target/linux/qualcommax/image/ipq60xx.mk
index e81f3d25ab8..62c987a5dcd 100644
--- a/target/linux/qualcommax/image/ipq60xx.mk
+++ b/target/linux/qualcommax/image/ipq60xx.mk
@@ -49,42 +49,3 @@ define Device/xiaomi_ax1800
 	DEVICE_PACKAGES := ipq-wifi-xiaomi_ax1800
 endef
 TARGET_DEVICES += xiaomi_ax1800
-
-define Device/cmiot_ax18
-	$(call Device/FitImage)
-	$(call Device/UbiFit)
-	DEVICE_VENDOR := CMIOT
-	DEVICE_MODEL := AX18
-	BLOCKSIZE := 128k
-	PAGESIZE := 2048
-	DEVICE_DTS_CONFIG := config@cp03-c1
-	SOC := ipq6018
-	DEVICE_PACKAGES := ipq-wifi-cmiot_ax18 kmod-fs-ext4 mkf2fs f2fsck kmod-fs-f2fs
-endef
-TARGET_DEVICES += cmiot_ax18
-
-define Device/zn_m2
-	$(call Device/FitImage)
-	$(call Device/UbiFit)
-	DEVICE_VENDOR := ZN
-	DEVICE_MODEL := M2
-	BLOCKSIZE := 128k
-	PAGESIZE := 2048
-	DEVICE_DTS_CONFIG := config@cp03-c1
-	SOC := ipq6018
-	DEVICE_PACKAGES := ipq-wifi-zn_m2
-endef
-TARGET_DEVICES += zn_m2
-
-define Device/qihoo_v6
-	$(call Device/FitImage)
-	$(call Device/UbiFit)
-	DEVICE_VENDOR := Qihoo
-	DEVICE_MODEL := V6
-	BLOCKSIZE := 128k
-	PAGESIZE := 2048
-	DEVICE_DTS_CONFIG := config@cp03-c1
-	SOC := ipq6018
-	DEVICE_PACKAGES := ipq-wifi-qihoo_v6
-endef
-TARGET_DEVICES += qihoo_v6
diff --git a/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/01_leds b/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/01_leds
index 6f0ff86eaf9..90bc639d7bf 100644
--- a/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/01_leds
+++ b/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/01_leds
@@ -10,12 +10,6 @@ case "$board" in
     xiaomi,ax1800)
 	ucidef_set_led_netdev "internet" "Internet" "blue:network" "wan"
 	;;
-	cmiot,ax18|\
-    zn,m2)
-    ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth0"
-    ucidef_set_led_netdev "wlan2g" "WLAN2G" "blue:wlan2g" "wlan1"
-    ucidef_set_led_netdev "wlan5g" "WLAN5G" "blue:wlan5g" "wlan0"
-    ;;
     
 *)
 	;;
diff --git a/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/02_network b/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/02_network
index c351784d83c..da2b614c0f1 100644
--- a/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/02_network
+++ b/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/02_network
@@ -11,19 +11,18 @@ ipq60xx_setup_interfaces()
 	local board="$1"
 
 	case "$board" in
-	cmiot,ax18|\
-	zn,m2)
-		ucidef_set_interfaces_lan_wan "eth1 eth2 eth3" "eth0"
-        ;;
 	8devices,mango-dvk)
 		ucidef_set_interfaces_lan_wan "lan1 lan2" "wan"
 		;;
 	netgear,wax214)
 		ucidef_set_interfaces_lan_wan "lan"
 		;;
+<<<<<<< HEAD
 	qihoo,v6）
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"
 		;;
+=======
+>>>>>>> parent of 2f0e14b1e2 (qualcommax: ipq60xx: add ZN-M2 Qihoo-V6 CMIOT-AX18)
 	redmi,ax5|\
 	xiaomi,ax1800)
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"
diff --git a/target/linux/qualcommax/ipq60xx/base-files/etc/hotplug.d/firmware/11-ath11-caldata b/target/linux/qualcommax/ipq60xx/base-files/etc/hotplug.d/firmware/11-ath11-caldata
index 6719640810b..5cba22f3e37 100644
--- a/target/linux/qualcommax/ipq60xx/base-files/etc/hotplug.d/firmware/11-ath11-caldata
+++ b/target/linux/qualcommax/ipq60xx/base-files/etc/hotplug.d/firmware/11-ath11-caldata
@@ -12,10 +12,9 @@ case "$FIRMWARE" in
 	8devices,mango-dvk)
 		caldata_extract "0:ART" 0x1000 0x20000
 		;;
-	netgear,wax214|\
-	cmiot,ax18|\
-	zn,m2|\
-	qihoo,v6|\
+	netgear,wax214)
+		caldata_extract "0:art" 0x1000 0x10000
+		;;
 	redmi,ax5|\
 	xiaomi,ax1800)
 		caldata_extract "0:art" 0x1000 0x10000
diff --git a/target/linux/qualcommax/ipq60xx/base-files/lib/upgrade/platform.sh b/target/linux/qualcommax/ipq60xx/base-files/lib/upgrade/platform.sh
index 00c38cae11f..1b025377131 100644
--- a/target/linux/qualcommax/ipq60xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/qualcommax/ipq60xx/base-files/lib/upgrade/platform.sh
@@ -10,9 +10,6 @@ platform_check_image() {
 
 platform_do_upgrade() {
 	case "$(board_name)" in
-	cmiot,ax18|\
-	zn,m2|\
-	qihoo,v6|\
 	redmi,ax5|\
 	xiaomi,ax1800|\
 	netgear,wax214)