All of lore.kernel.org
 help / color / mirror / Atom feed
From: Horia Geanta <horia.geanta@nxp.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 2/6] armv8: fsl-layerscape: fix compile error with sec fw disabled
Date: Fri, 18 Oct 2019 06:32:00 +0000	[thread overview]
Message-ID: <VI1PR0402MB34851971EC52235BE327488A986C0@VI1PR0402MB3485.eurprd04.prod.outlook.com> (raw)
In-Reply-To: 20191017092144.19525-2-laurentiu.tudor@nxp.com

On 10/17/2019 12:21 PM, Laurentiu Tudor wrote:
> From: Laurentiu Tudor <laurentiu.tudor@nxp.com>
> 
> If SEC FW support is not enabled (ARMV8_SEC_FIRMWARE_SUPPORT=n) this
> compilation error happens:
> arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h:169:4: error:
> 'CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT' undeclared here (not in a function)
> 
> Fix it by adding an intermediate macro to handle the problem.
> 
> Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
> ---
>  arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h b/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
> index 37e2fe4e66..398bb4eb86 100644
> --- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
> +++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
> @@ -164,9 +164,15 @@ extern int fman_icid_tbl_sz;
>  		QDMA_BASE_ADDR + QMAN_CQSIDR_REG + 4, \
>  		QDMA_BASE_ADDR, QDMA_IS_LE)
>  
> +#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
> +#define SEC_FW_SUPPORT CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
> +#else
> +#define SEC_FW_SUPPORT 0
> +#endif
> +
>  #define SET_SEC_JR_ICID_ENTRY(jr_num, streamid) \
>  	SET_ICID_ENTRY( \
> -		(CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT && \
> +		(SEC_FW_SUPPORT && \
>  		(FSL_SEC_JR##jr_num##_OFFSET ==  \
>  			SEC_JR3_OFFSET + CONFIG_SYS_FSL_SEC_OFFSET) \
>  			? NULL \
> 
How about using CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT) instead of
CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT?

This would also account for CONFIG_SPL_ARMV8_SEC_FIRMWARE_SUPPORT.

Horia

  reply	other threads:[~2019-10-18  6:32 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-17  9:21 [U-Boot] [PATCH 1/6] armv8: fsl-layerscape: guard caam specific defines Laurentiu Tudor
2019-10-17  9:21 ` [U-Boot] [PATCH 2/6] armv8: fsl-layerscape: fix compile error with sec fw disabled Laurentiu Tudor
2019-10-18  6:32   ` Horia Geanta [this message]
2019-10-18  7:25     ` Laurentiu Tudor
2019-10-17  9:21 ` [U-Boot] [PATCH 3/6] armv8: ls2088a: add icid setup for platform devices Laurentiu Tudor
2019-10-18  6:41   ` Horia Geanta
2019-10-17  9:22 ` [U-Boot] [PATCH 4/6] armv8: fsl-layerscape: add missing SATA3 and SATA4 base addresses Laurentiu Tudor
2019-10-18  6:22   ` [U-Boot] [u-boot] " Priyanka Jain
2019-10-17  9:22 ` [U-Boot] [PATCH 5/6] armv8: lx2160a: add icid setup for platform devices Laurentiu Tudor
2019-10-18  6:20   ` [U-Boot] [u-boot] " Priyanka Jain
2019-10-18  7:29     ` Laurentiu Tudor
2019-10-18  8:10   ` [U-Boot] " Horia Geanta
2019-10-17  9:22 ` [U-Boot] [PATCH 6/6] armv8: ls1028a: erratum A050382 workaround Laurentiu Tudor
2019-10-18  6:27   ` Priyanka Jain
2019-10-18  6:07 ` [U-Boot] [PATCH 1/6] armv8: fsl-layerscape: guard caam specific defines Horia Geanta

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=VI1PR0402MB34851971EC52235BE327488A986C0@VI1PR0402MB3485.eurprd04.prod.outlook.com \
    --to=horia.geanta@nxp.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.