[U-Boot] armv8: fsl-layerscape: use IS_ENABLED()
diff mbox series

Message ID 20191021173253.1812-1-michael@walle.cc
State Not Applicable
Delegated to: Priyanka Jain
Headers show
Series
  • [U-Boot] armv8: fsl-layerscape: use IS_ENABLED()
Related show

Commit Message

Michael Walle Oct. 21, 2019, 5:32 p.m. UTC
We have to use IS_ENABLED() otherwise the compiler will throw an error
if CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT is not set.

Signed-off-by: Michael Walle <michael@walle.cc>
---
 arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Priyanka Jain Nov. 7, 2019, 5:32 a.m. UTC | #1
>-----Original Message-----
>From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Michael Walle
>Sent: Monday, October 21, 2019 11:03 PM
>To: u-boot@lists.denx.de
>Cc: Tom Rini <trini@konsulko.com>
>Subject: [U-Boot] [PATCH] armv8: fsl-layerscape: use IS_ENABLED()
>
>We have to use IS_ENABLED() otherwise the compiler will throw an error if
>CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT is not set.
>
>Signed-off-by: Michael Walle <michael@walle.cc>
>---
> arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h | 2 +-
> 1 file changed, 1 insertion(+), 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..522c7b89df 100644
>--- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
>+++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
>@@ -166,7 +166,7 @@ extern int fman_icid_tbl_sz;
>
> #define SET_SEC_JR_ICID_ENTRY(jr_num, streamid) \
> 	SET_ICID_ENTRY( \
>-		(CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT && \
>+		(IS_ENABLED(CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT) &&
>\
> 		(FSL_SEC_JR##jr_num##_OFFSET ==  \
> 			SEC_JR3_OFFSET + CONFIG_SYS_FSL_SEC_OFFSET) \
> 			? NULL \
>--
>2.20.1
>
>__
Similar  patch : https://patchwork.ozlabs.org/patch/1179214/ posted before
Changing state to "not applicable"

--priyankajain

Patch
diff mbox series

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..522c7b89df 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
@@ -166,7 +166,7 @@  extern int fman_icid_tbl_sz;
 
 #define SET_SEC_JR_ICID_ENTRY(jr_num, streamid) \
 	SET_ICID_ENTRY( \
-		(CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT && \
+		(IS_ENABLED(CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT) && \
 		(FSL_SEC_JR##jr_num##_OFFSET ==  \
 			SEC_JR3_OFFSET + CONFIG_SYS_FSL_SEC_OFFSET) \
 			? NULL \