[meta-xilinx] [PATCH 3/4] arm-trusted-firmware: Fix a double const build error

[Nathan Rossi]

On 19 August 2017 at 02:29, Alistair Francis
<alistair.francis at xilinx.com> wrote:
> Signed-off-by: Alistair Francis <alistair.francis at xilinx.com>
> ---
>  .../arm-trusted-firmware/arm-trusted-firmware.inc  |  3 +++
>  ...zynqmp-Remove-duplicate-const-declaration.patch | 30 ++++++++++++++++++++++
>  2 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..759cc10 100644
> --- a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
> +++ b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
> @@ -12,8 +12,11 @@ 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}"
> +SRC_URI += "file://zynqmp-Remove-duplicate-const-declaration.patch"

Since this change has already been accepted upstream and this patch is
version specific, can you change it to add the patch to the
arm-trusted-firmware_*.bb recipes (the 2016.3 version will likely be
removed so you can skip it). You can leave the FILESEXTRAPATH in the
.inc.

>
>  ATF_BASE_NAME ?= "${PN}-${PKGE}-${PKGV}-${PKGR}-${DATETIME}"
>  ATF_BASE_NAME[vardepsexclude] = "DATETIME"
> 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

Out of curiosity is this likely to be in the next e.g. 2017.3 Xilinx release?

Thanks,
Nathan

> +
> + 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
>