[meta-xilinx] [meta-xilinx-bsp][PATCH] arm-trusted-firmware.inc: Add support to build ATF for versal devices

[Luca Ceresoli]

Hi Manjukumar,

a minor nit below.

On 29/04/19 20:24, Manjukumar Matha wrote:
> Add support to build ATF for versal devices
> 
> Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha at xilinx.com>
> ---
>  .../arm-trusted-firmware/arm-trusted-firmware.inc          | 14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
> index d64fad9..1b42819 100644
> --- a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
> +++ b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
> @@ -25,9 +25,12 @@ SRC_URI = "${REPO};${BRANCHARG}"
>  ATF_BASE_NAME ?= "${PN}-${PKGE}-${PKGV}-${PKGR}-${DATETIME}"
>  ATF_BASE_NAME[vardepsexclude] = "DATETIME"
>  
> -COMPATIBLE_MACHINE = "zynqmp"
> -PLATFORM_zynqmp = "zynqmp"
> +COMPATIBLE_MACHINE ?= "^$"
> +COMPATIBLE_MACHINE_zynqmp = ".*"
> +COMPATIBLE_MACHINE_versal = ".*"
>  
> +PLATFORM_zynqmp = "zynqmp"
> +PLATFORM_versal = "versal"
>  
>  # requires CROSS_COMPILE set by hand as there is no configure script
>  export CROSS_COMPILE="${TARGET_PREFIX}"
> @@ -40,9 +43,13 @@ LD[unexport] = "1"
>  
>  ATF_CONSOLE ?= ""
>  ATF_CONSOLE_zynqmp = "cadence"
> +ATF_CONSOLE_versal ?= "pl011"
>  
>  DEBUG ?= ""
> +DEBUG_versal ?= "1"
> +
>  EXTRA_OEMAKE_zynqmp_append = "${@' ZYNQMP_CONSOLE=${ATF_CONSOLE}' if d.getVar('ATF_CONSOLE', True) != '' else ''}"
> +EXTRA_OEMAKE_append_versal = "${@' VERSAL_CONSOLE=${ATF_CONSOLE}' if d.getVar('ATF_CONSOLE', True) != '' else ''}"

Not related to your addition, but the zynqmp line before this has
swapped "append" and "zynqmp" with respect to the usual syntax. It looks
like it works anyway, but perhaps it's worth cleaning it up in a
separate patch.

> @@ -53,6 +60,9 @@ ATF_MEM_SIZE ?= ""
>  EXTRA_OEMAKE_zynqmp_append = "${@' ZYNQMP_ATF_MEM_BASE=${ATF_MEM_BASE}' if d.getVar('ATF_MEM_BASE', True) != '' else ''}"
>  EXTRA_OEMAKE_zynqmp_append = "${@' ZYNQMP_ATF_MEM_SIZE=${ATF_MEM_SIZE}' if d.getVar('ATF_MEM_SIZE', True) != '' else ''}"

Same comment here.

-- 
Luca