Sync from SUSE:SLFO:1.1 arm-trusted-firmware revision 87e31b97d89e1fd6108ba660e82529ce

_multibuild

@@ -2,7 +2,10 @@
   <flavor>a3700</flavor>
   <flavor>a80x0_mcbin</flavor>
   <flavor>fvp</flavor>
+  <flavor>hikey</flavor>
+  <flavor>hikey960</flavor>
   <flavor>imx8mm</flavor>
+  <flavor>imx8mq</flavor>
   <flavor>imx8qm</flavor>
   <flavor>imx8qx</flavor>
   <flavor>poplar</flavor>

arm-trusted-firmware.changes

@@ -1,69 +1,3 @@
--------------------------------------------------------------------
-Mon Mar 24 10:56:17 UTC 2025 - Guillaume GARDET <guillaume.gardet@opensuse.org>
-
-- Update to 2.10.14:
-  * Changelog: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/+/refs/tags/lts-v2.10.14/docs/change-log.md
-- Skipped 2.10.13:
-  * Changelog: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/+/refs/tags/lts-v2.10.13/docs/change-log.md
-- Skipped 2.10.12:
-  * Changelog: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/+/refs/tags/lts-v2.10.12/docs/change-log.md
-- Skipped 2.10.11:
-  * Changelog: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/+/refs/tags/lts-v2.10.11/docs/change-log.md
-- Skipped 2.10.10:
-  * Changelog: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/+/refs/tags/lts-v2.10.10/docs/change-log.md
-- Skipped 2.10.9:
-  * Changelog: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/+/refs/tags/lts-v2.10.9/docs/change-log.md
-- Skipped 2.10.8:
-  * Changelog: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/+/refs/tags/lts-v2.10.8/docs/change-log.md
-- Remove support for Hikey and Hikey960, since they have been
-  dropped from edk2
-
--------------------------------------------------------------------
-Wed Oct 16 12:55:13 UTC 2024 - Guillaume GARDET <guillaume.gardet@opensuse.org>
-
-- Update to 2.10.7:
-  * Changelog: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/+/refs/tags/lts-v2.10.7/docs/change-log.md
-- Skipped 2.10.6:
-  * Changelog: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/+/refs/tags/lts-v2.10.6/docs/change-log.md
-- Skipped 2.10.5:
-  * Changelog: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/+/refs/tags/lts-v2.10.5/docs/change-log.md
-- Skipped 2.10.4:
-  * Changelog: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/+/refs/tags/lts-v2.10.4/docs/change-log.md
-- Skipped 2.10.3:
-  * Changelog: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/+/refs/tags/lts-v2.10.3/docs/change-log.md
-- Skipped 2.10.2:
-  * Changelog: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/+/refs/tags/lts-v2.10.2/docs/change-log.md
-- Skipped 2.10.1:
-  * Changelog: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/+/refs/tags/lts-v2.10.1/docs/change-log.md
-
--------------------------------------------------------------------
-Wed May 15 07:04:17 UTC 2024 - Ivan Ivanov <ivan.ivanov@suse.com>
-
-- Don't use TF-A on RPi3 by default, just keep it around for testing.
-  Fixes bsc#1207204.
-
--------------------------------------------------------------------
-Tue Feb 20 10:44:56 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Use %patch -P N instead of deprecated %patchN.
-
--------------------------------------------------------------------
-Mon Feb 12 13:39:21 UTC 2024 - Guillaume GARDET <guillaume.gardet@opensuse.org>
-
-- Disable imx8mq is it fails to build due to size constraints
-
--------------------------------------------------------------------
-Thu Nov 23 13:19:32 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>
-
-- Update to 2.10.0:
-  * Changelog: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/docs/change-log.md?id=9873580997c7f5ec60535bd45367d0c7d3cc2784
-
--------------------------------------------------------------------
-Mon Sep 18 13:09:55 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>
-
-- Update to 2.9.0:
-  * Changelog: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/docs/change-log.md?id=b78ad00e580596c4f0b5dfc41efbf5f5877cbdb9
-
 -------------------------------------------------------------------
 Mon Sep 18 10:12:57 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 

arm-trusted-firmware.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package arm-trusted-firmware
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -50,9 +50,9 @@ Name:           arm-trusted-firmware
 %else
 Name:           arm-trusted-firmware-%{platform}
 %endif
-Version:        2.10.14
+Version:        2.8.8
 Release:        0
-%define srcversion 2.10.14
+%define srcversion 2.8.8
 %define mv_ddr_ver armada-atf-master
 %define mv_bin_ver 10.0.1.0
 %define a3700_utils_ver master
@@ -60,7 +60,7 @@ Summary:        Arm Trusted Firmware-A
 License:        BSD-3-Clause
 Group:          System/Boot
 URL:            https://www.trustedfirmware.org/
-Source:         https://github.com/TrustedFirmware-A/trusted-firmware-a/archive/refs/tags/lts-v%{srcversion}.tar.gz#/trusted-firmware-a-lts-v%{srcversion}.tar.gz
+Source:         https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/trusted-firmware-a-lts-v%{srcversion}.tar.gz
 Source1:        mv-ddr-marvell-%{mv_ddr_ver}.tar.gz
 Source2:        A3700-utils-marvell-%{a3700_utils_ver}.tar.gz
 Source3:        binaries-marvell-%{mv_bin_ver}.tar.gz
@@ -92,6 +92,12 @@ BuildRequires:  edk2-Armada80x0McBin
 BuildRequires:  dtc
 BuildRequires:  edk2-ArmVExpress-FVP-AArch64
 %endif
