diff --git a/package/boot/rockchip-rkbin/Makefile b/package/boot/rockchip-rkbin/Makefile
index 5046bdb16..41474b629 100644
--- a/package/boot/rockchip-rkbin/Makefile
+++ b/package/boot/rockchip-rkbin/Makefile
@@ -16,60 +16,70 @@ PKG_MIRROR_HASH:=49ffeae00fd5b6f53c94ae43d5377325e9284bd6ec5be3ab388512cccae7bab
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 
-include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/trusted-firmware-a.mk
 include $(INCLUDE_DIR)/package.mk
 
-define Trusted-Firmware-A/Default
-  NAME:=Rockchip $(1) SoCs
-  BUILD_TARGET:=rockchip
+define Build/rkbin/Target
+  $(eval $(call rkbin/Default,$(1)))
+  $(eval $(call rkbin/$(1),$(1)))
+
+  define Package/rkbin-$(1)
+    SECTION:=boot
+    CATEGORY:=Boot Loaders
+    TITLE:=Rockchip rkbin for $(1) SoCs
+    DEPENDS:=$(DEPENDS)
+    VARIANT:=$(1)
+  endef
+
+  define Package/rkbin-$(1)/install
+  $$(Package/rkbin/install)
+  endef
 endef
 
-define Trusted-Firmware-A/rk3328-bin
-  BUILD_SUBTARGET:=armv8
+define rkbin/rk3328
+  DEPENDS:=@TARGET_rockchip_armv8
   ATF:=rk33/rk322xh_bl31_v1.49.elf
   TPL:=rk33/rk3328_ddr_333MHz_v1.19.bin
   SPL:=rk33/rk322xh_miniloader_v2.50.bin
 endef
 
-define Trusted-Firmware-A/rk3399-bin
-  BUILD_SUBTARGET:=armv8
+define rkbin/rk3399
+  DEPENDS:=@TARGET_rockchip_armv8
   ATF:=rk33/rk3399_bl31_v1.36.elf
   TPL:=rk33/rk3399_ddr_800MHz_v1.30.bin
   SPL:=rk33/rk3399_miniloader_v1.30.bin
 endef
 
-define Trusted-Firmware-A/rk3528-bin
-  BUILD_SUBTARGET:=armv8
+define rkbin/rk3528
+  DEPENDS:=@TARGET_rockchip_armv8
   ATF:=rk35/rk3528_bl31_v1.17.elf
   TPL:=rk35/rk3528_ddr_1056MHz_v1.09.bin
 endef
 
-define Trusted-Firmware-A/rk3566-bin
-  BUILD_SUBTARGET:=armv8
+define rkbin/rk3566
+  DEPENDS:=@TARGET_rockchip_armv8
   ATF:=rk35/rk3568_bl31_v1.44.elf
   TPL:=rk35/rk3566_ddr_1056MHz_v1.21.bin
 endef
 
-define Trusted-Firmware-A/rk3568-bin
-  BUILD_SUBTARGET:=armv8
+define rkbin/rk3568
+  DEPENDS:=@TARGET_rockchip_armv8
   ATF:=rk35/rk3568_bl31_v1.44.elf
   TPL:=rk35/rk3568_ddr_1560MHz_v1.21.bin
 endef
 
-define Trusted-Firmware-A/rk3588-bin
-  BUILD_SUBTARGET:=armv8
+define rkbin/rk3588
+  DEPENDS:=@TARGET_rockchip_armv8
   ATF:=rk35/rk3588_bl31_v1.45.elf
   TPL:=rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin
 endef
 
-TFA_TARGETS:= \
-	rk3328-bin \
-	rk3399-bin \
-	rk3528-bin \
-	rk3566-bin \
-	rk3568-bin \
-	rk3588-bin
+VARIANTS:= \
+	rk3328 \
+	rk3399 \
+	rk3528 \
+	rk3566 \
+	rk3568 \
+	rk3588
 
 define Build/Compile
 	@echo Building idbLoader from Rockchip rkbin project...
@@ -78,7 +88,7 @@ ifneq ($(SPL),)
 		pushd $(PKG_BUILD_DIR) ; \
 		$(SED) 's,$$$$(PKG_BUILD_DIR),$(PKG_BUILD_DIR),g' trust.ini ; \
 		$(SED) 's,$$$$(VARIANT),$(BUILD_VARIANT),g' trust.ini ; \
-		./tools/mkimage -n $(BUILD_VARIANT) -T rksd -d bin/$(DDR) \
+		./tools/mkimage -n $(BUILD_VARIANT) -T rksd -d bin/$(TPL) \
 			$(BUILD_VARIANT)-idbloader.bin ; \
 		cat bin/$(SPL) >> $(BUILD_VARIANT)-idbloader.bin ; \
 		./tools/trust_merger --replace bl31.elf bin/$(ATF) trust.ini ; \
