diff --git a/buildroot-external/board/asus/hassos-hook.sh b/buildroot-external/board/asus/hassos-hook.sh
index cb6b8e60458..0ef27ce4326 100755
--- a/buildroot-external/board/asus/hassos-hook.sh
+++ b/buildroot-external/board/asus/hassos-hook.sh
@@ -19,8 +19,7 @@ function hassos_pre_image() {
     # SPL
     create_spl_image
 
-    dd if="${BINARIES_DIR}/idbloader.img" of="${SPL_IMG}" conv=notrunc bs=512 seek=64
-    dd if="${BINARIES_DIR}/u-boot-dtb.img" of="${SPL_IMG}" conv=notrunc bs=512 seek=8192
+    dd if="${BINARIES_DIR}/u-boot-rockchip.bin" of="${SPL_IMG}" conv=notrunc bs=512 seek=64
 }
 
 
diff --git a/buildroot-external/board/asus/tinker/patches/uboot/0001-SPL-modify-load-address-of-U-Boot.patch b/buildroot-external/board/asus/tinker/patches/uboot/0001-SPL-modify-load-address-of-U-Boot.patch
deleted file mode 100644
index 21d51588e6c..00000000000
--- a/buildroot-external/board/asus/tinker/patches/uboot/0001-SPL-modify-load-address-of-U-Boot.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 48021de3511573e8dda7c3c0446ba85eeb37921a Mon Sep 17 00:00:00 2001
-From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Fri, 24 Apr 2020 12:41:50 +0000
-Subject: [PATCH] SPL: modify load address of U-Boot
-
-Default load address of U-Boot is at sector 16384, which is where HAOS
-has its first partition. Use 0x2000 (8192) instead.
-
-Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- configs/tinker-rk3288_defconfig   | 1 +
- configs/tinker-s-rk3288_defconfig | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
-index 303c3295be..398ba196b5 100644
---- a/configs/tinker-rk3288_defconfig
-+++ b/configs/tinker-rk3288_defconfig
-@@ -101,3 +101,4 @@ CONFIG_VIDEO_ROCKCHIP=y
- CONFIG_DISPLAY_ROCKCHIP_HDMI=y
- CONFIG_CMD_DHRYSTONE=y
- CONFIG_ERRNO_STR=y
-+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x2000
-diff --git a/configs/tinker-s-rk3288_defconfig b/configs/tinker-s-rk3288_defconfig
-index 3267fdc082..1e781c18ae 100644
---- a/configs/tinker-s-rk3288_defconfig
-+++ b/configs/tinker-s-rk3288_defconfig
-@@ -103,3 +103,4 @@ CONFIG_DISPLAY_ROCKCHIP_HDMI=y
- CONFIG_CONSOLE_SCROLL_LINES=10
- CONFIG_CMD_DHRYSTONE=y
- CONFIG_ERRNO_STR=y
-+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x2000
--- 
-2.43.0
-
diff --git a/buildroot-external/board/asus/tinker/uboot.config b/buildroot-external/board/asus/tinker/uboot.config
index 13e696205f4..92d243f451e 100644
--- a/buildroot-external/board/asus/tinker/uboot.config
+++ b/buildroot-external/board/asus/tinker/uboot.config
@@ -1,3 +1,5 @@
 # CONFIG_USB_STORAGE is not set
 # CONFIG_DOS_PARTITION is not set
 CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_SPL_PAD_TO=0x3f8000
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x2000
diff --git a/buildroot-external/configs/tinker_defconfig b/buildroot-external/configs/tinker_defconfig
index 6b6ec731966..3c62c0fa2b4 100644
--- a/buildroot-external/configs/tinker_defconfig
+++ b/buildroot-external/configs/tinker_defconfig
@@ -137,10 +137,8 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-s-rk3288"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/uboot.config"
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
-BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y
-BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y
-BR2_TARGET_UBOOT_SPL=y
-BR2_TARGET_UBOOT_SPL_NAME="idbloader.img"
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-rockchip.bin"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y