summaryrefslogtreecommitdiffstats
path: root/recipes-bsp/arm-trusted-firmware/files/zynqmp-Remove-duplicate-const-declaration.patch
diff options
context:
space:
mode:
authorAlistair Francis <alistair.francis@xilinx.com>2017-08-21 11:07:07 -0700
committerNathan Rossi <nathan@nathanrossi.com>2017-08-23 00:20:23 +1000
commit6589dfaba21e2f77bae771efcb9253d06de8559d (patch)
tree233e7bf2473017f249a202c2c2203050c2dd055c /recipes-bsp/arm-trusted-firmware/files/zynqmp-Remove-duplicate-const-declaration.patch
parent07783c3cea24768ffc08d9102de6ae0c666a841e (diff)
downloadmeta-xilinx-6589dfaba21e2f77bae771efcb9253d06de8559d.tar.gz
arm-trusted-firmware: Fix a double const build error
Backport a mainline ATF patch to the Xilinx tree in order to fix the ATF build. Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Diffstat (limited to 'recipes-bsp/arm-trusted-firmware/files/zynqmp-Remove-duplicate-const-declaration.patch')
-rw-r--r--recipes-bsp/arm-trusted-firmware/files/zynqmp-Remove-duplicate-const-declaration.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/recipes-bsp/arm-trusted-firmware/files/zynqmp-Remove-duplicate-const-declaration.patch b/recipes-bsp/arm-trusted-firmware/files/zynqmp-Remove-duplicate-const-declaration.patch
new file mode 100644
index 00000000..dd127fb5
--- /dev/null
+++ b/recipes-bsp/arm-trusted-firmware/files/zynqmp-Remove-duplicate-const-declaration.patch
@@ -0,0 +1,30 @@
1From a97f6272b7a7a8e3249df34c22479b3893746395 Mon Sep 17 00:00:00 2001
2From: Soren Brinkmann <soren.brinkmann@xilinx.com>
3Date: Sat, 1 Jul 2017 20:24:47 -0700
4Subject: [PATCH] zynqmp: Remove duplicate 'const' declaration
5
6Fixing compilation errors due to duplicate 'const' keyword:
7 plat/xilinx/zynqmp/pm_service/pm_client.c:39:29: error: duplicate 'const' declaration specifier [-Werror=duplicate-decl-specifier]
8 static const struct pm_proc const pm_procs_all[] = {
9 ^~~~~
10
11Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
12---
13Upstream Status: Accepted in mainline, patch send to Xilinx
14
15 plat/xilinx/zynqmp/pm_service/pm_client.c | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/plat/xilinx/zynqmp/pm_service/pm_client.c b/plat/xilinx/zynqmp/pm_service/pm_client.c
19index f11725d78..08369b99e 100644
20--- a/plat/xilinx/zynqmp/pm_service/pm_client.c
21+++ b/plat/xilinx/zynqmp/pm_service/pm_client.c
22@@ -31,7 +31,7 @@ DEFINE_BAKERY_LOCK(pm_client_secure_lock);
23 extern const struct pm_ipi apu_ipi;
24
25 /* Order in pm_procs_all array must match cpu ids */
26-static const struct pm_proc const pm_procs_all[] = {
27+static const struct pm_proc pm_procs_all[] = {
28 {
29 .node_id = NODE_APU_0,
30 .pwrdn_mask = APU_0_PWRCTL_CPUPWRDWNREQ_MASK,