-tools-$(BUILD_TOOLCHAIN) += gmp mpfr mpc libelf expat
-tools-y += m4 libtool autoconf automake flex bison pkg-config mklibs zlib
-tools-y += sstrip make-ext4fs e2fsprogs mtd-utils mkimage
-tools-y += firmware-utils patch-image quilt padjffs2
-tools-y += mm-macros missing-macros cmake scons bc findutils gengetopt patchelf
-tools-y += mtools dosfstools libressl
-tools-$(CONFIG_TARGET_orion_generic) += wrt350nv2-builder upslug2
-tools-$(CONFIG_TARGET_x86) += qemu
-tools-$(CONFIG_TARGET_mxs) += elftosb sdimage
-tools-$(CONFIG_TARGET_ar71xx) += lzma-old
-tools-$(CONFIG_TARGET_ar71xx)$(CONFIG_TARGET_ath79) += squashfs
-tools-$(CONFIG_USES_MINOR) += kernel2minor
-tools-y += lzma squashfskit4 zip
+tools-y += autoconf autoconf-archive automake bc bison cmake cpio dosfstools
+tools-y += e2fsprogs fakeroot findutils firmware-utils flex gengetopt
+tools-y += libressl libtool lzma m4 make-ext4fs missing-macros mkimage
+tools-y += mklibs mm-macros mtd-utils mtools padjffs2 patch-image
+tools-y += patchelf pkgconf quilt squashfskit4 sstrip xxd zip zlib zstd