[meta-xilinx] [PATCH v2 1/2] arm-trusted-firmware: Fix a double const build error

[Alistair Francis]

On Tue, Aug 22, 2017 at 7:30 AM, Nathan Rossi <nathan at nathanrossi.com> wrote:
> On 22 August 2017 at 04:07, Alistair Francis
> <alistair.francis at xilinx.com> wrote:
>> Backport a mainline ATF patch to the Xilinx tree in order to fix the ATF
>> build.
>>
>> Signed-off-by: Alistair Francis <alistair.francis at xilinx.com>
>
> Applied.

Thanks, this will also be fixed in the 2017.3 release.

Alistair

>
> Thanks,
> Nathan
>
>> ---
>>  .../arm-trusted-firmware/arm-trusted-firmware.inc  |  2 ++
>>  .../arm-trusted-firmware_2017.1.bb                 |  1 +
>>  ...zynqmp-Remove-duplicate-const-declaration.patch | 30 ++++++++++++++++++++++
>>  3 files changed, 33 insertions(+)
>>  create mode 100644 recipes-bsp/arm-trusted-firmware/files/zynqmp-Remove-duplicate-const-declaration.patch
>>
>> diff --git a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
>> index 217919c..cb7ee3e 100644
>> --- a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
>> +++ b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
>> @@ -12,6 +12,8 @@ DEPENDS += "u-boot-mkimage-native"
>>  S = "${WORKDIR}/git"
>>  B = "${WORKDIR}/build"
>>
>> +FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
>> +
>>  BRANCH = "master"
>>  SRC_URI = "git://github.com/Xilinx/arm-trusted-firmware.git;protocol=https;branch=${BRANCH}"
>>
>> diff --git a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2017.1.bb b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2017.1.bb
>> index d98ed6a..52901f2 100644
>> --- a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2017.1.bb
>> +++ b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2017.1.bb
>> @@ -5,3 +5,4 @@ SRCREV ?= "7d1a6732c9ae113999aeabcb9912369760d05c13"
>>
>>  PV = "1.3-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}"
>>
>> +SRC_URI += "file://zynqmp-Remove-duplicate-const-declaration.patch"
>> 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 0000000..dd127fb
>> --- /dev/null
>> +++ b/recipes-bsp/arm-trusted-firmware/files/zynqmp-Remove-duplicate-const-declaration.patch
>> @@ -0,0 +1,30 @@
>> +From a97f6272b7a7a8e3249df34c22479b3893746395 Mon Sep 17 00:00:00 2001
>> +From: Soren Brinkmann <soren.brinkmann at xilinx.com>
>> +Date: Sat, 1 Jul 2017 20:24:47 -0700
>> +Subject: [PATCH] zynqmp: Remove duplicate 'const' declaration
>> +
>> +Fixing compilation errors due to duplicate 'const' keyword:
>> +  plat/xilinx/zynqmp/pm_service/pm_client.c:39:29: error: duplicate 'const' declaration specifier [-Werror=duplicate-decl-specifier]
>> +   static const struct pm_proc const pm_procs_all[] = {
>> +                               ^~~~~
>> +
>> +Signed-off-by: Soren Brinkmann <soren.brinkmann at xilinx.com>
>> +---
>> +Upstream Status: Accepted in mainline, patch send to Xilinx
>> +
>> + plat/xilinx/zynqmp/pm_service/pm_client.c | 2 +-
>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>> +
>> +diff --git a/plat/xilinx/zynqmp/pm_service/pm_client.c b/plat/xilinx/zynqmp/pm_service/pm_client.c
>> +index f11725d78..08369b99e 100644
>> +--- a/plat/xilinx/zynqmp/pm_service/pm_client.c
>> ++++ b/plat/xilinx/zynqmp/pm_service/pm_client.c
>> +@@ -31,7 +31,7 @@ DEFINE_BAKERY_LOCK(pm_client_secure_lock);
>> + extern const struct pm_ipi apu_ipi;
>> +
>> + /* Order in pm_procs_all array must match cpu ids */
>> +-static const struct pm_proc const pm_procs_all[] = {
>> ++static const struct pm_proc pm_procs_all[] = {
>> +       {
>> +               .node_id = NODE_APU_0,
>> +               .pwrdn_mask = APU_0_PWRCTL_CPUPWRDWNREQ_MASK,
>> --
>> 2.11.0
>>
> --
> _______________________________________________
> meta-xilinx mailing list
> meta-xilinx at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-xilinx