Skip to contentSkip to conversation

armv8: fsl-layerscape: use IS_ENABLED()

PATCH New Michael Walle 2 participants 2 messages Oct 21, 2019 – Nov 7, 2019 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h +1 -1
index 37e2fe4e66..522c7b89df 100644
@@ -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 \
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 armv8: fsl-layerscape: use IS_ENABLED()

Quoted 32 lines

-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Michael Walle
Sent: Monday, October 21, 2019 11:03 PM
To: u-boot at lists.denx.de
Cc: Tom Rini <[email protected]>
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.

---
arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h +1 -1
index 37e2fe4e66..522c7b89df 100644
@@ -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 \
Quoted 4 lines

--
2.20.1

__

Similar patch : https://patchwork.ozlabs.org/patch/1179214/ posted before Changing state to "not applicable"

--priyankajain