diff --git a/linux/buildroot-config-src/main.config b/linux/buildroot-config-src/main.config
index 438d3f368..060c8892e 100644
--- a/linux/buildroot-config-src/main.config
+++ b/linux/buildroot-config-src/main.config
@@ -1,8 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Buildroot -g73f9753-dirty Configuration
+# Buildroot 2021.05 Configuration
 #
 BR2_HAVE_DOT_CONFIG=y
+BR2_HOST_GCC_AT_LEAST_4_9=y
+BR2_HOST_GCC_AT_LEAST_5=y
+BR2_HOST_GCC_AT_LEAST_6=y
+BR2_HOST_GCC_AT_LEAST_7=y
+BR2_HOST_GCC_AT_LEAST_8=y
 
 #
 # Target options
@@ -101,7 +106,6 @@ BR2_ENABLE_DEBUG=y
 # BR2_DEBUG_1 is not set
 # BR2_DEBUG_2 is not set
 BR2_DEBUG_3=y
-# BR2_ENABLE_RUNTIME_DEBUG is not set
 # BR2_STRIP_strip is not set
 # BR2_OPTIMIZE_0 is not set
 # BR2_OPTIMIZE_1 is not set
@@ -165,11 +169,9 @@ BR2_KERNEL_HEADERS_AS_KERNEL=y
 # BR2_KERNEL_HEADERS_5_10 is not set
 # BR2_KERNEL_HEADERS_5_11 is not set
 # BR2_KERNEL_HEADERS_5_12 is not set
-# BR2_KERNEL_HEADERS_5_13 is not set
 # BR2_KERNEL_HEADERS_VERSION is not set
 # BR2_KERNEL_HEADERS_CUSTOM_TARBALL is not set
 # BR2_KERNEL_HEADERS_CUSTOM_GIT is not set
-# BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13 is not set
 # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12 is not set
 # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_11 is not set
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
@@ -250,7 +252,6 @@ BR2_BINUTILS_EXTRA_CONFIG_OPTIONS=""
 # BR2_GCC_VERSION_8_X is not set
 # BR2_GCC_VERSION_9_X is not set
 BR2_GCC_VERSION_10_X=y
-# BR2_GCC_VERSION_11_X is not set
 BR2_GCC_VERSION="10.3.0"
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 # BR2_TOOLCHAIN_BUILDROOT_CXX is not set
@@ -368,10 +369,7 @@ BR2_TARGET_GENERIC_PASSWD_METHOD="sha-256"
 BR2_INIT_BUSYBOX=y
 # BR2_INIT_SYSV is not set
 # BR2_INIT_OPENRC is not set
-
-#
-# systemd needs a glibc toolchain w/ SSP, headers >= 3.10, host and target gcc >= 5
-#
+# BR2_INIT_SYSTEMD is not set
 # BR2_INIT_NONE is not set
 # BR2_ROOTFS_DEVICE_CREATION_STATIC is not set
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
@@ -656,7 +654,6 @@ BR2_PACKAGE_GDB_ARCH_SUPPORTS=y
 # BR2_PACKAGE_IOZONE is not set
 # BR2_PACKAGE_KTAP is not set
 # BR2_PACKAGE_LATENCYTOP is not set
-# BR2_PACKAGE_LIBBPF is not set
 # BR2_PACKAGE_LMBENCH is not set
 BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS=y
 # BR2_PACKAGE_LTP_TESTSUITE is not set
@@ -668,7 +665,6 @@ BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS=y
 # BR2_PACKAGE_NETSNIFF_NG is not set
 # BR2_PACKAGE_NMON is not set
 # BR2_PACKAGE_PAX_UTILS is not set
-# BR2_PACKAGE_POKE is not set
 # BR2_PACKAGE_PV is not set
 # BR2_PACKAGE_RAMSMP is not set
 # BR2_PACKAGE_RAMSPEED is not set
@@ -950,10 +946,6 @@ BR2_PACKAGE_NETSURF_ARCH_SUPPORTS=y
 # apitrace needs a toolchain w/ C++, wchar, dynamic library, threads, gcc >= 4.9
 #
 
-#
-# mupdf needs a toolchain w/ C++, gcc >= 4.8
-#
-
 #
 # vte needs a toolchain w/ wchar, threads, C++, gcc >= 4.8
 #
@@ -1161,10 +1153,6 @@ BR2_PACKAGE_FLASHROM_ARCH_SUPPORTS=y
 # BR2_PACKAGE_USB_MODESWITCH is not set
 # BR2_PACKAGE_USB_MODESWITCH_DATA is not set
 
-#
-# usbguard needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8
-#
-
 #
 # usbmount requires udev to be enabled
 #
@@ -1185,24 +1173,19 @@ BR2_PACKAGE_FLASHROM_ARCH_SUPPORTS=y
 BR2_PACKAGE_HOST_ERLANG_ARCH_SUPPORTS=y
 # BR2_PACKAGE_EXECLINE is not set
 # BR2_PACKAGE_FICL is not set
-# BR2_PACKAGE_GUILE is not set
 # BR2_PACKAGE_HASERL is not set
 # BR2_PACKAGE_JANET is not set
 # BR2_PACKAGE_JIMTCL is not set
 # BR2_PACKAGE_LUA is not set
 BR2_PACKAGE_PROVIDES_HOST_LUAINTERPRETER="host-lua"
 # BR2_PACKAGE_MICROPYTHON is not set
-# BR2_PACKAGE_MOARVM is not set
 BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS=y
 BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS=y
 # BR2_PACKAGE_PERL is not set
 # BR2_PACKAGE_PHP is not set
 # BR2_PACKAGE_PYTHON is not set
 # BR2_PACKAGE_PYTHON3 is not set
