From d201b3f03993e3077a1e901aa1885794e33d9d43685d4e01f9472a764b4479cf Mon Sep 17 00:00:00 2001
From: Matthias Brugger <mbrugger@suse.com>
Date: Wed, 6 Nov 2019 11:14:14 +0000
Subject: [PATCH] Accepting request 744281 from hardware:boot:staging

OBS-URL: https://build.opensuse.org/request/show/744281
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=56
---
 _multibuild    |  1 +
 u-boot.changes | 13 +++++++++++++
 u-boot.spec    | 19 ++++++++++++++-----
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/_multibuild b/_multibuild
index c837226..14b43c3 100644
--- a/_multibuild
+++ b/_multibuild
@@ -23,6 +23,7 @@
   <flavor>evb-rk3399</flavor>
   <flavor>firefly-rk3288</flavor>
   <flavor>firefly-rk3399</flavor>
+  <flavor>rock-pi-4-rk3399</flavor>
   <flavor>geekbox</flavor>
   <flavor>highbank</flavor>
   <flavor>hikey</flavor>
diff --git a/u-boot.changes b/u-boot.changes
index 938337d..5be091e 100644
--- a/u-boot.changes
+++ b/u-boot.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Oct 26 16:24:56 UTC 2019 - Matwey Kornilov <matwey.kornilov@gmail.com>
+
+- Add RK3399 based Rock Pi4 board http://rockpi.org
+- Build TPL for RK3399 platforms where it is supported
+
+-------------------------------------------------------------------
+Wed Oct 23 20:25:56 UTC 2019 - Matwey Kornilov <matwey.kornilov@gmail.com>
+
+- Put idbloader.img into /boot for Rockchip
+  idbloader.img is installable TPL/SPL bootloader image:
+  https://gitlab.denx.de/u-boot/u-boot/commit/1b0a936b52606af87b6576817a0e939da731b6d9
+
 -------------------------------------------------------------------
 Wed Oct 23 15:29:31 UTC 2019 - Matthias Brugger <mbrugger@suse.com>
 
diff --git a/u-boot.spec b/u-boot.spec
index 8ae04df..f6d02ad 100644
--- a/u-boot.spec
+++ b/u-boot.spec
@@ -26,6 +26,7 @@
 %define mvebu_spl 0
 %define x_loader 0
 %define rockchip_spl 0
+%define rockchip_idb 0
 %define sunxi_spl 0
 %define arndale_spl 0
 %define origen_spl 0
@@ -65,13 +66,18 @@
 %endif
 %endif
 %if "%target" == "rock64-rk3328"
-%define is_armv8 1
 %define is_rk3328 1
-%define soc_name "rk3328"
+%define is_armv8 1
+%define rockchip_idb 1
 %define rockchip_spl 1
-%define rkimages rksd
+%define rkimages $()
 %endif
-%if "%target" == "evb-rk3399" || "%target" == "firefly-rk3399" || "%target" == "puma-rk3399" || "%target" == "rock960-rk3399"
+%if "%target" == "evb-rk3399" || "%target" == "firefly-rk3399" || "%target" == "rock-pi-4-rk3399"
+%define is_rk3399 1
+%define is_armv8 1
+%define rockchip_idb 1
+%endif
+%if "%target" == "puma-rk3399" || "%target" == "rock960-rk3399"
 %define is_rk3399 1
 %define is_armv8 1
 %endif
@@ -408,7 +414,7 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
 done
 %else
 install -D -m 0644 u-boot%{binext} %{buildroot}%{uboot_dir}/u-boot%{binext}
-%if ("%{name}" == "u-boot-rock64-rk3328" || "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf}
+%if ("%{name}" == "u-boot-rock64-rk3328" || "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" || "%{name}" == "u-boot-rock-pi-4-rk3399") && %{with uboot_atf}
 install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb
 %endif
 %if "%{name}" == "u-boot-qemu-ppce500"
@@ -435,6 +441,9 @@ for t in %{rkimages}; do
     install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t
 done
 %endif
+%if %rockchip_idb == 1
+install -D -m 0644 idbloader.img %{buildroot}%{uboot_dir}/idbloader.img
+%endif
 %if %sunxi_spl == 1
 install -D -m 0644 spl/sunxi-spl.bin %{buildroot}%{uboot_dir}/sunxi-spl.bin
 install -D -m 0644 u-boot-sunxi-with-spl.bin %{buildroot}%{uboot_dir}/u-boot-sunxi-with-spl.bin