diff --git a/FunKey/configs/funkey_defconfig b/FunKey/configs/funkey_defconfig
index 8740a96..b8be53e 100644
--- a/FunKey/configs/funkey_defconfig
+++ b/FunKey/configs/funkey_defconfig
@@ -2,9 +2,16 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_DL_DIR="../download"
 BR2_CCACHE=y
+BR2_SHARED_STATIC_LIBS=y
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/patches"
-BR2_TOOLCHAIN_EXTERNAL=y
-BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY=y
+BR2_TOOLCHAIN_BUILDROOT_VENDOR="funkey"
+BR2_TOOLCHAIN_BUILDROOT_MUSL=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+BR2_BINUTILS_VERSION_2_35_X=y
+BR2_GCC_VERSION_10_X=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_GCC_ENABLE_LTO=y
+BR2_TARGET_OPTIMIZATION="-fno-PIC -march=armv7-a+neon-vfpv4 -mtune=cortex-a7 -mfpu=neon-vfpv4"
 BR2_TARGET_GENERIC_HOSTNAME="FunKey"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the FunKey"
 BR2_ROOTFS_DEVICE_TABLE="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/device_table.txt"
diff --git a/Recovery/configs/recovery_defconfig b/Recovery/configs/recovery_defconfig
index 7570988..7d0de9f 100644
--- a/Recovery/configs/recovery_defconfig
+++ b/Recovery/configs/recovery_defconfig
@@ -2,9 +2,16 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_DL_DIR="../download"
 BR2_CCACHE=y
+BR2_SHARED_STATIC_LIBS=y
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_RECOVERY_PATH)/board/funkey/patches"
-BR2_TOOLCHAIN_EXTERNAL=y
-BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY=y
+BR2_TOOLCHAIN_BUILDROOT_VENDOR="funkey"
+BR2_TOOLCHAIN_BUILDROOT_MUSL=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+BR2_BINUTILS_VERSION_2_35_X=y
+BR2_GCC_VERSION_10_X=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_GCC_ENABLE_LTO=y
+BR2_TARGET_OPTIMIZATION="-fno-PIC -march=armv7-a+neon-vfpv4 -mtune=cortex-a7 -mfpu=neon-vfpv4"
 BR2_TARGET_GENERIC_HOSTNAME="FunKey"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Recovery Buildroot for the FunKey"
 BR2_ROOTFS_DEVICE_TABLE="$(BR2_EXTERNAL_RECOVERY_PATH)/board/funkey/device_table.txt"
diff --git a/buildroot b/buildroot
index d8082db..4c921fd 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit d8082db677046e004a6537828b3e4f4b9a818a4f
+Subproject commit 4c921fdee6d52a31a6ffcc5737075028ce0ca179