From 9a6f11c999ecbb5dd2d55b57693237ca4f5eef2a1b18c49887f465f3ec8ad780 Mon Sep 17 00:00:00 2001
From: Guillaume GARDET <guillaume.gardet@opensuse.org>
Date: Tue, 11 Jul 2023 13:59:44 +0000
Subject: [PATCH] Accepting request 1098143 from hardware:boot:staging

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

diff --git a/_multibuild b/_multibuild
index a80a1a9..b1f43ce 100644
--- a/_multibuild
+++ b/_multibuild
@@ -90,6 +90,7 @@
   <flavor>snow</flavor>
   <flavor>socfpgade0nanosoc</flavor>
   <flavor>spring</flavor>
+  <flavor>starfivevisionfive2</flavor>
   <flavor>tinker-rk3288</flavor>
   <flavor>turrisomnia</flavor>
   <flavor>udoo</flavor>
diff --git a/u-boot.changes b/u-boot.changes
index 4469397..5e2644a 100644
--- a/u-boot.changes
+++ b/u-boot.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 11 11:34:07 UTC 2023 - Andreas Schwab <schwab@suse.de>
+
+- Add starfivevisionfive2 flavor
+- Bump opensbi dependency to 1.3
+
 -------------------------------------------------------------------
 Tue Jul 11 10:14:05 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 
diff --git a/u-boot.spec b/u-boot.spec
index df86170..e93196e 100644
--- a/u-boot.spec
+++ b/u-boot.spec
@@ -170,9 +170,9 @@
 %define is_armv7 1
 %define binext .img
 %endif
-%if "%target" == "qemu-riscv64" || "%target" == "qemu-riscv64smode" || "%target" == "sifiveunleashed" || "%target" == "sifiveunmatched"
+%if "%target" == "qemu-riscv64" || "%target" == "qemu-riscv64smode" || "%target" == "sifiveunleashed" || "%target" == "sifiveunmatched" || "%target" == "starfivevisionfive2"
 %define is_riscv64 1
-%if "%target" == "sifiveunleashed" || "%target" == "sifiveunmatched"
+%if "%target" == "sifiveunleashed" || "%target" == "sifiveunmatched" || "%target" == "starfivevisionfive2"
 %define binext .itb
 %endif
 %endif
@@ -325,8 +325,8 @@ BuildRequires:  zynqmp-dts
 # For mountpoint
 Requires(post): util-linux
 %endif
-%if "%{name}" == "u-boot-sifiveunleashed" || "%{name}" == "u-boot-sifiveunmatched"
-BuildRequires:  opensbi >= 0.9
+%if "%{name}" == "u-boot-sifiveunleashed" || "%{name}" == "u-boot-sifiveunmatched" || "%{name}" == "u-boot-starfivevisionfive2"
+BuildRequires:  opensbi >= 1.3
 %endif
 %if %x_loader == 1
 Obsoletes:      x-loader-%target
@@ -411,7 +411,7 @@ export SCP=/dev/null
 export BL31=%{_datadir}/arm-trusted-firmware-sun50i_h616/bl31.bin
 export SCP=/dev/null
 %endif
-%if "%{name}" == "u-boot-sifiveunleashed" || "%{name}" == "u-boot-sifiveunmatched"
+%if "%{name}" == "u-boot-sifiveunleashed" || "%{name}" == "u-boot-sifiveunmatched" || "%{name}" == "u-boot-starfivevisionfive2"
 export OPENSBI=%{_datadir}/opensbi/opensbi.bin
 %endif
 
@@ -563,7 +563,7 @@ echo -e "\nkernel_address=0x11000000" >> %{buildroot}%{uboot_dir}/ubootconfig.tx
 %if "%{name}" == "u-boot-rpi4" || "%{name}" == "u-boot-rpiarm64"
 echo -e "# Boot in AArch64 mode\narm_64bit=1" > %{buildroot}%{uboot_dir}/ubootconfig.txt
 %endif
-%if "%{name}" == "u-boot-sifiveunleashed" || "%{name}" == "u-boot-sifiveunmatched"
+%if "%{name}" == "u-boot-sifiveunleashed" || "%{name}" == "u-boot-sifiveunmatched" || "%{name}" == "u-boot-starfivevisionfive2"
 install -D -m 0644 spl/u-boot-spl.bin %{buildroot}%{uboot_dir}/u-boot-spl.bin
 %endif