diff --git a/bsp/ar71xx/.config b/bsp/ar71xx/.config
index 7ff35114a7e7936c67fef7cb19c8a2a569dd3080..895c5e8f033bf5206de10aa7ce04e4913693f432 100644
--- a/bsp/ar71xx/.config
+++ b/bsp/ar71xx/.config
@@ -6,6 +6,8 @@ CONFIG_TARGET_ar71xx_generic=y
 CONFIG_TARGET_MULTI_PROFILE=y
 CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_gl-ar150=y
 CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_gl-ar150=""
+CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_archer-c7-v2=y
+CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_archer-c7-v2=""
 CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_cpe210-220=y
 CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_cpe210-220=""
 CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_cpe510-520=y
diff --git a/bsp/archerc7/.config b/bsp/archerc7/.config
deleted file mode 100644
index e86e8bf53e9bd9404f48a965d07e247e60a0f3f0..0000000000000000000000000000000000000000
--- a/bsp/archerc7/.config
+++ /dev/null
@@ -1,28 +0,0 @@
-# Generated using "./buildscript config openwrt".
-# Do no edit manually
-#
-CONFIG_TARGET_ar71xx=y
-CONFIG_TARGET_ar71xx_generic=y
-CONFIG_TARGET_ar71xx_generic_Default=y
-CONFIG_BUSYBOX_CUSTOM=y
-# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
-# CONFIG_BUSYBOX_CONFIG_CROND is not set
-# CONFIG_BUSYBOX_CONFIG_CRONTAB is not set
-# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
-CONFIG_CLEAN_IPKG=y
-# CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 is not set
-# CONFIG_FASTD_ENABLE_MAC_GHASH is not set
-# CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC is not set
-# CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set
-# CONFIG_PACKAGE_ALFRED_VIS is not set
-CONFIG_PACKAGE_ath10k-firmware-qca988x=y
-CONFIG_PACKAGE_gpioctl-sysfs=y
-CONFIG_PACKAGE_kmod-ath10k=y
-CONFIG_PACKAGE_kmod-ifb=y
-CONFIG_PACKAGE_kmod-ledtrig-heartbeat=y
-CONFIG_PACKAGE_kmod-ledtrig-netdev=y
-CONFIG_PACKAGE_kmod-sched-connmark=y
-CONFIG_PACKAGE_libugpio=y
-# CONFIG_PACKAGE_opkg is not set
-CONFIG_PACKAGE_qos-scripts=y
-CONFIG_PACKAGE_tc=y
diff --git a/bsp/board_ar71xx.bsp b/bsp/board_ar71xx.bsp
index bd7c0334fff903001ce8880f781359493414ad67..a6747ba7e42a6b45a8cb495d64722a444c4a22f8 100644
--- a/bsp/board_ar71xx.bsp
+++ b/bsp/board_ar71xx.bsp
@@ -27,4 +27,5 @@ images=("lede-ar71xx-generic-cpe210-220-squashfs-sysupgrade.bin"
         "lede-ar71xx-generic-tl-wdr3600-v1-squashfs-sysupgrade.bin"
         "lede-ar71xx-generic-tl-wdr4300-v1-squashfs-sysupgrade.bin"
         "lede-ar71xx-generic-tl-wdr4310-v1-squashfs-sysupgrade.bin"
+        "lede-ar71xx-generic-archer-c7-v2-squashfs-sysupgrade.bin"
         )
diff --git a/bsp/board_archerc7.bsp b/bsp/board_archerc7.bsp
deleted file mode 100644
index 5427e0b45065c14f771c950a10a4698f5404896c..0000000000000000000000000000000000000000
--- a/bsp/board_archerc7.bsp
+++ /dev/null
@@ -1,5 +0,0 @@
-machine=archerc7
-chipset=ar71xx
-target=$builddir/$machine
-images=("lede-ar71xx-generic-archer-c7-v2-squashfs-sysupgrade.bin"
-        )