[packages/arm-trusted-firmware] up to 2.5

[atler]

commit 603787ff9f14bf1ba45564d32c9a1db50272c914
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue May 18 14:01:36 2021 +0200

    up to 2.5
    
    - enable verbose output
    - replaced sed with passing M0_CROSS_COMPILE
    - fix build failure for rk3399:
    
    plat/rockchip/rk3399/drivers/dram/dram.c:13:22: error: ignoring attribute 'section (".pmusram.data")' because it conflicts with previous 'section (".sram.data")' [-Werror=attributes]
       13 | __pmusramdata struct rk3399_sdram_params sdram_config;
          |                      ^~~~~~~~~~~~~~~~~~~
    In file included from plat/rockchip/rk3399/drivers/dram/dram.c:7:
    plat/rockchip/rk3399/drivers/dram/dram.h:152:46: note: previous declaration here
      152 | extern __sramdata struct rk3399_sdram_params sdram_config;
          |                                              ^~~~~~~~~~~~

 arm-trusted-firmware.spec | 17 +++++++++++------
 rk3399-dram.patch         | 11 +++++++++++
 2 files changed, 22 insertions(+), 6 deletions(-)
---
diff --git a/arm-trusted-firmware.spec b/arm-trusted-firmware.spec
index 7ee49bf..cde67e9 100644
--- a/arm-trusted-firmware.spec
+++ b/arm-trusted-firmware.spec
@@ -1,11 +1,12 @@
 Summary:	ARM Trusted Firmware
 Name:		arm-trusted-firmware
-Version:	2.4
+Version:	2.5
 Release:	1
 License:	BSD
 Group:		Base/Kernel
 Source0:	https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/trusted-firmware-a-%{version}.tar.gz
-# Source0-md5:	19a6d208f613227415654db38cf88c81
+# Source0-md5:	590ae90bccde7ce8b7f5963b25500bfd
+Patch0:		rk3399-dram.patch
 URL:		https://developer.arm.com/tools-and-software/open-source-software/firmware/trusted-firmware
 BuildRequires:	crossarm-gcc
 BuildRequires:	dtc
@@ -39,13 +40,17 @@ interest to users.
 
 %prep
 %setup -q -n trusted-firmware-a-%{version}
-
-# Fix the name of the cross compile for the rk3399 Cortex-M0 PMU
-sed -i 's/arm-none-eabi-/arm-linux-gnueabi-/' plat/rockchip/rk3399/drivers/m0/Makefile
+%patch0 -p1
 
 %build
 for soc in rk3399; do
-%{__make} HOSTCC="%{__cc} %{rpmcflags}" CROSS_COMPILE="" PLAT="$soc" bl31
+%{__make} \
+	V=1 \
+	HOSTCC="%{__cc} %{rpmcflags}" \
+	CROSS_COMPILE="" \
+	M0_CROSS_COMPILE="arm-linux-gnueabi-" \
+	PLAT="$soc" \
+	bl31
 done
 
 %install
diff --git a/rk3399-dram.patch b/rk3399-dram.patch
new file mode 100644
index 0000000..83efa32
--- /dev/null
+++ b/rk3399-dram.patch
@@ -0,0 +1,11 @@
+--- trusted-firmware-a-2.5/plat/rockchip/rk3399/drivers/dram/dram.h.orig	2021-05-14 17:56:37.000000000 +0200
++++ trusted-firmware-a-2.5/plat/rockchip/rk3399/drivers/dram/dram.h	2021-05-18 13:59:59.413453148 +0200
+@@ -149,7 +149,7 @@
+ 	uint32_t rx_cal_dqs[2][4];
+ };
+ 
+-extern __sramdata struct rk3399_sdram_params sdram_config;
++extern __pmusramdata struct rk3399_sdram_params sdram_config;
+ 
+ void dram_init(void);
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/arm-trusted-firmware.git/commitdiff/603787ff9f14bf1ba45564d32c9a1db50272c914