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-08-30 13:55:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/arm-trusted-firmware (Old)
and /work/SRC/openSUSE:Factory/.arm-trusted-firmware.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "arm-trusted-firmware"
Mon Aug 30 13:55:17 2021 rev:4 rq:914945 version:2.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/arm-trusted-firmware/arm-trusted-firmware.changes 2021-06-18 10:14:11.502026400 +0200
+++ /work/SRC/openSUSE:Factory/.arm-trusted-firmware.new.1899/arm-trusted-firmware.changes 2021-08-30 13:55:37.453854435 +0200
@@ -1,0 +2,11 @@
+Tue Jul 6 12:16:36 UTC 2021 - Guillaume GARDET
+
+- Update mv-ddr-marvell to use master branch as upstream recommends
+ This fixes build of a80x0_mcbin
+- Update A3700-utils-marvell to use master branch as upstream recommends
+- Re-enable A3700 tools with patch:
+ * fix-A3700-gcc11.patch
+- And refresh patch:
+ * A3700_utils-drop-git.patch
+
+-------------------------------------------------------------------
Old:
----
A3700-utils-marvell-18.12.tar.gz
mv-ddr-marvell-mv-ddr-devel.tar.gz
New:
----
A3700-utils-marvell-master.tar.gz
fix-A3700-gcc11.patch
mv-ddr-marvell-armada-atf-master.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ arm-trusted-firmware.spec ++++++
--- /var/tmp/diff_new_pack.2FABQZ/_old 2021-08-30 13:55:38.709856047 +0200
+++ /var/tmp/diff_new_pack.2FABQZ/_new 2021-08-30 13:55:38.713856052 +0200
@@ -26,8 +26,8 @@
%global debug_build 1
%endif
-# Disable A3700 tools until upstream fixed it - https://github.com/MarvellEmbeddedProcessors/A3700-utils-marvell/issues/22
-%bcond_with A3700_tools
+# Patch151 fixes the build with GCC11 - https://github.com/MarvellEmbeddedProcessors/A3700-utils-marvell/issues/22
+%bcond_without A3700_tools
%bcond_with atf_optee
@@ -53,9 +53,9 @@
Version: 2.5
Release: 0
%define srcversion 2.5
-%define mv_ddr_ver mv-ddr-devel
+%define mv_ddr_ver armada-atf-master
%define mv_bin_ver 10.0.1.0
-%define a3700_utils_ver 18.12
+%define a3700_utils_ver master
Summary: Arm Trusted Firmware-A
License: BSD-3-Clause
Group: System/Boot
@@ -67,18 +67,19 @@
# PATCH-FIX-UPSTREAM - https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/9990
Patch1: atf-2411053.diff
Patch150: A3700_utils-drop-git.patch
+Patch151: fix-A3700-gcc11.patch
%if "%{platform}" != ""
#!BuildIgnore: gcc-PIE
%endif
%if "%{platform}" == "a3700"
BuildRequires: arm-trusted-firmware-tools
+BuildRequires: cross-arm-none-newlib-devel
+BuildRequires: gcc-c++
+BuildRequires: libcryptopp-devel
%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
@@ -187,6 +188,8 @@
%else
%setup -q -n trusted-firmware-a-%{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
%else
%if "%{platform}" == ""
%setup -q -n trusted-firmware-a-%{srcversion} -a 2
@@ -196,18 +199,25 @@
%endif
%if "%{platform}" == "" || "%{platform}" == "a3700"
pushd A3700-utils-marvell-%{a3700_utils_ver}
+# git repo or branch.txt file are expected
+echo "%{a3700_utils_ver}" > branch.txt
# 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
+%patch151 -p1
popd
%endif
%patch1 -p1
%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}" == "a3700"
+export CRYPTOPP_LIBDIR=%{_libdir}
+export CRYPTOPP_INCDIR=%{_includedir}/cryptopp
+%endif
%if "%{platform}" == ""
@@ -304,6 +314,9 @@
%endif
%if "%{platform}" == "a3700" || "%{platform}" == "a80x0_mcbin"
mrvl_flash \
+%if "%{platform}" == "a3700"
+ mrvl_uart \
+%endif
%endif
all fip
%if "%{platform}" == "a3700"
++++++ A3700_utils-drop-git.patch ++++++
--- /var/tmp/diff_new_pack.2FABQZ/_old 2021-08-30 13:55:38.741856088 +0200
+++ /var/tmp/diff_new_pack.2FABQZ/_new 2021-08-30 13:55:38.741856088 +0200
@@ -1,12 +1,10 @@
-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
+--- A3700-utils-marvell-master/wtmi/sys_init/Makefile.orig 2021-07-06 14:15:03.579538716 +0200
++++ A3700-utils-marvell-master/wtmi/sys_init/Makefile 2021-07-06 14:15:14.771664652 +0200
@@ -51,8 +51,7 @@ ECHO = @echo
SED = @sed
LOCAL_VERSION_STRING ?= -armada
--BUILD_STRING := $(shell git log -n 1 --pretty=format:"%h")
+-BUILD_STRING := $(shell git log -n 1 --pretty=format:"%h" && (git diff-index --quiet HEAD || echo -dirty))
-VERSION_STRING := $(LOCAL_VERSION_STRING)-$(BUILD_STRING)
+VERSION_STRING := $(LOCAL_VERSION_STRING)
++++++ _service ++++++
--- /var/tmp/diff_new_pack.2FABQZ/_old 2021-08-30 13:55:38.777856134 +0200
+++ /var/tmp/diff_new_pack.2FABQZ/_new 2021-08-30 13:55:38.781856139 +0200
@@ -3,8 +3,8 @@
<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>
+ <param name="versionformat">master</param>
+ <param name="revision">55139f6e5893201c908f9d9c91bc76858def83a6</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*mv-ddr-marvell*.tar</param>
@@ -27,8 +27,8 @@
<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>
+ <param name="versionformat">master</param>
+ <param name="revision">2efdb10f3524c534d276002adf81fec06e0f1cf2</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*A3700-utils-marvell*.tar</param>
++++++ fix-A3700-gcc11.patch ++++++
diff --git a/wtptp/src/TBB_Linux/src/TimDescriptorParser.cpp b/wtptp/src/TBB_Linux/src/TimDescriptorParser.cpp
index 294c17b4e4fb..cba1362ad89e 100644
--- a/wtptp/src/TBB_Linux/src/TimDescriptorParser.cpp
+++ b/wtptp/src/TBB_Linux/src/TimDescriptorParser.cpp
@@ -2682,7 +2682,7 @@ bool CTimDescriptorParser::ParseExtendedReservedData(
}
if (m_TimDescriptor.ImagesList().size() > 0) {
CImageDescription* pImage = (*(m_TimDescriptor.ImagesList().begin()));
- if (pImage > 0
+ if (pImage != 0
&& ((Translate(pImage->ImageIdTag()) & TYPEMASK)
== (TIMIDENTIFIER & TYPEMASK))) {
if (pImage->ImageSizeToHash() == pImage->ImageSize())
diff --git a/wtptp/src/Wtpdownloader_Linux/makefile.mk b/wtptp/src/Wtpdownloader_Linux/makefile.mk
index 4597b79202be..6c39406b57f3 100644
--- a/wtptp/src/Wtpdownloader_Linux/makefile.mk
+++ b/wtptp/src/Wtpdownloader_Linux/makefile.mk
@@ -11,7 +11,7 @@ IPP_STATIC_LIB_DIR = $(IPP_PATH)/lib
OBJECTS = WtpStatus.o WtpCommand.o Misc.o WtpException.o WtpImage.o Port.o ProtocolManager.o USBPortLinux.o UARTPortLinux.o TimParser.o CommandlineParser.o TimLib.o WtpDownloadApp.o \
-CXXFLAGS = -Wno-deprecated -D LINUX=1 -D TOOLS_GUI=0 -D IPPV6=1 -D TRUSTED=1 -D DEV_DEBUG=0 -I $(COMMON_SRC)
+CXXFLAGS = -std=c++11 -Wno-deprecated -D LINUX=1 -D TOOLS_GUI=0 -D IPPV6=1 -D TRUSTED=1 -D DEV_DEBUG=0 -I $(COMMON_SRC)
WTP_CXXFLAGS = $(CXXFLAGS) -I $(WTP_INCLUDE)
