From 6154c9053c60f5a820d7f439822889236c1d2684 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Sat, 29 Aug 2020 01:42:38 +0800
Subject: [PATCH] mvebu: drop compat info

---
 .../base-files/etc/board.d/05_compat-version  | 26 -------------------
 .../etc/uci-defaults/05_fix-compat-version    | 21 ---------------
 target/linux/mvebu/image/cortexa9.mk          | 15 -----------
 3 files changed, 62 deletions(-)
 delete mode 100755 target/linux/mvebu/cortexa9/base-files/etc/board.d/05_compat-version
 delete mode 100644 target/linux/mvebu/cortexa9/base-files/etc/uci-defaults/05_fix-compat-version

diff --git a/target/linux/mvebu/cortexa9/base-files/etc/board.d/05_compat-version b/target/linux/mvebu/cortexa9/base-files/etc/board.d/05_compat-version
deleted file mode 100755
index 9304b84e7f..0000000000
--- a/target/linux/mvebu/cortexa9/base-files/etc/board.d/05_compat-version
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2020 OpenWrt.org
-#
-
-. /lib/functions.sh
-. /lib/functions/uci-defaults.sh
-
-board_config_update
-
-case "$(board_name)" in
-	linksys,wrt1200ac|\
-	linksys,wrt1900ac-v1|\
-	linksys,wrt1900ac-v2|\
-	linksys,wrt1900acs|\
-	linksys,wrt3200acm|\
-	linksys,wrt32x|\
-	solidrun,clearfog-base-a1|\
-	solidrun,clearfog-pro-a1)
-		ucidef_set_compat_version "1.1"
-		;;
-esac
-
-board_config_flush
-
-exit 0
diff --git a/target/linux/mvebu/cortexa9/base-files/etc/uci-defaults/05_fix-compat-version b/target/linux/mvebu/cortexa9/base-files/etc/uci-defaults/05_fix-compat-version
deleted file mode 100644
index 5965fdc2f5..0000000000
--- a/target/linux/mvebu/cortexa9/base-files/etc/uci-defaults/05_fix-compat-version
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright (C) 2020 OpenWrt.org
-#
-
-. /lib/functions.sh
-
-case "$(board_name)" in
-	linksys,wrt1200ac|\
-	linksys,wrt1900ac-v1|\
-	linksys,wrt1900ac-v2|\
-	linksys,wrt1900acs|\
-	linksys,wrt3200acm|\
-	linksys,wrt32x|\
-	solidrun,clearfog-base-a1|\
-	solidrun,clearfog-pro-a1)
-		uci set system.@system[0].compat_version="1.1"
-		uci commit system
-		;;
-esac
-
-exit 0
diff --git a/target/linux/mvebu/image/cortexa9.mk b/target/linux/mvebu/image/cortexa9.mk
index 824f142a8b..32a8b87a06 100644
--- a/target/linux/mvebu/image/cortexa9.mk
+++ b/target/linux/mvebu/image/cortexa9.mk
@@ -6,12 +6,6 @@
 # See /LICENSE for more information.
 #
 
-define Device/dsa-migration
-  DEVICE_COMPAT_VERSION := 1.1
-  DEVICE_COMPAT_MESSAGE := Config cannot be migrated from swconfig to DSA \
-	(early adopters with DSA already set up may just force-flash keeping existing config)
-endef
-
 define Device/buffalo_ls421de
   $(Device/NAND-128K)
   DEVICE_VENDOR := Buffalo
@@ -83,7 +77,6 @@ endef
 
 define Device/linksys_wrt1200ac
   $(call Device/linksys)
-  $(Device/dsa-migration)
   DEVICE_MODEL := WRT1200AC
   DEVICE_ALT0_VENDOR := Linksys
   DEVICE_ALT0_MODEL := Caiman
@@ -95,7 +88,6 @@ TARGET_DEVICES += linksys_wrt1200ac
 
 define Device/linksys_wrt1900acs
   $(call Device/linksys)
-  $(Device/dsa-migration)
   DEVICE_MODEL := WRT1900ACS
   DEVICE_VARIANT := v1
   DEVICE_ALT0_VENDOR := Linksys
@@ -111,7 +103,6 @@ TARGET_DEVICES += linksys_wrt1900acs
 
 define Device/linksys_wrt1900ac-v1
   $(call Device/linksys)
-  $(Device/dsa-migration)
   DEVICE_MODEL := WRT1900AC
   DEVICE_VARIANT := v1
   DEVICE_ALT0_VENDOR := Linksys
@@ -126,7 +117,6 @@ TARGET_DEVICES += linksys_wrt1900ac-v1
 
 define Device/linksys_wrt1900ac-v2
   $(call Device/linksys)
-  $(Device/dsa-migration)
   DEVICE_MODEL := WRT1900AC
   DEVICE_VARIANT := v2
   DEVICE_ALT0_VENDOR := Linksys
@@ -139,7 +129,6 @@ TARGET_DEVICES += linksys_wrt1900ac-v2
 
 define Device/linksys_wrt3200acm
   $(call Device/linksys)
-  $(Device/dsa-migration)
   DEVICE_MODEL := WRT3200ACM
   DEVICE_ALT0_VENDOR := Linksys
   DEVICE_ALT0_MODEL := Rango
@@ -151,7 +140,6 @@ TARGET_DEVICES += linksys_wrt3200acm
 
 define Device/linksys_wrt32x
   $(call Device/linksys)
-  $(Device/dsa-migration)
   DEVICE_MODEL := WRT32X
   DEVICE_ALT0_VENDOR := Linksys
   DEVICE_ALT0_MODEL := Venom
@@ -248,13 +236,10 @@ define Device/solidrun_clearfog-base-a1
   UBOOT := clearfog-u-boot-spl.kwb
   BOOT_SCRIPT := clearfog
   SUPPORTED_DEVICES += armada-388-clearfog-base
-  DEVICE_COMPAT_VERSION := 1.1
-  DEVICE_COMPAT_MESSAGE := Ethernet interface rename has been dropped
 endef
 TARGET_DEVICES += solidrun_clearfog-base-a1
 
 define Device/solidrun_clearfog-pro-a1
-  $(Device/dsa-migration)
   DEVICE_VENDOR := SolidRun
   DEVICE_MODEL := ClearFog Pro
   KERNEL_INSTALL := 1