From ec24460516571fb16b1500f2dc7843621372ebdda7028d7ae493f46374341c00 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Thu, 7 Jan 2021 19:56:10 +0000 Subject: [PATCH] Accepting request 861459 from hardware:boot:staging OBS-URL: https://build.opensuse.org/request/show/861459 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=122 --- u-boot.changes | 6 ++++++ u-boot.spec | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/u-boot.changes b/u-boot.changes index 01dc17a..43c29fb 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 7 19:53:08 UTC 2021 - Guillaume GARDET + +- Rename sun50ia64 to sun50i_a64 and sun50ih6 to sun50i_h6 to + follow arm-trusted-firmware-* rename + ------------------------------------------------------------------- Mon Jan 4 09:39:59 UTC 2021 - Guillaume GARDET diff --git a/u-boot.spec b/u-boot.spec index 5692981..f7f715a 100644 --- a/u-boot.spec +++ b/u-boot.spec @@ -293,10 +293,10 @@ BuildRequires: arm-trusted-firmware-rk3328 BuildRequires: arm-trusted-firmware-rk3399 %endif %if (0%{?is_a64} || 0%{?is_h5}) && %{with uboot_atf} -BuildRequires: arm-trusted-firmware-sun50ia64 +BuildRequires: arm-trusted-firmware-sun50i_a64 %endif %if 0%{?is_h6} && %{with uboot_atf} -BuildRequires: arm-trusted-firmware-sun50ih6 +BuildRequires: arm-trusted-firmware-sun50i_h6 %endif %if %{with uboot_atf} %if "%{name}" == "u-boot-rock64-rk3328" || "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" || "%{name}" == "u-boot-rock960-rk3399" || "${name}" == "u-boot-rock-pi-4-rk3399" || "%{name}" == "u-boot-pinebook-pro-rk3399" || "%target" == "rockpro64-rk3399" @@ -389,10 +389,10 @@ make %{?_smp_mflags} CFLAGS="%{optflags}" tools-only %else export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/u-boot.changes | tail -n 1 | cut -d- -f1 )" +%s) %if 0%{?is_a64} || 0%{?is_h5} -export BL31=%{_datadir}/arm-trusted-firmware-sun50ia64/bl31.bin +export BL31=%{_datadir}/arm-trusted-firmware-sun50i_a64/bl31.bin %endif %if 0%{?is_h6} -export BL31=%{_datadir}/arm-trusted-firmware-sun50ih6/bl31.bin +export BL31=%{_datadir}/arm-trusted-firmware-sun50i_h6/bl31.bin %endif %if "%{name}" == "u-boot-sifivefu540" export OPENSBI=%{_datadir}/opensbi/opensbi-sifive-fu540.bin