diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk
index 62b05c38dc..9817d2506d 100644
--- a/packages/tools/u-boot/package.mk
+++ b/packages/tools/u-boot/package.mk
@@ -18,10 +18,6 @@ if [ -n "$UBOOT_FIRMWARE" ]; then
   PKG_DEPENDS_UNPACK+=" $UBOOT_FIRMWARE"
 fi
 
-CRUST_CONFIG=""
-[ -n "$UBOOT_SYSTEM" ] && CRUST_CONFIG=$($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM crust_config)
-[ -n "$CRUST_CONFIG" ] && PKG_DEPENDS_TARGET+=" crust"
-
 PKG_NEED_UNPACK="$PROJECT_DIR/$PROJECT/bootloader"
 [ -n "$DEVICE" ] && PKG_NEED_UNPACK+=" $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader"
 
@@ -54,9 +50,8 @@ make_target() {
     echo "see './scripts/uboot_helper' for more information"
   else
     [ "${BUILD_WITH_DEBUG}" = "yes" ] && PKG_DEBUG=1 || PKG_DEBUG=0
-    [ -n "$ATF_PLATFORM" ] && cp -av $(get_install_dir atf)/usr/share/bootloader/bl31.bin .
-    [ -n "$CRUST_CONFIG" ] && cp -av $(get_install_dir crust)/usr/share/bootloader/scp.bin .
     DEBUG=${PKG_DEBUG} CROSS_COMPILE="$TARGET_KERNEL_PREFIX" LDFLAGS="" ARCH=arm make mrproper
+    [ -n "$UBOOT_FIRMWARE" ] && find_file_path bootloader/firmware && . ${FOUND_PATH}
     DEBUG=${PKG_DEBUG} CROSS_COMPILE="$TARGET_KERNEL_PREFIX" LDFLAGS="" ARCH=arm make $($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM config)
     DEBUG=${PKG_DEBUG} CROSS_COMPILE="$TARGET_KERNEL_PREFIX" LDFLAGS="" ARCH=arm _python_sysroot="$TOOLCHAIN" _python_prefix=/ _python_exec_prefix=/ make $UBOOT_TARGET HOSTCC="$HOST_CC" HOSTLDFLAGS="-L$TOOLCHAIN/lib" HOSTSTRIP="true" CONFIG_MKIMAGE_DTC_PATH="scripts/dtc/dtc"
   fi
diff --git a/projects/Allwinner/bootloader/firmware b/projects/Allwinner/bootloader/firmware
new file mode 100644
index 0000000000..a7279806aa
--- /dev/null
+++ b/projects/Allwinner/bootloader/firmware
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
+
+[ -n "$ATF_PLATFORM" ] && cp -av $(get_install_dir atf)/usr/share/bootloader/bl31.bin .
+
+CRUST_CONFIG=$($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM crust_config)
+[ -n "$CRUST_CONFIG" ] && cp -av $(get_install_dir crust)/usr/share/bootloader/scp.bin .
+
+exit 0
diff --git a/projects/Allwinner/devices/A64/options b/projects/Allwinner/devices/A64/options
index bf15a6f811..2c4ce9b02e 100644
--- a/projects/Allwinner/devices/A64/options
+++ b/projects/Allwinner/devices/A64/options
@@ -26,7 +26,7 @@
     KERNEL_TARGET="Image"
 
   # U-Boot firmware package(s) to use
-    UBOOT_FIRMWARE="atf"
+    UBOOT_FIRMWARE="atf crust"
 
   # ATF platform
     ATF_PLATFORM="sun50i_a64"
diff --git a/projects/Allwinner/devices/H3/options b/projects/Allwinner/devices/H3/options
index 0b2e10dbb4..236844cb3f 100644
--- a/projects/Allwinner/devices/H3/options
+++ b/projects/Allwinner/devices/H3/options
@@ -37,6 +37,9 @@
   # Kernel target
     KERNEL_TARGET="zImage"
 
+  # U-Boot firmware package(s) to use
+    UBOOT_FIRMWARE="crust"
+
   # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
     OPENGLES="mesa"
 
diff --git a/projects/Allwinner/devices/H5/options b/projects/Allwinner/devices/H5/options
index 64d947e4df..64ec31abbe 100644
--- a/projects/Allwinner/devices/H5/options
+++ b/projects/Allwinner/devices/H5/options
@@ -26,7 +26,7 @@
     KERNEL_TARGET="Image"
 
   # U-Boot firmware package(s) to use
-    UBOOT_FIRMWARE="atf"
+    UBOOT_FIRMWARE="atf crust"
 
   # ATF platform
     ATF_PLATFORM="sun50i_a64"
diff --git a/projects/Allwinner/devices/H6/options b/projects/Allwinner/devices/H6/options
index 0f39db1780..0e5f216b77 100644
--- a/projects/Allwinner/devices/H6/options
+++ b/projects/Allwinner/devices/H6/options
@@ -26,7 +26,7 @@
     KERNEL_TARGET="Image"
 
   # U-Boot firmware package(s) to use
-    UBOOT_FIRMWARE="atf"
+    UBOOT_FIRMWARE="atf crust"
 
   # ATF platform
     ATF_PLATFORM="sun50i_h6"