-
-#
-# quickjs needs a glibc or musl toolchain w/ gcc >= 4.9, host gcc >= 4.9, dynamic library
-#
+# BR2_PACKAGE_QUICKJS is not set
 # BR2_PACKAGE_RUBY is not set
 # BR2_PACKAGE_TCL is not set
 
@@ -1928,7 +1911,6 @@ BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS=y
 # czmq needs a toolchain w/ C++, threads
 #
 # BR2_PACKAGE_DAQ is not set
-# BR2_PACKAGE_DAQ3 is not set
 # BR2_PACKAGE_DAVICI is not set
 # BR2_PACKAGE_ENET is not set
 
@@ -2024,7 +2006,6 @@ BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS=y
 #
 # libpjsip needs a toolchain w/ C++, threads
 #
-# BR2_PACKAGE_LIBPSL is not set
 # BR2_PACKAGE_LIBRELP is not set
 # BR2_PACKAGE_LIBRSYNC is not set
 # BR2_PACKAGE_LIBSHAIRPLAY is not set
@@ -2167,7 +2148,6 @@ BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS=y
 #
 # bctoolbox needs a toolchain w/ C++, threads
 #
-# BR2_PACKAGE_BDWGC is not set
 
 #
 # belr needs a toolchain w/ threads, C++
@@ -2260,8 +2240,6 @@ BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS=y
 # libabseil-cpp needs a toolchain w/ gcc >= 4.9, C++, threads, dynamic library
 #
 # BR2_PACKAGE_LIBARGTABLE2 is not set
-BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS=y
-# BR2_PACKAGE_LIBATOMIC_OPS is not set
 # BR2_PACKAGE_LIBAVL is not set
 # BR2_PACKAGE_LIBB64 is not set
 # BR2_PACKAGE_LIBBACKTRACE is not set
@@ -2317,7 +2295,6 @@ BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT=y
 # BR2_PACKAGE_LIBPTHREAD_STUBS is not set
 # BR2_PACKAGE_LIBPTHSEM is not set
 # BR2_PACKAGE_LIBPWQUALITY is not set
-# BR2_PACKAGE_LIBQB is not set
 
 #
 # libsigc++ needs a toolchain w/ C++, gcc >= 4.8
@@ -3063,7 +3040,6 @@ BR2_PACKAGE_INITSCRIPTS=y
 #
 # sdbusplus needs systemd and a toolchain w/ C++, gcc >= 7
 #
-# BR2_PACKAGE_SEATD is not set
 # BR2_PACKAGE_SMACK is not set
 
 #
@@ -3147,7 +3123,6 @@ BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG=y
 # BR2_PACKAGE_HOST_ANDROID_TOOLS is not set
 # BR2_PACKAGE_HOST_ASN1C is not set
 # BR2_PACKAGE_HOST_BABELTRACE2 is not set
-# BR2_PACKAGE_HOST_BMAP_TOOLS is not set
 # BR2_PACKAGE_HOST_BTRFS_PROGS is not set
 # BR2_PACKAGE_HOST_CHECKPOLICY is not set
 # BR2_PACKAGE_HOST_CHECKSEC is not set
@@ -3155,12 +3130,10 @@ BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG=y
 # BR2_PACKAGE_HOST_CRAMFS is not set
 # BR2_PACKAGE_HOST_CRYPTSETUP is not set
 # BR2_PACKAGE_HOST_DBUS_PYTHON is not set
-
-#
-# host dfu-util needs a toolchain w/ host gcc >= 4.9
-#
+# BR2_PACKAGE_HOST_DFU_UTIL is not set
 # BR2_PACKAGE_HOST_DOS2UNIX is not set
 # BR2_PACKAGE_HOST_DOSFSTOOLS is not set
+# BR2_PACKAGE_HOST_DOXYGEN is not set
 # BR2_PACKAGE_HOST_DTC is not set
 BR2_PACKAGE_HOST_E2FSPROGS=y
 # BR2_PACKAGE_HOST_E2TOOLS is not set
@@ -3197,10 +3170,7 @@ BR2_PACKAGE_HOST_KMOD=y
 # BR2_PACKAGE_HOST_MTD is not set
 # BR2_PACKAGE_HOST_MTOOLS is not set
 # BR2_PACKAGE_HOST_ODB is not set
-
-#
-# host openocd needs a toolchain w/ host gcc >= 4.9
-#
+# BR2_PACKAGE_HOST_OPENOCD is not set
 # BR2_PACKAGE_HOST_OPKG_UTILS is not set
 # BR2_PACKAGE_HOST_PARTED is not set
 BR2_PACKAGE_HOST_PATCHELF=y
@@ -3225,10 +3195,7 @@ BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y
 # BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE is not set
 # BR2_PACKAGE_HOST_QEMU_VDE2 is not set
 # BR2_PACKAGE_HOST_QEMU_VIRTFS is not set
-
-#
-# USB passthrough support needs a toolchain w/ host gcc >= 4.9
-#
+# BR2_PACKAGE_HOST_QEMU_USB is not set
 # BR2_PACKAGE_HOST_QORIQ_RCW is not set
 # BR2_PACKAGE_HOST_RAUC is not set
 BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS=y
diff --git a/linux/buildroot-config-src/make-buildroot.sh b/linux/buildroot-config-src/make-buildroot.sh
deleted file mode 100755
index 841db1ba4..000000000
--- a/linux/buildroot-config-src/make-buildroot.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-cp main.config ../buildroot/.config
-cd ../buildroot
-make