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 2022-10-04 20:38:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/arm-trusted-firmware (Old)
and /work/SRC/openSUSE:Factory/.arm-trusted-firmware.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "arm-trusted-firmware"
Tue Oct 4 20:38:02 2022 rev:17 rq:1007828 version:2.7
Changes:
--------
---
/work/SRC/openSUSE:Factory/arm-trusted-firmware/arm-trusted-firmware.changes
2022-08-30 15:54:38.643625672 +0200
+++
/work/SRC/openSUSE:Factory/.arm-trusted-firmware.new.2275/arm-trusted-firmware.changes
2022-10-04 20:38:05.496947497 +0200
@@ -8,0 +9,12 @@
+Mon Aug 29 10:47:03 UTC 2022 - Michal Suchanek <msucha...@suse.com>
+
+- Workaround for gcc 7 constant assigment error (boo#1202477).
+ + Workaround-gcc-7-constant-assignment-error.patch
+
+-------------------------------------------------------------------
+Wed Aug 17 08:48:09 UTC 2022 - Michal Suchanek <msucha...@suse.com>
+
+- Do not disable build on Leap
+- Fix build on Tumbleweed
+
+-------------------------------------------------------------------
New:
----
Workaround-gcc-7-constant-assignment-error.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ arm-trusted-firmware.spec ++++++
--- /var/tmp/diff_new_pack.IOsBgD/_old 2022-10-04 20:38:06.124948390 +0200
+++ /var/tmp/diff_new_pack.IOsBgD/_new 2022-10-04 20:38:06.132948402 +0200
@@ -65,6 +65,7 @@
Source3: binaries-marvell-%{mv_bin_ver}.tar.gz
Patch1: atf-allow-non-git-dir.patch
Patch2: rockchip-rk3399-Align-default-baudrate-with-u-boot.patch
+Patch3: Workaround-gcc-7-constant-assignment-error.patch
# Workaround for GCC12 bug -
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523
Patch100: fix-mv-ddr-marvell-armada.patch
# Fix build with GCC12 -
https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell/issues/37
@@ -139,22 +140,10 @@
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# Disable some targets on SLE15-SP4 because of missing deps
-%if 0%{suse_version} < 1550
-%if "%{platform}" == "a3700" || "%{platform}" == "hikey" || "%{platform}" ==
"hikey960" || "%{platform}" == "imx8qm" || "%{platform}" == "imx8qx" ||
"%{platform}" == "rk3399"
-ExclusiveArch: do_not_build
-%else
%if "%{platform}" != ""
BuildArch: noarch
ExclusiveArch: aarch64
%endif
-%endif
-%else
-%if "%{platform}" != ""
-BuildArch: noarch
-ExclusiveArch: aarch64
-%endif
-%endif
%if "%{platform}" == "rpi4"
Supplements: modalias(of:N*T*Cbrcm%2Cbcm2711*C*)
@@ -235,12 +224,16 @@
%endif
%patch1 -p1
%patch2 -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
%endif
%build
+%if %{suse_version} > 1500
+export TF_LDFLAGS=--no-warn-rwx-segments
+%endif
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}
++++++ Workaround-gcc-7-constant-assignment-error.patch ++++++
>From 9a9840d726c90dc7dad8d1c07c5f7e0ca091370b Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msucha...@suse.de>
Date: Mon, 29 Aug 2022 12:43:17 +0200
Subject: [PATCH] Workaround gcc 7 constant assignment error.
[ 30s] plat/imx/imx8qx/imx8qx_bl31_setup.c:32:54: error: initializer element
is not constant
[ 30s] static const unsigned long BL31_COHERENT_RAM_START =
BL_COHERENT_RAM_BASE;
[ 30s]
^~~~~~~~~~~~~~~~~~~~
[ 30s] plat/imx/imx8qx/imx8qx_bl31_setup.c:33:52: error: initializer element
is not constant
[ 30s] static const unsigned long BL31_COHERENT_RAM_END =
BL_COHERENT_RAM_END;
[ 30s] ^~~~~~~~~~~~~~~~~~~
[ 30s] plat/imx/imx8qx/imx8qx_bl31_setup.c:34:45: error: initializer element
is not constant
[ 30s] static const unsigned long BL31_RO_START = BL_CODE_BASE;
[ 30s] ^~~~~~~~~~~~
[ 30s] plat/imx/imx8qx/imx8qx_bl31_setup.c:35:44: error: initializer element
is not constant
[ 30s] static const unsigned long BL31_RO_END = BL_CODE_END;
[ 30s] ^~~~~~~~~~~
[ 30s] plat/imx/imx8qx/imx8qx_bl31_setup.c:36:44: error: initializer element
is not constant
[ 30s] static const unsigned long BL31_RW_END = BL_END;
[ 30s] ^~~~~~
Signed-off-by: Michal Suchanek <msucha...@suse.de>
---
plat/imx/imx8qm/imx8qm_bl31_setup.c | 10 +++++-----
plat/imx/imx8qx/imx8qx_bl31_setup.c | 10 +++++-----
plat/renesas/common/bl31_plat_setup.c | 8 ++++----
plat/renesas/rcar/bl2_plat_setup.c | 8 ++++----
plat/renesas/rzg/bl2_plat_setup.c | 8 ++++----
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/plat/imx/imx8qm/imx8qm_bl31_setup.c
b/plat/imx/imx8qm/imx8qm_bl31_setup.c
index 68eb53422..ee3384a2e 100644
--- a/plat/imx/imx8qm/imx8qm_bl31_setup.c
+++ b/plat/imx/imx8qm/imx8qm_bl31_setup.c
@@ -29,11 +29,11 @@
#include <sci/sci.h>
#include <sec_rsrc.h>
-static const unsigned long BL31_COHERENT_RAM_START = BL_COHERENT_RAM_BASE;
-static const unsigned long BL31_COHERENT_RAM_END = BL_COHERENT_RAM_END;
-static const unsigned long BL31_RO_START = BL_CODE_BASE;
-static const unsigned long BL31_RO_END = BL_CODE_END;
-static const unsigned long BL31_RW_END = BL_END;
+#define BL31_COHERENT_RAM_START ((const unsigned long)BL_COHERENT_RAM_BASE)
+#define BL31_COHERENT_RAM_END ((const unsigned long)BL_COHERENT_RAM_END)
+#define BL31_RO_START ((const unsigned long)BL_CODE_BASE)
+#define BL31_RO_END ((const unsigned long)BL_CODE_END)
+#define BL31_RW_END ((const unsigned long)BL_END)
IMPORT_SYM(unsigned long, __RW_START__, BL31_RW_START);
diff --git a/plat/imx/imx8qx/imx8qx_bl31_setup.c
b/plat/imx/imx8qx/imx8qx_bl31_setup.c
index 1da8d296c..7aca057bf 100644
--- a/plat/imx/imx8qx/imx8qx_bl31_setup.c
+++ b/plat/imx/imx8qx/imx8qx_bl31_setup.c
@@ -29,11 +29,11 @@
#include <sci/sci.h>
#include <sec_rsrc.h>
-static const unsigned long BL31_COHERENT_RAM_START = BL_COHERENT_RAM_BASE;
-static const unsigned long BL31_COHERENT_RAM_END = BL_COHERENT_RAM_END;
-static const unsigned long BL31_RO_START = BL_CODE_BASE;
-static const unsigned long BL31_RO_END = BL_CODE_END;
-static const unsigned long BL31_RW_END = BL_END;
+#define BL31_COHERENT_RAM_START ((const unsigned long)BL_COHERENT_RAM_BASE)
+#define BL31_COHERENT_RAM_END ((const unsigned long)BL_COHERENT_RAM_END)
+#define BL31_RO_START ((const unsigned long)BL_CODE_BASE)
+#define BL31_RO_END ((const unsigned long)BL_CODE_END)
+#define BL31_RW_END ((const unsigned long)BL_END)
IMPORT_SYM(unsigned long, __RW_START__, BL31_RW_START);
diff --git a/plat/renesas/common/bl31_plat_setup.c
b/plat/renesas/common/bl31_plat_setup.c
index 60960d4c6..6edc9e60d 100644
--- a/plat/renesas/common/bl31_plat_setup.c
+++ b/plat/renesas/common/bl31_plat_setup.c
@@ -22,12 +22,12 @@
#include "rcar_private.h"
#include "rcar_version.h"
-static const uint64_t BL31_RO_BASE = BL_CODE_BASE;
-static const uint64_t BL31_RO_LIMIT = BL_CODE_END;
+#define BL31_RO_BASE ((const uint64_t)BL_CODE_BASE)
+#define BL31_RO_LIMIT ((const uint64_t)BL_CODE_END)
#if USE_COHERENT_MEM
-static const uint64_t BL31_COHERENT_RAM_BASE = BL_COHERENT_RAM_BASE;
-static const uint64_t BL31_COHERENT_RAM_LIMIT = BL_COHERENT_RAM_END;
+#define BL31_COHERENT_RAM_BASE ((const uint64_t)BL_COHERENT_RAM_BASE)
+#define BL31_COHERENT_RAM_LIMIT ((const uint64_t)BL_COHERENT_RAM_END)
#endif /* USE_COHERENT_MEM */
extern void plat_rcar_gic_driver_init(void);
diff --git a/plat/renesas/rcar/bl2_plat_setup.c
b/plat/renesas/rcar/bl2_plat_setup.c
index bbfa16927..2416181a6 100644
--- a/plat/renesas/rcar/bl2_plat_setup.c
+++ b/plat/renesas/rcar/bl2_plat_setup.c
@@ -53,12 +53,12 @@
* Following symbols are only used during plat_arch_setup() only
* when RCAR_BL2_DCACHE is enabled.
*/
-static const uint64_t BL2_RO_BASE = BL_CODE_BASE;
-static const uint64_t BL2_RO_LIMIT = BL_CODE_END;
+#define BL2_RO_BASE ((const uint64_t)BL_CODE_BASE)
+#define BL2_RO_LIMIT ((const uint64_t)BL_CODE_END)
#if USE_COHERENT_MEM
-static const uint64_t BL2_COHERENT_RAM_BASE = BL_COHERENT_RAM_BASE;
-static const uint64_t BL2_COHERENT_RAM_LIMIT = BL_COHERENT_RAM_END;
+#define BL2_COHERENT_RAM_BASE ((const uint64_t)BL_COHERENT_RAM_BASE)
+#define BL2_COHERENT_RAM_LIMIT ((const uint64_t)BL_COHERENT_RAM_END)
#endif
#endif
diff --git a/plat/renesas/rzg/bl2_plat_setup.c
b/plat/renesas/rzg/bl2_plat_setup.c
index e9dbd2058..2d458a68f 100644
--- a/plat/renesas/rzg/bl2_plat_setup.c
+++ b/plat/renesas/rzg/bl2_plat_setup.c
@@ -50,12 +50,12 @@
* Following symbols are only used during plat_arch_setup() only
* when RCAR_BL2_DCACHE is enabled.
*/
-static const uint64_t BL2_RO_BASE = BL_CODE_BASE;
-static const uint64_t BL2_RO_LIMIT = BL_CODE_END;
+#define BL2_RO_BASE ((const uint64_t)BL_CODE_BASE)
+#define BL2_RO_LIMIT ((const uint64_t)BL_CODE_END)
#if USE_COHERENT_MEM
-static const uint64_t BL2_COHERENT_RAM_BASE = BL_COHERENT_RAM_BASE;
-static const uint64_t BL2_COHERENT_RAM_LIMIT = BL_COHERENT_RAM_END;
+#define BL2_COHERENT_RAM_BASE ((const uint64_t)BL_COHERENT_RAM_BASE)
+#define BL2_COHERENT_RAM_LIMIT ((const uint64_t)BL_COHERENT_RAM_END)
#endif /* USE_COHERENT_MEM */
#endif /* RCAR_BL2_DCACHE */
--
2.37.1
