diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile
index 69d1324b3..3cffcaef9 100644
--- a/package/boot/uboot-rockchip/Makefile
+++ b/package/boot/uboot-rockchip/Makefile
@@ -182,6 +182,7 @@ define U-Boot/station-p2-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3568_bl31_v1.28.elf
   DDR:=rk3568_ddr_1560MHz_v1.13.bin
+  OF_PRE_BUILD:=$(1)
 endef
 
 UBOOT_TARGETS := \
@@ -224,6 +225,12 @@ else
 	$(CP) $(PKG_BUILD_DIR)/idbloader.img $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-idbloader.img
 	$(CP) $(PKG_BUILD_DIR)/u-boot.itb $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-u-boot.itb
 endif
+
+ifneq ($(OF_PRE_BUILD),)
+	$(CP) $(PKG_BUILD_DIR)/of-pre-build/$(OF_PRE_BUILD)/idbloader.img $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-idbloader.img
+	$(CP) $(PKG_BUILD_DIR)/of-pre-build/$(OF_PRE_BUILD)/uboot.img $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-u-boot.itb
+	$(CP) $(PKG_BUILD_DIR)/of-pre-build/$(OF_PRE_BUILD)/boot.scr $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-boot.scr
+endif
 endef
 
 define Package/u-boot/install/default
