From: Jan Palus <atler@pld-linux.org>
Date: Thu, 25 Nov 2021 17:35:27 +0000 (+0100)
Subject: up to 2.6
X-Git-Url: https://git.pld-linux.org/?p=packages%2Farm-trusted-firmware.git;a=commitdiff_plain;h=f58478aeb08dab336c86028bc47dc8b8c7c7c8a7

up to 2.6
---

diff --git a/arm-trusted-firmware.spec b/arm-trusted-firmware.spec
index 1d809d8..864c04c 100644
--- a/arm-trusted-firmware.spec
+++ b/arm-trusted-firmware.spec
@@ -1,12 +1,11 @@
 Summary:	ARM Trusted Firmware
 Name:		arm-trusted-firmware
-Version:	2.5
-Release:	2
+Version:	2.6
+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:	590ae90bccde7ce8b7f5963b25500bfd
-Patch0:		rk3399-dram.patch
+# Source0-md5:	990073a9b7fde7bb0bc64186687aa779
 URL:		https://developer.arm.com/tools-and-software/open-source-software/firmware/trusted-firmware
 BuildRequires:	crossarm-gcc
 BuildRequires:	dtc
@@ -40,7 +39,6 @@ interest to users.
 
 %prep
 %setup -q -n trusted-firmware-a-%{version}
-%patch0 -p1
 
 %build
 for soc in rk3399; do
diff --git a/rk3399-dram.patch b/rk3399-dram.patch
deleted file mode 100644
index 83efa32..0000000
--- a/rk3399-dram.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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);
-