diff --git a/config/buildroot_nano.patch b/config/buildroot_nano.patch
index b894d7f4457c40d6d80c05bc3f2d078fa09f2b1f..31ac479a1da4ec060179c164ad2e27872e6b37a7 100644
--- a/config/buildroot_nano.patch
+++ b/config/buildroot_nano.patch
@@ -955,14 +955,13 @@ index 0000000000..f1c64ba55e
 +CONFIG_USB_EHCI_HCD=y
 diff --git a/configs/nanopi_neo_plus2_defconfig b/configs/nanopi_neo_plus2_defconfig
 new file mode 100644
-index 0000000000..ee781631a9
+index 0000000000..849a568b4d
 --- /dev/null
 +++ b/configs/nanopi_neo_plus2_defconfig
 @@ -0,0 +1,63 @@
 +BR2_aarch64=y
 +BR2_ARM_FPU_VFPV4=y
 +BR2_TOOLCHAIN_EXTERNAL=y
-+BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY=y
 +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi NEO Plus2"
 +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo-plus2/genimage.cfg"
@@ -982,6 +981,7 @@ index 0000000000..ee781631a9
 +BR2_PACKAGE_LINUX_TOOLS_TMON=y
 +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 +BR2_PACKAGE_GDB=y
++BR2_PACKAGE_GDB_SERVER=y
 +BR2_PACKAGE_GDB_DEBUGGER=y
 +BR2_PACKAGE_OPROFILE=y
 +BR2_PACKAGE_STRACE=y