diff --git a/buildroot-2021.05/configs/milkv-duo-lite_musl_riscv64_defconfig b/buildroot-2021.05/configs/milkv-duo-lite_musl_riscv64_defconfig
index 3c09b16c0..c76f4e35b 100644
--- a/buildroot-2021.05/configs/milkv-duo-lite_musl_riscv64_defconfig
+++ b/buildroot-2021.05/configs/milkv-duo-lite_musl_riscv64_defconfig
@@ -279,7 +279,7 @@ BR2_PACKAGE_SKELETON_INIT_SYSV=y
 # dt needs a glibc or uClibc toolchain w/ threads
 #
 # BR2_PACKAGE_DUMA is not set
-# BR2_PACKAGE_FIO is not set
+BR2_PACKAGE_FIO=y
 BR2_PACKAGE_GDB_ARCH_SUPPORTS=y
 BR2_PACKAGE_GDB=y
 # BR2_PACKAGE_IOZONE is not set
diff --git a/buildroot-2021.05/configs/milkv-duo256m-lite_musl_riscv64_defconfig b/buildroot-2021.05/configs/milkv-duo256m-lite_musl_riscv64_defconfig
index 8e80cdc15..7d58fc633 100644
--- a/buildroot-2021.05/configs/milkv-duo256m-lite_musl_riscv64_defconfig
+++ b/buildroot-2021.05/configs/milkv-duo256m-lite_musl_riscv64_defconfig
@@ -256,7 +256,7 @@ BR2_PACKAGE_SKELETON_INIT_SYSV=y
 # dt needs a glibc or uClibc toolchain w/ threads
 #
 # BR2_PACKAGE_DUMA is not set
-# BR2_PACKAGE_FIO is not set
+BR2_PACKAGE_FIO=y
 BR2_PACKAGE_GDB_ARCH_SUPPORTS=y
 BR2_PACKAGE_GDB=y
 # BR2_PACKAGE_IOZONE is not set
diff --git a/buildroot-2021.05/configs/milkv-duo256m_musl_riscv64_defconfig b/buildroot-2021.05/configs/milkv-duo256m_musl_riscv64_defconfig
index 8dded991a..f122a114b 100644
--- a/buildroot-2021.05/configs/milkv-duo256m_musl_riscv64_defconfig
+++ b/buildroot-2021.05/configs/milkv-duo256m_musl_riscv64_defconfig
@@ -256,7 +256,7 @@ BR2_PACKAGE_SKELETON_INIT_SYSV=y
 # dt needs a glibc or uClibc toolchain w/ threads
 #
 # BR2_PACKAGE_DUMA is not set
-# BR2_PACKAGE_FIO is not set
+BR2_PACKAGE_FIO=y
 BR2_PACKAGE_GDB_ARCH_SUPPORTS=y
 BR2_PACKAGE_GDB=y
 # BR2_PACKAGE_IOZONE is not set
diff --git a/buildroot-2021.05/configs/milkv-duo_musl_riscv64_defconfig b/buildroot-2021.05/configs/milkv-duo_musl_riscv64_defconfig
index 0e1b1695e..7d48ec292 100644
--- a/buildroot-2021.05/configs/milkv-duo_musl_riscv64_defconfig
+++ b/buildroot-2021.05/configs/milkv-duo_musl_riscv64_defconfig
@@ -279,7 +279,7 @@ BR2_PACKAGE_SKELETON_INIT_SYSV=y
 # dt needs a glibc or uClibc toolchain w/ threads
 #
 # BR2_PACKAGE_DUMA is not set
-# BR2_PACKAGE_FIO is not set
+BR2_PACKAGE_FIO=y
 BR2_PACKAGE_GDB_ARCH_SUPPORTS=y
 BR2_PACKAGE_GDB=y
 # BR2_PACKAGE_IOZONE is not set
diff --git a/buildroot-2021.05/configs/milkv-duos-emmc_musl_riscv64_defconfig b/buildroot-2021.05/configs/milkv-duos-emmc_musl_riscv64_defconfig
index f3d9584fe..b0207aebf 100644
--- a/buildroot-2021.05/configs/milkv-duos-emmc_musl_riscv64_defconfig
+++ b/buildroot-2021.05/configs/milkv-duos-emmc_musl_riscv64_defconfig
@@ -256,7 +256,7 @@ BR2_PACKAGE_SKELETON_INIT_SYSV=y
 # dt needs a glibc or uClibc toolchain w/ threads
 #
 # BR2_PACKAGE_DUMA is not set
-# BR2_PACKAGE_FIO is not set
+BR2_PACKAGE_FIO=y
 BR2_PACKAGE_GDB_ARCH_SUPPORTS=y
 BR2_PACKAGE_GDB=y
 # BR2_PACKAGE_IOZONE is not set
diff --git a/buildroot-2021.05/configs/milkv-duos-sd_musl_riscv64_defconfig b/buildroot-2021.05/configs/milkv-duos-sd_musl_riscv64_defconfig
index b7330001a..88f2fc63f 100644
--- a/buildroot-2021.05/configs/milkv-duos-sd_musl_riscv64_defconfig
+++ b/buildroot-2021.05/configs/milkv-duos-sd_musl_riscv64_defconfig
@@ -256,7 +256,7 @@ BR2_PACKAGE_SKELETON_INIT_SYSV=y
 # dt needs a glibc or uClibc toolchain w/ threads
 #
 # BR2_PACKAGE_DUMA is not set
-# BR2_PACKAGE_FIO is not set
+BR2_PACKAGE_FIO=y
 BR2_PACKAGE_GDB_ARCH_SUPPORTS=y
 BR2_PACKAGE_GDB=y
 # BR2_PACKAGE_IOZONE is not set
diff --git a/buildroot-2021.05/dl/fio/.lock b/buildroot-2021.05/dl/fio/.lock
new file mode 100644
index 000000000..e69de29bb
diff --git a/buildroot-2021.05/dl/fio/fio-3.19.tar.gz b/buildroot-2021.05/dl/fio/fio-3.19.tar.gz
new file mode 100644
index 000000000..dd89ed7d9
Binary files /dev/null and b/buildroot-2021.05/dl/fio/fio-3.19.tar.gz differ
diff --git a/buildroot-2021.05/package/fio/fio.mk b/buildroot-2021.05/package/fio/fio.mk
index 3ddd74eda..a6c015ab0 100644
--- a/buildroot-2021.05/package/fio/fio.mk
+++ b/buildroot-2021.05/package/fio/fio.mk
@@ -26,7 +26,7 @@ define FIO_CONFIGURE_CMDS
 endef
 
 define FIO_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+	$(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" -C $(@D)
 endef
 
 define FIO_INSTALL_TARGET_CMDS