+%if "%{platform}" == "hikey"
+BuildRequires:  edk2-hikey
+%endif
+%if "%{platform}" == "hikey960"
+BuildRequires:  edk2-hikey960
+%endif
 %if "%{platform}" == ""
 BuildRequires:  gcc-c++
 %endif
@@ -128,6 +134,9 @@ BuildRequires:  u-boot-mvebuespressobin-88f3720
 %if "%{platform}" == "a80x0_mcbin" && 1
 BuildRequires:  u-boot-mvebumcbin-88f8040
 %endif
+%if "%{platform}" == "hikey"
+BuildRequires:  u-boot-hikey
+%endif
 %if "%{platform}" == "poplar"
 BuildRequires:  u-boot-poplar
 %endif
@@ -188,18 +197,18 @@ This package contains fiptool.
 %prep
 %if "%{platform}" == "a3700" || "%{platform}" == "a80x0_mcbin"
 %if "%{platform}" == "a3700"
-%setup -q -a 1 -a 2 -n trusted-firmware-a-lts-v%{srcversion}
+%setup -q -n trusted-firmware-a-lts-v%{srcversion} -a 1 -a 2
 %else
-%setup -q -a 1 -a 3 -n trusted-firmware-a-lts-v%{srcversion}
+%setup -q -n trusted-firmware-a-lts-v%{srcversion} -a 1 -a 3
 %endif
 # git repo or branch.txt file are expected
 echo "%{mv_ddr_ver}" > mv-ddr-marvell-%{mv_ddr_ver}/branch.txt
 pushd mv-ddr-marvell-%{mv_ddr_ver}
 %if %{suse_version} > 1550
 # Workaround for GCC12 bug - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523
-%patch -P 100 -p1
+%patch100 -p1
 %endif
-%patch -P 101 -p1
+%patch101 -p1
 popd
 %else
 %if "%{platform}" == ""
@@ -215,12 +224,12 @@ echo "%{a3700_utils_ver}" >  branch.txt
 %if "%{platform}" != ""
 install -D -m 0755 %{_bindir}/TBB wtptp/linux/tbb_linux
 %endif
-%patch -P 150 -p1
+%patch150 -p1
 popd
 %endif
-%patch -P 1 -p1
+%patch1 -p1
-%patch -P 2 -p1
+%patch2 -p1
-%patch -P 3 -p1
+%patch3 -p1
 %if %{suse_version} <= 1500
 # GCC7 does not support -mbranch-protection option
 sed -i -e "s/TF_CFLAGS_aarch64	+=	-mbranch-protection=none//" plat/xilinx/zynqmp/platform.mk
@@ -349,6 +358,16 @@ done
      BL33=/boot/FVP_AARCH64_EFI.fd \
      all fip
 %else
+%if "%{platform}" == "hikey"
+     SCP_BL2=/boot/mcuimage.bin \
+     BL33=/boot/u-boot.bin \
+     all fip
+%else
+%if "%{platform}" == "hikey960"
+     SCP_BL2=/boot/lpm3.img \
+     BL33=/boot/BL33_AP_UEFI.fd \
+     all fip
+%else
 %if "%{platform}" == "poplar"
      BL33=/boot/u-boot.bin \
      POPLAR_DRAM_SIZE=${dram_size} \
@@ -384,6 +403,8 @@ done
 %endif
 %endif
 %endif
+%endif
+%endif
 
 %install
 %if "%{platform}" == ""
@@ -445,11 +466,11 @@ install -D -m 0644 %{outdir}/bl31/bl31.elf %{buildroot}%{_datadir}/%{name}/bl31.
 install -D -m 0644 %{outdir}/bl31.bin %{buildroot}%{_datadir}/%{name}/bl31.bin
 %endif
 
-%if "%{platform}" == "a80x0_mcbin" || "%{platform}" == "fvp"  || "%{platform}" == "qemu" || "%{platform}" == "qemu_sbsa" || "%{platform}" == "rpi3"
+%if "%{platform}" == "a80x0_mcbin" || "%{platform}" == "fvp" || "%{platform}" == "hikey" || "%{platform}" == "hikey960" || "%{platform}" == "qemu" || "%{platform}" == "qemu_sbsa" || "%{platform}" == "rpi3"
 install -D -m 0644 %{outdir}/bl1.bin %{buildroot}%{_datadir}/%{name}/bl1.bin
 install -D -m 0644 %{outdir}/fip.bin %{buildroot}%{_datadir}/%{name}/fip.bin
 %endif
-%if "%{platform}" == "a80x0_mcbin" || "%{platform}" == "rpi3"
+%if "%{platform}" == "a80x0_mcbin" || "%{platform}" == "hikey" || "%{platform}" == "hikey960" || "%{platform}" == "rpi3"
 install -D -m 0644 %{outdir}/bl2.bin %{buildroot}%{_datadir}/%{name}/bl2.bin
 %endif
 %if "%{platform}" == "rpi3"
@@ -470,7 +491,7 @@ install -D -m 0644 %{outdir}/flash-image.bin %{buildroot}%{_datadir}/%{name}/fla
 
 %fdupes %{buildroot}%{_prefix}
 
-%if "%{platform}" == "rpi4"
+%if "%{platform}" == "rpi3" || "%{platform}" == "rpi4"
 %post
 if mountpoint -q /boot/efi; then
   if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f /boot/vc)" ]]; then