diff --git a/config/boards/pinebook-pro.wip b/config/boards/pinebook-pro.wip
new file mode 100644
index 0000000000..2ca0c72c44
--- /dev/null
+++ b/config/boards/pinebook-pro.wip
@@ -0,0 +1,6 @@
+# RK3399 hexa core 2G/4GB SoC Laptop eMMC USB3 WiFi
+BOARD_NAME="Pinebook Pro"
+BOARDFAMILY="rockchip64"
+BOOTCONFIG="pinebook_pro-rk3399_defconfig"
+KERNEL_TARGET="legacy,current,dev"
+FULL_DESKTOP="yes"
diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc
index 7a3539255f..456890bc05 100644
--- a/config/sources/families/include/rockchip64_common.inc
+++ b/config/sources/families/include/rockchip64_common.inc
@@ -22,7 +22,7 @@ if [[ $BOOTCONFIG == *3328* ]]; then
 	ATF_TARGET_MAP='PLAT=rk322xh DEBUG=1 bl31;;trust.bin'
 	CPUMAX="1390000"
 
-elif [[ $BOARD == rockpro64 ]] || [[ $BOARD == rockpi-4* ]]; then
+elif [[ $BOARD == rockpro64 ]] || [[ $BOARD == rockpi-4* ]] || [[ $BOARD == pinebook-pro ]]; then
 
 	UBOOT_TARGET_MAP="BL31=$SRC/cache/sources/rkbin-tools/rk33/rk3399_bl31_v1.17.elf u-boot-dtb.bin spl/u-boot-spl.bin u-boot.itb;;spl/u-boot-spl.bin u-boot.itb"
 
@@ -113,6 +113,7 @@ family_tweaks()
 	[[ $BOARD == nanopim4v2 ]] && echo "fdtfile=rockchip/rk3399-nanopi-m4v2.dtb" >> $SDCARD/boot/armbianEnv.txt
 	[[ $BOARD == nanopineo4 ]] && echo "fdtfile=rockchip/rk3399-nanopi-neo4.dtb" >> $SDCARD/boot/armbianEnv.txt
 	[[ $BOARD == orangepi-rk3399 ]] && echo "fdtfile=rockchip/rk3399-orangepi.dtb" >> $SDCARD/boot/armbianEnv.txt
+	[[ $BOARD == pinebook-pro ]] && echo "fdtfile=rockchip/rk3399-pinebook-pro.dtb" >> $SDCARD/boot/armbianEnv.txt
 	[[ $BOARD == roc-rk3399-pc ]] && echo "fdtfile=rockchip/rk3399-roc-pc.dtb" >> $SDCARD/boot/armbianEnv.txt
 	[[ $BOARD == rockpi-4* ]] && echo "fdtfile=rockchip/rk3399-rock-pi-4.dtb" >> $SDCARD/boot/armbianEnv.txt
 
diff --git a/config/sources/families/rockchip64.conf b/config/sources/families/rockchip64.conf
index 1527ae81bf..7e5dbacf2e 100644
--- a/config/sources/families/rockchip64.conf
+++ b/config/sources/families/rockchip64.conf
@@ -21,7 +21,7 @@ esac
 uboot_custom_postprocess()
 {
 	# bootloader image
-	if [[ $BOARD == rockpro64 ]] || [[ $BOARD == rockpi-4* ]]; then
+	if [[ $BOARD == rockpro64 ]] || [[ $BOARD == rockpi-4* ]] || [[ $BOARD == pinebook-pro ]]; then
 		# 3399
 		tools/mkimage -n rk3399 -T rksd -d $SRC/cache/sources/rkbin-tools/rk33/rk3399_ddr_933MHz_v1.13.bin rksd_loader.img
 		cat spl/u-boot-spl.bin >> rksd_loader.img
diff --git a/patch/atf/atf-rockchip64/board_pinebook-pro/add-trust-ini.patch b/patch/atf/atf-rockchip64/board_pinebook-pro/add-trust-ini.patch
new file mode 100644
index 0000000000..528ec55708
--- /dev/null
+++ b/patch/atf/atf-rockchip64/board_pinebook-pro/add-trust-ini.patch
@@ -0,0 +1,21 @@
+diff --git a/trust.ini b/trust.ini
+new file mode 100644
+index 0000000..4af021a
+--- /dev/null
++++ b/trust.ini
+@@ -0,0 +1,15 @@
++[VERSION]
++MAJOR=1
++MINOR=0
++[BL30_OPTION]
++SEC=0
++[BL31_OPTION]
++SEC=1
++PATH=./build/rk3399/debug/bl31/bl31.elf
++ADDR=0x10000
++[BL32_OPTION]
++SEC=0
++[BL33_OPTION]
++SEC=0
++[OUTPUT]
++PATH=trust.bin