diff --git a/_multibuild b/_multibuild
index fb1133a..ba54e17 100644
--- a/_multibuild
+++ b/_multibuild
@@ -63,6 +63,7 @@
pcm051rev3
pine64plus
pinebook
+ pinebook-pro-rk3399
pineh64
poplar
qemu-ppce500
diff --git a/u-boot.changes b/u-boot.changes
index 26d7df1..22cd8f4 100644
--- a/u-boot.changes
+++ b/u-boot.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Nov 20 20:00:52 UTC 2020 - Frank Kunz
+
+- Added u-boot tools binaries to tools package
+
+-------------------------------------------------------------------
+Fri Nov 20 13:58:32 UTC 2020 - Guillaume GARDET
+
+- Add pinebook-pro-rk3399 support
+
-------------------------------------------------------------------
Wed Nov 18 13:50:35 UTC 2020 - Guillaume GARDET
diff --git a/u-boot.spec b/u-boot.spec
index 049747a..0d68706 100644
--- a/u-boot.spec
+++ b/u-boot.spec
@@ -74,9 +74,11 @@
%define rockchip_spl 1
%define rkimages $()
%endif
-%if "%target" == "puma-rk3399" || "%target" == "rock960-rk3399"
+%if "%target" == "pinebook-pro-rk3399" || "%target" == "puma-rk3399" || "%target" == "rock960-rk3399"
%define is_rk3399 1
%define is_armv8 1
+%define rockchip_idb 1
+%define binext .itb
%endif
%if "%target" == "bananapim64" || "%target" == "nanopia64" || "%target" == "pine64plus" || "%target" == "pinebook"
%define is_a64 1
@@ -386,7 +388,7 @@ export OPENSBI=%{_datadir}/opensbi/opensbi-sifive-fu540.bin
%if "%{name}" == "u-boot-rock64-rk3328"
cp %{_datadir}/arm-trusted-firmware-rk3328/bl31.elf .
%endif
-%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" || "%{name}" == "u-boot-rock-pi-4-rk3399"
+%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" || "%{name}" == "u-boot-rock-pi-4-rk3399" || "%{name}" == "u-boot-pinebook-pro-rk3399"
cp %{_datadir}/arm-trusted-firmware-rk3399/bl31.elf .
%endif
%endif
@@ -451,6 +453,13 @@ done
%install
%if %tools_only
+install -D -m 0755 tools/mkenvimage %{buildroot}%{_bindir}/mkenvimage
+install -D -m 0755 tools/gen_ethaddr_crc %{buildroot}%{_bindir}/gen_ethaddr_crc
+install -D -m 0755 tools/dumpimage %{buildroot}%{_bindir}/dumpimage
+install -D -m 0755 tools/fit_info %{buildroot}%{_bindir}/fit_info
+install -D -m 0755 tools/fit_check_sign %{buildroot}%{_bindir}/fit_check_sign
+install -D -m 0755 tools/fdtgrep %{buildroot}%{_bindir}/fdtgrep
+install -D -m 0755 tools/ifwitool %{buildroot}%{_bindir}/ifwitool
install -D -m 0755 tools/mkimage %{buildroot}%{_bindir}/mkimage
install -D -m 0644 doc/mkimage.1 %{buildroot}%{_mandir}/man1/mkimage.1
@@ -564,6 +573,13 @@ fi
%license Licenses/gpl-2.0.txt
%if %tools_only
+%{_bindir}/mkenvimage
+%{_bindir}/gen_ethaddr_crc
+%{_bindir}/dumpimage
+%{_bindir}/fit_info
+%{_bindir}/fit_check_sign
+%{_bindir}/fdtgrep
+%{_bindir}/ifwitool
%{_bindir}/mkimage
%{_mandir}/man1/mkimage.1.gz
%else