@@ -87,7 +97,17 @@ ifneq ($(SPL),)
 endif
 endef
 
-define Package/trusted-firmware-a/install
+define BuildPackage/rkbin
+  $(foreach type,$(if $(DUMP),$(VARIANTS),$(BUILD_VARIANT)), \
+    $(eval $(call Build/rkbin/Target,$(type)))
+  )
+  $(eval $(call Build/DefaultTargets))
+  $(foreach type,$(if $(DUMP),$(VARIANTS),$(BUILD_VARIANT)), \
+    $(call BuildPackage,rkbin-$(type))
+  )
+endef
+
+define Package/rkbin/install
 	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
 
 	$(CP) $(PKG_BUILD_DIR)/bin/$(ATF) $(STAGING_DIR_IMAGE)/
@@ -99,4 +119,4 @@ ifneq ($(SPL),)
 endif
 endef
 
-$(eval $(call BuildPackage/Trusted-Firmware-A))
+$(eval $(call BuildPackage/rkbin))
diff --git a/package/boot/uboot-rk35xx/Makefile b/package/boot/uboot-rk35xx/Makefile
index 26e959d3f..692ec965c 100644
--- a/package/boot/uboot-rk35xx/Makefile
+++ b/package/boot/uboot-rk35xx/Makefile
@@ -36,7 +36,7 @@ define U-Boot/evb-rk3528
     radxa_e20c \
     widora_mangopi-m28k \
     widora_mangopi-m28k-pro
-  DEPENDS:=+PACKAGE_u-boot-evb-rk3528:trusted-firmware-a-rk3528-bin
+  DEPENDS:=+PACKAGE_u-boot-evb-rk3528:rkbin-rk3528
   ATF:=rk3528_bl31_v1.17.elf
   DDR:=rk3528_ddr_1056MHz_v1.09.bin
   UBOOT_CONFIG:=rk3528
diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile
index 0a0ad0de6..71464eb08 100644
--- a/package/boot/uboot-rockchip/Makefile
+++ b/package/boot/uboot-rockchip/Makefile
@@ -26,7 +26,7 @@ endef
 
 define U-Boot/rk3328/Default
   BUILD_SUBTARGET:=armv8
-  DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3328-bin
+  DEPENDS:=+PACKAGE_u-boot-$(1):rkbin-rk3328
   ATF:=rk322xh_bl31_v1.49.elf
   USE_RKBIN:=1
 endef
@@ -109,7 +109,7 @@ define U-Boot/nanopi-r4s-rk3399
   NAME:=NanoPi R4S
   BUILD_DEVICES:= \
     friendlyarm_nanopi-r4s
-  DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3399-bin
+  DEPENDS:=+PACKAGE_u-boot-$(1):rkbin-rk3399
   ATF:=rk3399_bl31_v1.36.elf
   USE_RKBIN:=1
 endef
@@ -119,7 +119,7 @@ define U-Boot/nanopi-r4se-rk3399
   NAME:=NanoPi R4SE
   BUILD_DEVICES:= \
     friendlyarm_nanopi-r4se
-  DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3399-bin
+  DEPENDS:=+PACKAGE_u-boot-$(1):rkbin-rk3399
   ATF:=rk3399_bl31_v1.36.elf
   USE_RKBIN:=1
 endef
@@ -157,7 +157,7 @@ define U-Boot/sv901-eaio-rk3399
   NAME:=SV901 EAIO
   BUILD_DEVICES:= \
     scensmart_sv901-eaio
-  DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3399-bin
+  DEPENDS:=+PACKAGE_u-boot-$(1):rkbin-rk3399
   ATF:=rk3399_bl31_v1.36.elf
   USE_RKBIN:=1
 endef
@@ -166,7 +166,7 @@ endef
 
 define U-Boot/rk3566/Default
   BUILD_SUBTARGET:=armv8
-  DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3566-bin
+  DEPENDS:=+PACKAGE_u-boot-$(1):rkbin-rk3566
   ATF:=rk3568_bl31_v1.44.elf
   TPL:=rk3566_ddr_1056MHz_v1.21.bin
 endef
@@ -189,7 +189,7 @@ endef
 
 define U-Boot/rk3568/Default
   BUILD_SUBTARGET:=armv8
-  DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3568-bin
+  DEPENDS:=+PACKAGE_u-boot-$(1):rkbin-rk3568
   ATF:=rk3568_bl31_v1.44.elf
   TPL:=rk3568_ddr_1560MHz_v1.21.bin
 endef