global: Migrate CONFIG_SYS_FSL* symbols to the CFG_SYS namespace

[platform/kernel/u-boot.git] / arch / arm / include / asm / arch-fsl-layerscape / fsl_icid.h

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 37e2fe4..9cddb41 100644 (file)
--- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
@@ -12,11 +12,15 @@
 #include <asm/armv8/sec_firmware.h>
 
 struct icid_id_table {
+#ifndef CONFIG_SPL_BUILD
        const char *compat;
-       u32 id;
-       u32 reg;
        phys_addr_t compat_addr;
+#endif
        phys_addr_t reg_addr;
+       u32 reg;
+#ifndef CONFIG_SPL_BUILD
+       u32 id;
+#endif
        bool le;
 };
 
@@ -31,6 +35,13 @@ int fdt_set_iommu_prop(void *blob, int off, int smmu_ph, u32 *ids, int num_ids);
 void set_icids(void);
 void fdt_fixup_icid(void *blob);
 
+#ifdef CONFIG_SPL_BUILD
+#define SET_ICID_ENTRY(name, idA, regA, addr, compataddr, _le) \
+       { .reg = regA, \
+         .reg_addr = addr, \
+         .le = _le \
+       }
+#else
 #define SET_ICID_ENTRY(name, idA, regA, addr, compataddr, _le) \
        { .compat = name, \
          .id = idA, \
@@ -39,6 +50,7 @@ void fdt_fixup_icid(void *blob);
          .reg_addr = addr, \
          .le = _le \
        }
+#endif
 
 #ifdef CONFIG_SYS_FSL_SEC_LE
 #define SEC_IS_LE true
@@ -58,7 +70,7 @@ void fdt_fixup_icid(void *blob);
 
 #define SET_SCFG_ICID(compat, streamid, name, compataddr) \
        SET_ICID_ENTRY(compat, streamid, (((streamid) << 24) | (1 << 23)), \
-               offsetof(struct ccsr_scfg, name) + CONFIG_SYS_FSL_SCFG_ADDR, \
+               offsetof(struct ccsr_scfg, name) + CFG_SYS_FSL_SCFG_ADDR, \
                compataddr, SCFG_IS_LE)
 
 #define SET_USB_ICID(usb_num, compat, streamid) \
@@ -71,7 +83,7 @@ void fdt_fixup_icid(void *blob);
 
 #define SET_SDHC_ICID(streamid) \
        SET_SCFG_ICID("fsl,esdhc", streamid, sdhc_icid,\
-               CONFIG_SYS_FSL_ESDHC_ADDR)
+               CFG_SYS_FSL_ESDHC_ADDR)
 
 #define SET_EDMA_ICID(streamid) \
        SET_SCFG_ICID("fsl,vf610-edma", streamid, edma_icid,\
@@ -90,14 +102,14 @@ void fdt_fixup_icid(void *blob);
 #define SET_QMAN_ICID(streamid) \
        SET_ICID_ENTRY("fsl,qman", streamid, streamid, \
                offsetof(struct ccsr_qman, liodnr) + \
-               CONFIG_SYS_FSL_QMAN_ADDR, \
-               CONFIG_SYS_FSL_QMAN_ADDR, false)
+               CFG_SYS_FSL_QMAN_ADDR, \
+               CFG_SYS_FSL_QMAN_ADDR, false)
 
 #define SET_BMAN_ICID(streamid) \
        SET_ICID_ENTRY("fsl,bman", streamid, streamid, \
                offsetof(struct ccsr_bman, liodnr) + \
-               CONFIG_SYS_FSL_BMAN_ADDR, \
-               CONFIG_SYS_FSL_BMAN_ADDR, false)
+               CFG_SYS_FSL_BMAN_ADDR, \
+               CFG_SYS_FSL_BMAN_ADDR, false)
 
 #define SET_FMAN_ICID_ENTRY(_port_id, streamid) \
        { .port_id = (_port_id), .icid = (streamid) }
@@ -107,8 +119,8 @@ void fdt_fixup_icid(void *blob);
 #define SET_SEC_QI_ICID(streamid) \
        SET_ICID_ENTRY("fsl,sec-v4.0", streamid, \
                0, offsetof(ccsr_sec_t, qilcr_ls) + \
-               CONFIG_SYS_FSL_SEC_ADDR, \
-               CONFIG_SYS_FSL_SEC_ADDR, SEC_IS_LE)
+               CFG_SYS_FSL_SEC_ADDR, \
+               CFG_SYS_FSL_SEC_ADDR, SEC_IS_LE)
 
 extern struct fman_icid_id_table fman_icid_tbl[];
 extern int fman_icid_tbl_sz;
@@ -125,7 +137,7 @@ extern int fman_icid_tbl_sz;
 
 #define SET_GUR_ICID(compat, streamid, name, compataddr) \
        SET_ICID_ENTRY(compat, streamid, streamid, \
-               offsetof(struct ccsr_gur, name) + CONFIG_SYS_FSL_GUTS_ADDR, \
+               offsetof(struct ccsr_gur, name) + CFG_SYS_FSL_GUTS_ADDR, \
                compataddr, GUR_IS_LE)
 
 #define SET_USB_ICID(usb_num, compat, streamid) \
@@ -166,26 +178,26 @@ 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) \
+                       SEC_JR3_OFFSET + CFG_SYS_FSL_SEC_OFFSET) \
                        ? NULL \
                        : "fsl,sec-v4.0-job-ring"), \
                streamid, \
                SEC_ICID_REG_VAL(streamid), \
                offsetof(ccsr_sec_t, jrliodnr[jr_num].ls) + \
-               CONFIG_SYS_FSL_SEC_ADDR, \
+               CFG_SYS_FSL_SEC_ADDR, \
                FSL_SEC_JR##jr_num##_BASE_ADDR, SEC_IS_LE)
 
 #define SET_SEC_DECO_ICID_ENTRY(deco_num, streamid) \
        SET_ICID_ENTRY(NULL, streamid, SEC_ICID_REG_VAL(streamid), \
                offsetof(ccsr_sec_t, decoliodnr[deco_num].ls) + \
-               CONFIG_SYS_FSL_SEC_ADDR, 0, SEC_IS_LE)
+               CFG_SYS_FSL_SEC_ADDR, 0, SEC_IS_LE)
 
 #define SET_SEC_RTIC_ICID_ENTRY(rtic_num, streamid) \
        SET_ICID_ENTRY(NULL, streamid, SEC_ICID_REG_VAL(streamid), \
                offsetof(ccsr_sec_t, rticliodnr[rtic_num].ls) + \
-               CONFIG_SYS_FSL_SEC_ADDR, 0, SEC_IS_LE)
+               CFG_SYS_FSL_SEC_ADDR, 0, SEC_IS_LE)
 
 extern struct icid_id_table icid_tbl[];
 extern int icid_tbl_sz;