From 51a761571602be4052665519361a01816160f304a3c502ab5c220cda3a837bf0 Mon Sep 17 00:00:00 2001
From: Guillaume GARDET <guillaume.gardet@opensuse.org>
Date: Tue, 10 Jan 2023 09:01:50 +0000
Subject: [PATCH] Accepting request 1057292 from hardware:boot:staging

OBS-URL: https://build.opensuse.org/request/show/1057292
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=174
---
 _multibuild |  1 +
 u-boot.spec | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/_multibuild b/_multibuild
index a4cc70b..a80a1a9 100644
--- a/_multibuild
+++ b/_multibuild
@@ -60,6 +60,7 @@
   <flavor>orangepipc</flavor>
   <flavor>orangepipc2</flavor>
   <flavor>orangepizero</flavor>
+  <flavor>orangepizero2</flavor>
   <flavor>p2371-2180</flavor>
   <flavor>p2771-0000-500</flavor>
   <flavor>p3450-0000</flavor>
diff --git a/u-boot.spec b/u-boot.spec
index 86e4693..f071ad3 100644
--- a/u-boot.spec
+++ b/u-boot.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package u-boot
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 # Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
 # Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
@@ -108,6 +108,11 @@
 %define is_a64 1
 %define sunxi_spl 1
 %endif
+%if "%target" == "orangepizero2"
+%define is_h616 1
+%define is_armv8 1
+%define sunxi_spl 1
+%endif
 %if "%target" == "bananapi" || "%target" == "cubieboard" || "%target" == "cubieboard2" || "%target" == "cubietruck" || "%target" == "melea1000" || "%target" == "a10-olinuxino-lime" || "%target" == "a13-olinuxino" || "%target" == "a13-olinuxinom" || "%target" == "a20-olinuxino-lime" || "%target" == "a20-olinuxino-lime2" || "%target" == "a20-olinuxinomicro" || "%target" == "nanopineo" || "%target" == "orangepipc" || "%target" == "hyundaia7hd" || "%target" == "lamobor1" || "%target" == "bananapim2plush3" || "%target" == "bananapim2zero" || "%target" == "orangepizero"
 %define is_armv7 1
 %define binext .img
@@ -296,6 +301,9 @@ BuildRequires:  arm-trusted-firmware-sun50i_a64
 %if 0%{?is_h6}
 BuildRequires:  arm-trusted-firmware-sun50i_h6
 %endif
+%if 0%{?is_h616}
+BuildRequires:  arm-trusted-firmware-sun50i_h616
+%endif
 %if "%target" == "tools" || "%target" == "avnetultra96rev1" || "%target" == "clearfog" || "%target" == "mvebudb-88f3720" || "%target" == "mvebudbarmada8k" || "%target" == "mvebudbarmada8k3" || "%target" == "mvebuespressobin-88f3720" || "%target" == "mvebumcbin-88f8040" || "%target" == "turrisomnia"
 # Fixes ld: cannot find -ltinfo: No such file or directory
 BuildRequires:  ncurses-devel
@@ -396,6 +404,10 @@ export SCP=/dev/null
 export BL31=%{_datadir}/arm-trusted-firmware-sun50i_h6/bl31.bin
 export SCP=/dev/null
 %endif
+%if 0%{?is_h616}
+export BL31=%{_datadir}/arm-trusted-firmware-sun50i_h616/bl31.bin
+export SCP=/dev/null
+%endif
 %if "%{name}" == "u-boot-sifiveunleashed" || "%{name}" == "u-boot-sifiveunmatched"
 export OPENSBI=%{_datadir}/opensbi/opensbi.bin
 %endif