]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
fsl-layerscape: fix compile error with sec fw disabled
authorLaurentiu Tudor <laurentiu.tudor@nxp.com>
Fri, 18 Oct 2019 09:01:53 +0000 (09:01 +0000)
committerPriyanka Jain <priyanka.jain@nxp.com>
Fri, 8 Nov 2019 05:43:38 +0000 (11:13 +0530)
If SEC FW support is not enabled (ARMV8_SEC_FIRMWARE_SUPPORT=n), below
compilation error appears
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 wrapping with CONFIG_IS_ENABLED().

Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Reviewed-by: Horia Geanta <horia.geanta@nxp.com>
Signed-off-by: Priyanka Jain <priyanka.jain@nxp.com>
arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h

index 37e2fe4e66cb5db22c08e35c625d3538c9992d9c..3c06a55cb853b913588744ea0b1d4e8079e180b1 100644 (file)
@@ -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 && \
+               (CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT) && \
                (FSL_SEC_JR##jr_num##_OFFSET ==  \
                        SEC_JR3_OFFSET + CONFIG_SYS_FSL_SEC_OFFSET) \
                        ? NULL \