global: Migrate CONFIG_SYS_FSL* symbols to the CFG_SYS namespace

[platform/kernel/u-boot.git] / arch / arm / cpu / armv8 / fsl-layerscape / icid.c

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/icid.c b/arch/arm/cpu/armv8/fsl-layerscape/icid.c
index 25cd82f..e972603 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/icid.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/icid.c
@@ -27,7 +27,7 @@ static void set_icid(struct icid_id_table *tbl, int size)
 void set_fman_icids(struct fman_icid_id_table *tbl, int size)
 {
        int i;
-       ccsr_fman_t *fm = (void *)CONFIG_SYS_FSL_FM1_ADDR;
+       ccsr_fman_t *fm = (void *)CFG_SYS_FSL_FM1_ADDR;
 
        for (i = 0; i < size; i++) {
                out_be32(&fm->fm_bmi_common.fmbm_ppid[tbl[i].port_id - 1],
@@ -46,6 +46,7 @@ void set_icids(void)
 #endif
 }
 
+#ifndef CONFIG_SPL_BUILD
 int fdt_set_iommu_prop(void *blob, int off, int smmu_ph, u32 *ids, int num_ids)
 {
        int i, ret;
@@ -190,3 +191,4 @@ void fdt_fixup_icid(void *blob)
        fdt_fixup_fman_icids(blob, smmu_ph);
 #endif
 }
+#endif