Accepting request 1098143 from hardware👢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
This commit is contained in:
Guillaume GARDET 2023-07-11 13:59:44 +00:00 committed by Git OBS Bridge
parent 1a1f57e6ab
commit 9a6f11c999
3 changed files with 13 additions and 6 deletions

View File

@ -90,6 +90,7 @@
<flavor>snow</flavor> <flavor>snow</flavor>
<flavor>socfpgade0nanosoc</flavor> <flavor>socfpgade0nanosoc</flavor>
<flavor>spring</flavor> <flavor>spring</flavor>
<flavor>starfivevisionfive2</flavor>
<flavor>tinker-rk3288</flavor> <flavor>tinker-rk3288</flavor>
<flavor>turrisomnia</flavor> <flavor>turrisomnia</flavor>
<flavor>udoo</flavor> <flavor>udoo</flavor>

View File

@ -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> Tue Jul 11 10:14:05 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>

View File

@ -170,9 +170,9 @@
%define is_armv7 1 %define is_armv7 1
%define binext .img %define binext .img
%endif %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 %define is_riscv64 1
%if "%target" == "sifiveunleashed" || "%target" == "sifiveunmatched" %if "%target" == "sifiveunleashed" || "%target" == "sifiveunmatched" || "%target" == "starfivevisionfive2"
%define binext .itb %define binext .itb
%endif %endif
%endif %endif
@ -325,8 +325,8 @@ BuildRequires: zynqmp-dts
# For mountpoint # For mountpoint
Requires(post): util-linux Requires(post): util-linux
%endif %endif
%if "%{name}" == "u-boot-sifiveunleashed" || "%{name}" == "u-boot-sifiveunmatched" %if "%{name}" == "u-boot-sifiveunleashed" || "%{name}" == "u-boot-sifiveunmatched" || "%{name}" == "u-boot-starfivevisionfive2"
BuildRequires: opensbi >= 0.9 BuildRequires: opensbi >= 1.3
%endif %endif
%if %x_loader == 1 %if %x_loader == 1
Obsoletes: x-loader-%target Obsoletes: x-loader-%target
@ -411,7 +411,7 @@ export SCP=/dev/null
export BL31=%{_datadir}/arm-trusted-firmware-sun50i_h616/bl31.bin export BL31=%{_datadir}/arm-trusted-firmware-sun50i_h616/bl31.bin
export SCP=/dev/null export SCP=/dev/null
%endif %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 export OPENSBI=%{_datadir}/opensbi/opensbi.bin
%endif %endif
@ -563,7 +563,7 @@ echo -e "\nkernel_address=0x11000000" >> %{buildroot}%{uboot_dir}/ubootconfig.tx
%if "%{name}" == "u-boot-rpi4" || "%{name}" == "u-boot-rpiarm64" %if "%{name}" == "u-boot-rpi4" || "%{name}" == "u-boot-rpiarm64"
echo -e "# Boot in AArch64 mode\narm_64bit=1" > %{buildroot}%{uboot_dir}/ubootconfig.txt echo -e "# Boot in AArch64 mode\narm_64bit=1" > %{buildroot}%{uboot_dir}/ubootconfig.txt
%endif %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 install -D -m 0644 spl/u-boot-spl.bin %{buildroot}%{uboot_dir}/u-boot-spl.bin
%endif %endif