From 0fb7c80809a0319a9a6985260b6f409bfbcc9961817a4e31a829473cd01f5095 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Mon, 4 Jan 2021 10:13:04 +0000 Subject: [PATCH] Accepting request 860121 from hardware:boot:staging OBS-URL: https://build.opensuse.org/request/show/860121 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=120 --- _multibuild | 1 + u-boot.changes | 5 +++++ u-boot.spec | 8 ++++---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/_multibuild b/_multibuild index 8f4defe..454f470 100644 --- a/_multibuild +++ b/_multibuild @@ -74,6 +74,7 @@ rock-pi-4-rk3399 rock64-rk3328 rock960-rk3399 + rockpro64-rk3399 rpi rpi2 rpi3 diff --git a/u-boot.changes b/u-boot.changes index 591f2af..01dc17a 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 4 09:39:59 UTC 2021 - Guillaume GARDET + +- Add rockpro64-rk3399 + ------------------------------------------------------------------- Thu Dec 24 16:17:08 UTC 2020 - Matthias Brugger diff --git a/u-boot.spec b/u-boot.spec index cf06b4a..5692981 100644 --- a/u-boot.spec +++ b/u-boot.spec @@ -1,7 +1,7 @@ # # spec file for package u-boot # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon # Copyright (c) 2007-2010 by Silvan Calarco # @@ -74,7 +74,7 @@ %define rockchip_spl 1 %define rkimages $() %endif -%if "%target" == "pinebook-pro-rk3399" || "%target" == "puma-rk3399" || "%target" == "rock960-rk3399" +%if "%target" == "pinebook-pro-rk3399" || "%target" == "puma-rk3399" || "%target" == "rock960-rk3399" || "%target" == "rockpro64-rk3399" %define is_rk3399 1 %define is_armv8 1 %define rockchip_idb 1 @@ -299,7 +299,7 @@ BuildRequires: arm-trusted-firmware-sun50ia64 BuildRequires: arm-trusted-firmware-sun50ih6 %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" +%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" # make_fit_atf.py BuildRequires: python3-pyelftools %endif @@ -402,7 +402,7 @@ export OPENSBI=%{_datadir}/opensbi/opensbi-sifive-fu540.bin %if "%{name}" == "u-boot-rock64-rk3328" cp %{_datadir}/arm-trusted-firmware-rk3328/bl31.elf . %endif -%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" || "%{name}" == "u-boot-rock-pi-4-rk3399" || "%{name}" == "u-boot-pinebook-pro-rk3399" +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" || "%{name}" == "u-boot-rock-pi-4-rk3399" || "%{name}" == "u-boot-pinebook-pro-rk3399" || "%target" == "rockpro64-rk3399" cp %{_datadir}/arm-trusted-firmware-rk3399/bl31.elf . %endif %endif