Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package arm-trusted-firmware for
openSUSE:Factory checked in at 2021-02-25 18:26:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/arm-trusted-firmware (Old)
and /work/SRC/openSUSE:Factory/.arm-trusted-firmware.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "arm-trusted-firmware"
Thu Feb 25 18:26:36 2021 rev:1 rq:861401 version:2.3
Changes:
--------
New Changes file:
--- /dev/null 2021-02-22 01:36:22.145178436 +0100
+++
/work/SRC/openSUSE:Factory/.arm-trusted-firmware.new.2378/arm-trusted-firmware.changes
2021-02-25 18:26:40.994151046 +0100
@@ -0,0 +1,359 @@
+-------------------------------------------------------------------
+Sat Oct 17 01:03:28 UTC 2020 - Andreas F??rber <[email protected]>
+
+- Fix BUILD_MESSAGE_TIMESTAMP (don't try parsing deleted .changes)
+- Clean up rpi4 build
+- Drop comments to avoid RPM errors about %else and %endif end of line
+- Update mv-ddr-marvell from mv_ddr-atf-mainline branch to mv-ddr-devel 14.0.0
+* Add mv-ddr.diff (from d:A:F:Contrib:MacchiatoBin) to fix a warning treated
as error
+* Add a _service to clarify its origin and facilitate future updates
+- Update A3700-utils-marvell from armada-18.12 to armada-18.12-fixed branch
+* Drop A3700_utils-TBB-Split-INCDIR-from-LIBDIR.patch (merged)
+* Drop A3700_utils-TBB-Fix-building-for-Crypto-6.0-and-later.patch (merged)
+* Actually apply A3700_utils-drop-git.patch (output cleanup)
+- Build and package A3700 utils as part of -tools (non-noarch, ensure PIE)
+- Build the tools for all architectures again
+- Add binaries-marvell from binaries-marvell-armada-SDK10.0.1.0 branch
+- Add a80x0_mcbin and extend a3700 to build and package all needed files
+* Suppress OP-TEE for now, as it fails to initialize
+
+-------------------------------------------------------------------
+Fri Oct 16 23:35:20 UTC 2020 - Andreas F??rber <[email protected]>
+
+- Build fixes for a3700 and a80x0_mcbin
+
+-------------------------------------------------------------------
+Thu Jul 2 17:18:45 UTC 2020 - Nicolas Patricio Saenz Julienne
<[email protected]>
+
+- Add rpi4
+
+-------------------------------------------------------------------
+Thu Apr 23 12:25:49 UTC 2020 - Guillaume GARDET <[email protected]>
+
+- Disable debug on imx8mq to fix build
+
+-------------------------------------------------------------------
+Thu Apr 23 09:59:49 UTC 2020 - Guillaume GARDET <[email protected]>
+
+- Update to 2.3:
+ * Add support for Armv8.4-SecEL2 extension through the SPCI defined
SPMD/SPMC components.
+ * Build option to support EL2 context save and restore in the secure world
(CTX_INCLUDE_EL2_REGS).
+ * Add support for SMCCC v1.2 (introducing the new SMCCC_ARCH_SOC_ID SMC).
+ Note that the support is compliant, but the SVE registers save/restore
will be done as part of future S-EL2/SPM development.
+ * Enhanced BL2 bootloader flow to load secure partitions based on firmware
configuration data (fconf).
+ * Changes necessary to support SEPARATE_NOBITS_REGION feature
+ * TSP and BL2_AT_EL3: Add Position Independent Execution PIE support
+ * Enable MTE support
+ * Enable Link Time Optimization in GCC
+ * Add CPU support:
+ - cortex-a57: Enable higher performance non-cacheable load forwarding
+ - Hercules: Workaround for Errata 1688305
+ - Klein: Support added for Klein CPU
+ - Matterhorn: Support added for Matterhorn CPU
+ * Full changelog:
https://trustedfirmware-a.readthedocs.io/en/latest/change-log.html#version-2-3
+
+-------------------------------------------------------------------
+Sat Feb 1 21:01:01 UTC 2020 - Matwey Kornilov <[email protected]>
+
+- Initial implementation for Marvel A3700 platform
+
+-------------------------------------------------------------------
+Thu Oct 24 10:53:55 UTC 2019 - Guillaume GARDET <[email protected]>
+
+- Switch to _multibuild system
+- Update to 2.2:
+* Enable Pointer Authentication (PAuth) support for Secure World
+ - Adds support for ARMv8.3-PAuth in BL1 SMC calls and BL2U
+ image for firmware updates.
+ * Enable Memory Tagging Extension (MTE) support in both secure
+ and non-secure worlds
+ - Adds support for the new Memory Tagging Extension arriving
+ in ARMv8.5. MTE support is now enabled by default on
+ systems that support it at EL0.
+ - To enable it at ELx for both the non-secure and the secure
+ world, the compiler flag CTX_INCLUDE_MTE_REGS includes
+ register saving and restoring when necessary in order to
+ prevent information leakage between the worlds.
+ * Add support for Branch Target Identification (BTI)
+ * Full changelog:
https://trustedfirmware-a.readthedocs.io/en/latest/change-log.html#version-2-2
+- Drop upstreamed patches:
+ * arm-trusted-firmware_hikey960_race.patch
+ * arm-trusted-firmware_poplar_mmc_dma.patch
+ * arm-trusted-firmware_zynqmp_ipi.patch
+
+-------------------------------------------------------------------
+Wed Sep 4 22:19:57 UTC 2019 - Andreas F??rber <[email protected]>
+
+- Add zynqmp
+* arm-trusted-firmware_zynqmp_ipi.patch
+
+-------------------------------------------------------------------
+Thu Aug 1 07:02:12 UTC 2019 - Guillaume GARDET <[email protected]>
+
+- Add initial bits for a80x0_mcbin support for MacchiatoBin
+
+-------------------------------------------------------------------
+Sun Jun 16 16:00:26 UTC 2019 - Andreas F??rber <[email protected]>
+
+- rpi3: By now building okay with OP-TEE
+- rpi3: Replace dependency on deprecated bootstrap code with U-Boot
+- rpi3: Change installation location (adopted from u-boot-rpi3)
+- poplar: Fix eMMC DMA FIFO breaking U-Boot eMMC access
+ (https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/1230)
+ arm-trusted-firmware_poplar_mmc_dma.patch
+- poplar: Build for both 2 GiB and 1 GiB boards (b96o#834)
+
+-------------------------------------------------------------------
+Sat Jun 8 18:19:24 UTC 2019 - Andreas F??rber <[email protected]>
+
+- Add imxmq and imxmm
+
+-------------------------------------------------------------------
+Sat Jun 8 15:47:29 UTC 2019 - Andreas F??rber <[email protected]>
+
+- Fix build date by escaping %S (which expanded to %SOURCE).
+- hikey960: Avoid a race condition (boo#1134788)
+ arm-trusted-firmware_hikey960_race.patch
+
+-------------------------------------------------------------------
+Tue Apr 9 13:51:40 UTC 2019 - Guillaume GARDET <[email protected]>
+
+- Update to v2.1:
+ * Add ARMv8.3 pointer authentication in the normal and secure worlds
+ * Cortex-Axx workarounds for erratums
+ * New platforms
+ * Full changelog:
https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/about/docs/change-log.rst#version-2-1
+- Remove outdated patch:
+ * hikey960.diff
+
+-------------------------------------------------------------------
+Thu Mar 28 23:06:55 UTC 2019 - Andreas F??rber <[email protected]>
+
+- rpi3: Package armstub8.bin, fip.bin, bl1.bin, bl2.bin
+
+-------------------------------------------------------------------
+Sun Nov 11 16:56:46 UTC 2018 - [email protected]
+
+- pre_checkin.sh: Fix package names for sun50i_{a64,h6}
+
+-------------------------------------------------------------------
+Sun Nov 4 15:16:20 UTC 2018 - [email protected]
+
+- Add imx8qm, imx8qx, sun50i_a64, sun50i_h6
+
+-------------------------------------------------------------------
+Sun Nov 4 14:29:26 UTC 2018 - [email protected]
+
+- Update to v2.0
+* Drop upstream patches
+ arm-trusted-firmware_cve-2018-3639_smccc_rename.patch
+ arm-trusted-firmware_cve-2018-3639_smccc_return.patch
+ arm-trusted-firmware_cve-2018-3639_rename.patch
+ arm-trusted-firmware_cve-2018-3639_static.patch
+ arm-trusted-firmware_cve-2018-3639_static_aarch32.patch
+ arm-trusted-firmware_cve-2018-3639_dynamic.patch
+* fip_create wrapper is no longer built (use fiptool instead)
+* Set BL33 for qemu
+
+-------------------------------------------------------------------
+Sun Jun 3 18:48:01 UTC 2018 - [email protected]
+
+- Conditionally enable OP-TEE as BL32
+
+-------------------------------------------------------------------
+Sun Jun 3 17:39:05 UTC 2018 - [email protected]
+
+- Add rpi3
+
+-------------------------------------------------------------------
+Sun Jun 3 05:53:57 UTC 2018 - [email protected]
+
+- Set BUILD_MESSAGE_TIMESTAMP for reproducible builds
+- Simplify tegra packaging, reusing %target_soc
+
+-------------------------------------------------------------------
+Fri Jun 1 09:09:14 UTC 2018 - [email protected]
+
+- Address CVE-2018-3639 (bsc#1085308)
+ arm-trusted-firmware_cve-2018-3639_smccc_rename.patch
+ arm-trusted-firmware_cve-2018-3639_smccc_return.patch
+ arm-trusted-firmware_cve-2018-3639_rename.patch
+ arm-trusted-firmware_cve-2018-3639_static.patch
+ arm-trusted-firmware_cve-2018-3639_static_aarch32.patch
+ arm-trusted-firmware_cve-2018-3639_dynamic.patch
+
+-------------------------------------------------------------------
+Thu May 31 23:32:12 UTC 2018 - [email protected]
+
+- hikey960.diff: Fix assertion on HiKey 960 (b9o#739)
+
+-------------------------------------------------------------------
+Thu May 31 19:21:09 UTC 2018 - [email protected]
+
+- Package bl2 for hikey and hikey960
+
+-------------------------------------------------------------------
+Mon May 21 01:13:15 UTC 2018 - [email protected]
+
++++ 162 more lines (skipped)
++++ between /dev/null
++++ and
/work/SRC/openSUSE:Factory/.arm-trusted-firmware.new.2378/arm-trusted-firmware.changes
New:
----
A3700-utils-marvell-18.12.tar.gz
A3700_utils-drop-git.patch
_multibuild
_service
arm-trusted-firmware.changes
arm-trusted-firmware.spec
binaries-marvell-10.0.1.0.tar.gz
mv-ddr-marvell-armada-atf-mainline.tar.gz
mv-ddr.diff
trusted-firmware-a-2.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ arm-trusted-firmware.spec ++++++
#
# spec file for package arm-trusted-firmware
#
# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define platform @BUILD_FLAVOR@%{nil}
%if "%{platform}" == "a3700" || "%{platform}" == "imx8mq"
# Debug build not supported for UART boot on a3700
# Debug build is too big on imx8mq, see:
https://developer.trustedfirmware.org/T626
%global debug_build 0
%else
%global debug_build 1
%endif
%bcond_with atf_optee
%if %{with atf_optee}
%define use_optee 1
%if "%{platform}" == "" || "%{platform}" == "tegra186" || "%{platform}" ==
"tegra210" || "%{platform}" == "rk3328" || "%{platform}" == "rk3368" ||
"%{platform}" == "rk3399" || "%{platform}" == "rpi4"
# OP-TEE not available
%define use_optee 0
%endif
%if "%{platform}" == "a3700" || "%{platform}" == "a80x0_mcbin" || "%{platform}"
== "imx8qm" || "%{platform}" == "imx8qx" || "%{platform}" == "imx8mq" ||
"%{platform}" == "imx8mm" || "%{platform}" == "sun50i_a64" || "%{platform}" ==
"sun50i_h6" || "%{platform}" == "zynqmp"
# TBD
%define use_optee 0
%endif
%else
%define use_optee 0
%endif
%if "%{platform}" == ""
Name: arm-trusted-firmware
%else
Name: arm-trusted-firmware-%{platform}
%endif
Version: 2.3
Release: 0
%define srcversion 2.3
%define mv_ddr_ver armada-atf-mainline
%define mv_bin_ver 10.0.1.0
%define a3700_utils_ver 18.12
Summary: Arm Trusted Firmware-A
License: BSD-3-Clause
Group: System/Boot
Url: https://www.trustedfirmware.org/
Source:
https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/trusted-firmware-a-%{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
Patch100: mv-ddr.diff
Patch150: A3700_utils-drop-git.patch
%if "%{platform}" != ""
#!BuildIgnore: gcc-PIE
%endif
%if "%{platform}" == "a3700"
BuildRequires: arm-trusted-firmware-tools
%endif
%if "%{platform}" == "a3700" || "%{platform}" == "rk3399"
BuildRequires: cross-arm-none-gcc%{gcc_version}
%endif
%if "%{platform}" == "a3700"
BuildRequires: cross-arm-none-newlib-devel
%endif
%if "%{platform}" == "a80x0_mcbin" && 0
BuildRequires: edk2-Armada80x0McBin
%endif
%if "%{platform}" == "hikey"
BuildRequires: edk2-hikey
%endif
%if "%{platform}" == "hikey960"
BuildRequires: edk2-hikey960
%endif
%if "%{platform}" == ""
BuildRequires: gcc-c++
%endif
BuildRequires: git
%if "%{platform}" == ""
BuildRequires: libcryptopp-devel
%endif
BuildRequires: libopenssl-devel
%if %{use_optee}
%if "%{platform}" == "qemu"
BuildRequires: optee-qemu-armv8a
%else
%if "%{platform}" == "a3700"
BuildRequires: optee-armada3700
%else
%if "%{platform}" == "a80x0_mcbin"
BuildRequires: optee-armada7k8k
%else
BuildRequires: optee-%{platform}
%endif
%endif
%endif
%endif
%if "%{platform}" == "qemu"
BuildRequires: qemu-uefi-aarch64
%endif
%if "%{platform}" == "rpi3" || "%{platform}" == "rpi4"
# For /boot/vc
BuildRequires: raspberrypi-firmware
%endif
%if "%{platform}" == "a3700"
BuildRequires: u-boot-mvebuespressobin-88f3720
%endif
%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
%if "%{platform}" == "rpi3"
BuildRequires: u-boot-rpi3
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if "%{platform}" != ""
BuildArch: noarch
ExclusiveArch: aarch64
%endif
%description
Trusted Firmware-A (TF-A) provides a reference implementation of secure world
software for Armv7-A and Armv8-A, including a Secure Monitor executing at
Exception Level 3 (EL3).
%if "%{platform}" == "poplar"
%package devel
Summary: ARM Trusted Firmware -- %{platform} development files
License: BSD-3-Clause
Group: System/Boot
Requires: %{name} = %{version}
%description devel
ARM Trusted Firmware provides a reference implementation of
secure world software for ARMv8-A, including a Secure Monitor executing at
Exception Level 3 (EL3). It implements various ARM interface standards,
such as the Power State Coordination Interface (PSCI),
Trusted Board Boot Requirements (TBBR, ARM DEN0006C-1) and
SMC Calling Convention. As far as possible the code is designed for reuse
or porting to other ARMv8-A model and hardware platforms.
This sub-package contains development files.
%endif
%if "%{platform}" == ""
%package tools
Summary: Tools for ARM Trusted Firmware-A
Group: System/Boot
%description tools
Trusted Firmware-A (TF-A) provides a reference implementation of
secure world software for ARMv8-A, including a Secure Monitor executing at
Exception Level 3 (EL3). It implements various ARM interface standards,
such as the Power State Coordination Interface (PSCI),
Trusted Board Boot Requirements (TBBR, ARM DEN0006C-1) and
SMC Calling Convention. As far as possible the code is designed for reuse
or porting to other ARMv8-A model and hardware platforms.
This package contains fiptool.
%endif
%prep
%if "%{platform}" == "a3700" || "%{platform}" == "a80x0_mcbin"
%if "%{platform}" == "a3700"
%setup -q -n trusted-firmware-a-%{srcversion} -a 1 -a 2
%else
%setup -q -n trusted-firmware-a-%{srcversion} -a 1 -a 3
%endif
pushd mv-ddr-marvell-%{mv_ddr_ver}
%patch100 -p1
popd
%else
%if "%{platform}" == ""
%setup -q -n trusted-firmware-a-%{srcversion} -a 2
%else
%setup -q -n trusted-firmware-a-%{srcversion}
%endif
%endif
%if "%{platform}" == "" || "%{platform}" == "a3700"
pushd A3700-utils-marvell-%{a3700_utils_ver}
# Remove any pre-built x86 Linux binaries
rm -f wtptp/linux/*
%if "%{platform}" != ""
install -m 0755 %{_bindir}/TBB wtptp/linux/tbb_linux
%endif
%patch150 -p1
popd
%endif
%build
export BUILD_MESSAGE_TIMESTAMP="\"$(date -d "$(head -n 2
%{_sourcedir}/arm-trusted-firmware.changes | tail -n 1 | cut -d- -f1 )" -u
"+%%H:%%M:%%S, %%b %%e %%Y")\""
%if "%{platform}" == ""
make %{?_smp_mflags} V=1 fiptool
pushd A3700-utils-marvell-%{a3700_utils_ver}
make %{?_smp_mflags} -C wtptp/src/TBB_Linux -f TBB_linux.mak
INCDIR=%{_includedir}/cryptopp LIBDIR=%{_libdir}
make %{?_smp_mflags} -C wtptp/src/Wtpdownloader_Linux -f makefile.mk
popd
%else
%if "%{platform}" == "a3700"
export CROSS_CM3=arm-none-eabi-
%define variants ebin_512M_spinor ebin_v3_1G_spinor ebin_v5_2G_spinor
ebin_v7_1G_spinor ebin_v7_2G_spinor
for variant in %{variants}; do
partnum=0
case "${variant}" in
ebin_*)
clockspreset=CPU_1000_DDR_800
;;
esac
case "${variant}" in
ebin_512M_*)
ddr_topology=0
;;
ebin_v3_1G_*)
ddr_topology=2
;;
ebin_v5_2G_*)
ddr_topology=7
;;
ebin_v7_1G_*)
ddr_topology=5
;;
ebin_v7_2G_*)
ddr_topology=6
;;
esac
case "${variant}" in
*_emmc) bootdev=EMMCNORM ;;
*_sata) bootdev=SATA ;;
*_spinand) bootdev=SPINAND ;;
*_spinor) bootdev=SPINOR ;;
esac
make distclean
%endif
%if "%{platform}" == "poplar"
for dram_size in one_gig two_gig; do
%endif
make \
%if "%{platform}" != "a3700" && "%{platform}" != "a80x0_mcbin"
%{?_smp_mflags} \
%endif
V=1 DISABLE_PEDANTIC=1 DEBUG=%{debug_build} \
%if "%{platform}" == "tegra186" || "%{platform}" == "tegra210"
%if "%{platform}" == "tegra186"
%define target_soc t186
%endif
%if "%{platform}" == "tegra210"
%define target_soc t210
%endif
PLAT=tegra TARGET_SOC=%{target_soc} \
%else
PLAT=%{platform} \
%endif
%if %{use_optee}
SPD=opteed \
BL32=/boot/tee-header_v2.bin \
BL32_EXTRA1=/boot/tee-pager_v2.bin \
BL32_EXTRA2=/boot/tee-pageable_v2.bin \
%endif
%if "%{platform}" == "a3700" || "%{platform}" == "a80x0_mcbin"
LOG_LEVEL=30 \
MV_DDR_PATH=$(pwd)/mv-ddr-marvell-%{mv_ddr_ver} \
%if "%{platform}" == "a3700"
WTP=$(pwd)/A3700-utils-marvell-%{a3700_utils_ver} \
CLOCKSPRESET=${clockspreset} DDR_TOPOLOGY=${ddr_topology} \
USE_COHERENT_MEM=0 \
%if %{use_optee}
LLC_ENABLE=1 LLC_SRAM=1 \
%endif
BOOTDEV=${bootdev} PARTNUM=${partnum} \
MARVELL_SECURE_BOOT=0 \
%endif
%if "%{platform}" == "a80x0_mcbin"
SCP_BL2=$(pwd)/binaries-marvell-%{mv_bin_ver}/mrvl_scp_bl2.img \
%endif
%if "%{platform}" == "a80x0_mcbin" && 0
BL33=/boot/ARMADA_EFI.fd \
%else
BL33=/boot/u-boot.bin \
%endif
all fip
%if "%{platform}" == "a3700"
mv build build.${variant}
done
%endif
%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} \
all fip
mv build build.${dram_size}
make %{?_smp_mflags} V=1 DISABLE_PEDANTIC=1 DEBUG=%{debug_build} \
PLAT=poplar POPLAR_RECOVERY=1 \
BL33=/boot/u-boot.bin \
POPLAR_DRAM_SIZE=${dram_size} \
all fip
mv build build.${dram_size}.recovery
done
%else
%if "%{platform}" == "rpi3"
BL33=/boot/vc/u-boot.bin \
RPI3_PRELOADED_DTB_BASE=0x01000000 \
RPI3_DIRECT_LINUX_BOOT=1 \
RPI3_RUNTIME_UART=1 \
all
%else
%if "%{platform}" == "qemu"
BL33=%{_datadir}/qemu/qemu-uefi-aarch64.bin \
all fip
%else
all
%endif
%endif
%endif
%endif
%endif
%endif
%endif
%install
%if "%{platform}" == ""
mkdir -p %{buildroot}%{_bindir}
install -m 755 tools/fiptool/fiptool %{buildroot}%{_bindir}/fiptool
pushd A3700-utils-marvell-%{a3700_utils_ver}
# No need to have a _linux suffix on Linux
install -D -m 0755 wtptp/src/TBB_Linux/release/TBB_linux
%{buildroot}%{_bindir}/TBB
install -D -m 0755 wtptp/src/Wtpdownloader_Linux/WtpDownload_linux
%{buildroot}%{_bindir}/WtpDownload
popd
%else
export NO_BRP_STRIP_DEBUG=true
export NO_DEBUGINFO_STRIP_DEBUG=true
mkdir -p %{buildroot}%{_datadir}/%{name}
%if 0%{?debug_build}
%global dir debug
%else
%global dir release
%endif
%define outdir build/%{platform}/%{dir}
%if "%{platform}" == "tegra186" || "%{platform}" == "tegra210"
%define outdir build/tegra/%{target_soc}/%{dir}
%endif
%if "%{platform}" == "a3700"
for v in %{variants}; do
outdir=build.${v}/%{platform}/%{dir}
destdir=%{buildroot}%{_datadir}/%{name}/${v}
install -D -m 0644 ${outdir}/bl1.bin ${destdir}/bl1.bin
install -D -m 0644 ${outdir}/bl2.bin ${destdir}/bl2.bin
install -D -m 0644 ${outdir}/bl31.bin ${destdir}/bl31.bin
install -D -m 0644 ${outdir}/fip.bin ${destdir}/fip.bin
install -D -m 0644 ${outdir}/flash-image.bin ${destdir}/flash-image.bin
install -D -m 0644 ${outdir}/uart-images/TIM_ATF.bin
${destdir}/uart/TIM_ATF.bin
install -D -m 0644 ${outdir}/uart-images/boot-image_h.bin
${destdir}/uart/boot-image_h.bin
install -D -m 0644 ${outdir}/uart-images/wtmi_h.bin ${destdir}/uart/wtmi_h.bin
done
%else
%if "%{platform}" == "poplar"
for v in one_gig two_gig one_gig.recovery two_gig.recovery; do
outdir=build.${v}/%{platform}/%{dir}
destdir=%{buildroot}%{_datadir}/%{name}/${v}
install -D -m 0644 ${outdir}/bl1.bin ${destdir}/bl1.bin
install -D -m 0644 ${outdir}/fip.bin ${destdir}/fip.bin
done
mkdir -p %{buildroot}%{_includedir}/%{name}
install -D -m 0644 plat/hisilicon/poplar/include/poplar_layout.h
%{buildroot}%{_includedir}/%{name}/
%else
# u-boot for rockchip requires bl31.elf file
%if "%{platform}" == "rk3328" || "%{platform}" == "rk3368" || "%{platform}" ==
"rk3399" || "%{platform}" == "zynqmp"
install -D -m 0644 %{outdir}/bl31/bl31.elf
%{buildroot}%{_datadir}/%{name}/bl31.elf
%else
install -D -m 0644 %{outdir}/bl31.bin %{buildroot}%{_datadir}/%{name}/bl31.bin
%endif
%if "%{platform}" == "a80x0_mcbin" || "%{platform}" == "hikey" || "%{platform}"
== "hikey960" || "%{platform}" == "qemu" || "%{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}" == "hikey" || "%{platform}"
== "hikey960" || "%{platform}" == "rpi3"
install -D -m 0644 %{outdir}/bl2.bin %{buildroot}%{_datadir}/%{name}/bl2.bin
%endif
%if "%{platform}" == "rpi3"
install -D -m 0644 %{outdir}/armstub8.bin %{buildroot}/boot/vc/armstub8.bin
%endif
%if "%{platform}" == "rpi4"
install -D -m 0644 %{outdir}/bl31.bin %{buildroot}/boot/vc/armstub8-rpi4.bin
%endif
%if "%{platform}" == "a80x0_mcbin"
install -D -m 0644 %{outdir}/ble.bin %{buildroot}%{_datadir}/%{name}/ble.bin
install -D -m 0644 %{outdir}/flash-image.bin
%{buildroot}%{_datadir}/%{name}/flash-image.bin
%endif
%endif
%endif
%endif
%if "%{platform}" == "rpi3" || "%{platform}" == "rpi4"
%post
if mountpoint -q /boot/efi; then
if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f /boot/vc)" ]]; then
cp /boot/vc/armstub8* /boot/efi/
fi
fi
%endif
%files
%defattr(-,root,root)
%license license.rst
%doc docs/about/acknowledgements.rst docs/process/contributing.rst
docs/about/maintainers.rst readme.rst dco.txt
%if "%{platform}" != ""
%{_datadir}/%{name}
%endif
%if "%{platform}" == "rpi3" || "%{platform}" == "rpi4"
/boot/vc/armstub8*
%endif
%if "%{platform}" == ""
%files tools
%defattr(-,root,root)
%{_bindir}/fiptool
%{_bindir}/TBB
%{_bindir}/WtpDownload
%endif
%if "%{platform}" == "poplar"
%files devel
%defattr(-,root,root)
%{_includedir}/%{name}
%endif
%changelog
++++++ A3700_utils-drop-git.patch ++++++
diff --git a/wtmi/sys_init/Makefile b/wtmi/sys_init/Makefile
index 3037e7c..9237eb4 100644
--- a/wtmi/sys_init/Makefile
+++ b/wtmi/sys_init/Makefile
@@ -51,8 +51,7 @@ ECHO = @echo
SED = @sed
LOCAL_VERSION_STRING ?= -armada
-BUILD_STRING := $(shell git log -n 1 --pretty=format:"%h")
-VERSION_STRING := $(LOCAL_VERSION_STRING)-$(BUILD_STRING)
+VERSION_STRING := $(LOCAL_VERSION_STRING)
CPUOPTS = -mthumb -mcpu=cortex-m3 -mlittle-endian
BINPATH = build
++++++ _multibuild ++++++
<multibuild>
<flavor>a3700</flavor>
<flavor>a80x0_mcbin</flavor>
<flavor>hikey</flavor>
<flavor>hikey960</flavor>
<flavor>imx8mm</flavor>
<flavor>imx8mq</flavor>
<flavor>imx8qm</flavor>
<flavor>imx8qx</flavor>
<flavor>poplar</flavor>
<flavor>qemu</flavor>
<flavor>rk3328</flavor>
<flavor>rk3368</flavor>
<flavor>rk3399</flavor>
<flavor>rpi3</flavor>
<flavor>rpi4</flavor>
<flavor>sun50i_a64</flavor>
<flavor>sun50i_h6</flavor>
<flavor>tegra186</flavor>
<flavor>tegra210</flavor>
<flavor>zynqmp</flavor>
</multibuild>
++++++ _service ++++++
<services>
<service name="tar_scm" mode="disabled">
<param
name="url">https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell.git</param>
<param name="scm">git</param>
<param name="filename">mv-ddr-marvell-armada-atf</param>
<param name="versionformat">mainline</param>
<param name="revision">refs/heads/mv_ddr-armada-atf-mainline</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*mv-ddr-marvell*.tar</param>
<param name="compression">gz</param>
</service>
<service name="tar_scm" mode="disabled">
<param
name="url">https://github.com/MarvellEmbeddedProcessors/binaries-marvell.git</param>
<param name="scm">git</param>
<param name="filename">binaries-marvell</param>
<param name="versionformat">10.0.1.0</param>
<param
name="revision">refs/heads/binaries-marvell-armada-SDK10.0.1.0</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*binaries-marvell*.tar</param>
<param name="compression">gz</param>
</service>
<service name="tar_scm" mode="disabled">
<param
name="url">https://github.com/MarvellEmbeddedProcessors/A3700-utils-marvell.git</param>
<param name="scm">git</param>
<param name="filename">A3700-utils-marvell</param>
<param name="versionformat">18.12</param>
<param name="revision">refs/heads/A3700_utils-armada-18.12-fixed</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*A3700-utils-marvell*.tar</param>
<param name="compression">gz</param>
</service>
</services>
++++++ mv-ddr.diff ++++++
>From 05b227877ee70bb9ca6824ef36df66b2de1c396a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <[email protected]>
Date: Sun, 10 Jun 2018 13:46:49 +0200
Subject: [PATCH] mv_ddr4_training_leveling: Fix GCC 8 build error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Building with openSUSE Tumbleweed's GCC 8.1.1 results in the following
build error:
mv_ddr4_training_leveling.c: In function 'mv_ddr4_dynamic_pb_wl_supp':
mv_ddr4_training_leveling.c:454:8: error: 'wr_data' may be used uninitialized
in this function [-Werror=maybe-uninitialized]
ddr3_tip_bus_write(dev_num, ACCESS_TYPE_UNICAST, if_id,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
ACCESS_TYPE_UNICAST, subphy_num,
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
DDR_PHY_DATA,
~~~~~~~~~~~~~
WL_PHY_REG(effective_cs), wr_data);
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This is due to the case of orig_phase == 0 resulting in an uninitialized
wr_data variable being passed to the above function.
Fix this error by zero-initializing the variable.
Signed-off-by: Andreas F??rber <[email protected]>
---
mv_ddr4_training_leveling.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mv_ddr4_training_leveling.c b/mv_ddr4_training_leveling.c
index e44f987..cb61e9a 100644
--- a/mv_ddr4_training_leveling.c
+++ b/mv_ddr4_training_leveling.c
@@ -368,7 +368,7 @@ static int mv_ddr4_dynamic_pb_wl_supp(u32 dev_num, enum
mv_wl_supp_mode ecc_mode
u32 subphy_num = ddr3_tip_dev_attr_get(dev_num,
MV_ATTR_OCTET_PER_INTERFACE);
u8 compare_result = 0;
u32 orig_phase;
- u32 rd_data, wr_data;
+ u32 rd_data, wr_data = 0;
u32 flag, step;
struct mv_ddr_topology_map *tm = mv_ddr_topology_map_get();
u32 ecc_phy_access_id;
--
2.16.4
