From 701089e25f57eb2e67fed1ca19019a6a5ce75274 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: May 13 2021 11:17:24 +0000
Subject: Update to 2.5-rc1


---

diff --git a/0001-rockchip-rk3399-fix-dram-section-placement-declarati.patch b/0001-rockchip-rk3399-fix-dram-section-placement-declarati.patch
new file mode 100644
index 0000000..9dba389
--- /dev/null
+++ b/0001-rockchip-rk3399-fix-dram-section-placement-declarati.patch
@@ -0,0 +1,35 @@
+From 241105311073cbf8a1fceea8c6c3b6485a4d128b Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Thu, 13 May 2021 11:29:01 +0100
+Subject: [PATCH] rockchip/rk3399: fix dram section placement declaration
+
+In commit af27fb89a9 the DRAM restore code was moved to PMUSRAM but
+the declaration in dram.h wasn't updated to reflect this change. Newer
+versions of gcc are now complaining about this with certain flags.
+
+Details in https://developer.trustedfirmware.org/T925
+
+Fixes: af27fb89a9 ("rockchip/rk3399: Move DRAM restore to PMUSRAM")
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+Signed-off-by: Chris Kay <chris.kay@arm.com>
+Change-Id: Ia96134465892989821ef90572203b2755003f7fb
+---
+ plat/rockchip/rk3399/drivers/dram/dram.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plat/rockchip/rk3399/drivers/dram/dram.h b/plat/rockchip/rk3399/drivers/dram/dram.h
+index 0eb12cf29..5572b1612 100644
+--- a/plat/rockchip/rk3399/drivers/dram/dram.h
++++ b/plat/rockchip/rk3399/drivers/dram/dram.h
+@@ -149,7 +149,7 @@ struct rk3399_sdram_params {
+ 	uint32_t rx_cal_dqs[2][4];
+ };
+ 
+-extern __sramdata struct rk3399_sdram_params sdram_config;
++extern struct rk3399_sdram_params sdram_config;
+ 
+ void dram_init(void);
+ 
+-- 
+2.31.1
+
diff --git a/arm-trusted-firmware.spec b/arm-trusted-firmware.spec
index fb39f8b..451162b 100644
--- a/arm-trusted-firmware.spec
+++ b/arm-trusted-firmware.spec
@@ -1,22 +1,17 @@
-#global candidate rc0
-# ./make-git-snapshot.sh
-#global snapshot 20190209
+%global candidate rc1
 
 # Binaries not used in standard manner so debuginfo is useless
 %global debug_package %{nil}
 
 Name:    arm-trusted-firmware
-Version: 2.4
-Release: 3%{?candidate:.%{candidate}}%{?snapshot:.%{snapshot}}%{?dist}
+Version: 2.5
+Release: 0.1%{?candidate:.%{candidate}}%{?dist}
 Summary: ARM Trusted Firmware
 License: BSD
 URL:     https://github.com/ARM-software/arm-trusted-firmware/wiki
 
-%if 0%{?snapshot}
-Source0:  arm-trusted-firmware-%{snapshot}.tar.xz
-%else
-Source0:  https://github.com/ARM-software/arm-trusted-firmware/archive/v%{version}%{?candidate:-%{candidate}}.tar.gz
-%endif
+Source0: https://github.com/ARM-software/arm-trusted-firmware/archive/v%{version}%{?candidate:-%{candidate}}.tar.gz
+Patch0:  0001-rockchip-rk3399-fix-dram-section-placement-declarati.patch
 
 # At the moment we're only building on aarch64
 ExclusiveArch: aarch64
@@ -55,11 +50,7 @@ such as u-boot. As such the binaries aren't of general interest to users.
 %endif
 
 %prep
-%if 0%{?snapshot}
-%autosetup -n %{name}-%{snapshot} -p1
-%else
 %autosetup -n %{name}-%{version}%{?candidate:-%{candidate}} -p1
-%endif
 
 # Fix the name of the cross compile for the rk3399 Cortex-M0 PMU
 sed -i 's/arm-none-eabi-/arm-linux-gnu-/' plat/rockchip/rk3399/drivers/m0/Makefile
@@ -71,7 +62,7 @@ sed -i 's/arm-none-eabi-/arm-linux-gnu-/' plat/rockchip/rk3399/drivers/m0/Makefi
 %endif
 
 %ifarch aarch64
-for soc in axg g12a gxbb gxl hikey hikey960 imx8mm imx8mq imx8qm imx8qx rk3399 rk3368 rk3328 rpi3 rpi4 sun50i_a64 sun50i_h6 zynqmp
+for soc in axg g12a gxbb gxl hikey hikey960 imx8mm imx8mq imx8qm imx8qx rk3328 rk3368 rk3399 rpi3 rpi4 sun50i_a64 sun50i_h6 zynqmp
 do
 # At the moment we're only making the secure firmware (bl31)
 make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" PLAT=$(echo $soc) bl31
@@ -118,6 +109,9 @@ done
 %endif
 
 %changelog
+* Thu May 13 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2.5-0.1.rc1
+- New 2.5 RC1 release
+
 * Mon Feb 01 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2.4-3
 - Enable newer Amlogic devices
 
diff --git a/sources b/sources
index b1bf95c..87e30be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.4.tar.gz) = 99c5b73345e605db70941a0d44cfe3a1d3df8bbc615e4f2602ca90055cc7150a205350d9ae73dec73fcee85e6877351136428f996d421e57147c931a36f6a330
+SHA512 (v2.5-rc1.tar.gz) = 4b3b151a332bc51eed7f7bf77783f28e37cca403c245f07a638ad47bc75fb24eedf5aec6b24bd0e0d24a5353ee37e56ebdd31903c5d4fe9dbf509169b43352e0