diff --git a/package/boot/uboot-rockchip/src/of-pre-build/station-p2-rk3568/boot.scr b/package/boot/uboot-rockchip/src/of-pre-build/station-p2-rk3568/boot.scr
new file mode 100644
index 000000000..c2fa70467
Binary files /dev/null and b/package/boot/uboot-rockchip/src/of-pre-build/station-p2-rk3568/boot.scr differ
diff --git a/package/boot/uboot-rockchip/src/of-pre-build/station-p2-rk3568/idbloader.img b/package/boot/uboot-rockchip/src/of-pre-build/station-p2-rk3568/idbloader.img
new file mode 100644
index 000000000..8b7829037
Binary files /dev/null and b/package/boot/uboot-rockchip/src/of-pre-build/station-p2-rk3568/idbloader.img differ
diff --git a/package/boot/uboot-rockchip/src/of-pre-build/station-p2-rk3568/uboot.img b/package/boot/uboot-rockchip/src/of-pre-build/station-p2-rk3568/uboot.img
new file mode 100644
index 000000000..555d76352
Binary files /dev/null and b/package/boot/uboot-rockchip/src/of-pre-build/station-p2-rk3568/uboot.img differ
diff --git a/scripts/gen_image_gpt.sh b/scripts/gen_image_gpt.sh
new file mode 100755
index 000000000..68af1f2ff
--- /dev/null
+++ b/scripts/gen_image_gpt.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+# Copyright (C) 2006-2012 OpenWrt.org
+set -e -x
+if [ $# -ne 5 ] && [ $# -ne 6 ]; then
+    echo "SYNTAX: $0 <file> <kernel size> <kernel directory> <rootfs size> <rootfs image>"
+    exit 1
+fi
+
+OUTPUT="$1"
+KERNELSIZE="$2"
+KERNELDIR="$3"
+ROOTFSSIZE="$4"
+ROOTFSIMAGE="$5"
+
+UBOOTSIZE=8
+UBOOTOFFSET=8
+KERNELOFFSET="$(($UBOOTOFFSET + $UBOOTSIZE))"
+ROOTFSOFFSET="$(($KERNELSIZE + $KERNELOFFSET))"
+
+rm -f "$OUTPUT"
+
+# create partition table
+set $(ptgen -g -o "$OUTPUT" -a 2 -N uboot -p "$UBOOTSIZE"M@"$UBOOTOFFSET"M -N kernel -p "$KERNELSIZE"M@"$KERNELOFFSET"M -N rootfs -p "$ROOTFSSIZE"M@"$ROOTFSOFFSET"M)
+
+KERNELOFFSET="$(($3 / 512))"
+KERNELSIZE="$4"
+ROOTFSOFFSET="$(($5 / 512))"
+ROOTFSSIZE="$(($6 / 512))"
+
+[ -n "$PADDING" ] && dd if=/dev/zero of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc count="$ROOTFSSIZE"
+dd if="$ROOTFSIMAGE" of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc
+
+if [ -n "$GUID" ]; then
+    [ -n "$PADDING" ] && dd if=/dev/zero of="$OUTPUT" bs=512 seek="$((ROOTFSOFFSET + ROOTFSSIZE))" conv=notrunc count="$sect"
+    mkfs.fat -n kernel -C "$OUTPUT.kernel" -S 512 "$((KERNELSIZE / 1024))"
+    mcopy -s -i "$OUTPUT.kernel" "$KERNELDIR"/* ::/
+else
+    make_ext4fs -J -L kernel -l "$KERNELSIZE" "$OUTPUT.kernel" "$KERNELDIR"
+fi
+dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc
+rm -f "$OUTPUT.kernel"
diff --git a/target/linux/rockchip/image/Makefile b/target/linux/rockchip/image/Makefile
index 0278ec519..8e4474a2b 100644
--- a/target/linux/rockchip/image/Makefile
+++ b/target/linux/rockchip/image/Makefile
@@ -25,6 +25,11 @@ define Build/boot-script
 	mkimage -A arm -O linux -T script -C none -a 0 -e 0 -d $(if $(1),$(1),mmc).bootscript $@.boot/boot.scr
 endef
 
+define Build/boot-script-bin
+	# Hack: this boot scr is pre build from bsp uboot
+	cp "$(STAGING_DIR_IMAGE)"/$(UBOOT_DEVICE_NAME)-boot.scr $@.boot/boot.scr
+endef
+
 define Build/pine64-img
 	# Creates the final SD/eMMC images, 
 	# combining boot partition, root partition as well as the u-boot bootloader
@@ -65,6 +70,17 @@ define Build/pine64-bin
 	dd if="$(STAGING_DIR_IMAGE)"/$(SOC)-trust.bin of="$@" seek=24576 conv=notrunc
 endef
 
+define Build/rockchip-gpt-img
+	PADDING=1 $(SCRIPT_DIR)/gen_image_gpt.sh \
+		$@ \
+		$(CONFIG_TARGET_KERNEL_PARTSIZE) $@.boot \
+		$(CONFIG_TARGET_ROOTFS_PARTSIZE) $(IMAGE_ROOTFS)
+
+	# Copy the idbloader and the u-boot image to the image at sector 0x40 and 0x4000
+	dd if="$(STAGING_DIR_IMAGE)"/$(UBOOT_DEVICE_NAME)-idbloader.img of="$@" seek=64 conv=notrunc
+	dd if="$(STAGING_DIR_IMAGE)"/$(UBOOT_DEVICE_NAME)-u-boot.itb of="$@" seek=16384 conv=notrunc
+endef
+
 ### Devices ###
 define Device/Default
   PROFILES := Default
diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk
index 791171d35..d026d720a 100644
--- a/target/linux/rockchip/image/armv8.mk
+++ b/target/linux/rockchip/image/armv8.mk
@@ -127,7 +127,7 @@ define Device/firefly_station-p2
   DEVICE_MODEL := Station P2
   DEVICE_DTS := rockchip/rk3568-roc-pc
   UBOOT_DEVICE_NAME := station-p2-rk3568
-  IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r5s | pine64-img | gzip | append-metadata
+  IMAGE/sysupgrade.img.gz := boot-common | boot-script-bin | rockchip-gpt-img | gzip | append-metadata
   DEVICE_PACKAGES := kmod-ikconfig kmod-ata-ahci-platform
 endef
 #TARGET_DEVICES += firefly_station-p2