X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=drivers%2Fmisc%2Ffsl_portals.c;h=30a9409e5ab294e6424675d757e254d1282d1c8e;hb=6cc04547cb3bbd3a3d78947f200acbae19e3c67f;hp=59df57a9acc7f1cb337d42aa1ec77a4c5ac84ec7;hpb=5155207ae1a0797a99c0a5f4e99741960ff04697;p=platform%2Fkernel%2Fu-boot.git

diff --git a/drivers/misc/fsl_portals.c b/drivers/misc/fsl_portals.c
index 59df57a..30a9409 100644
--- a/drivers/misc/fsl_portals.c
+++ b/drivers/misc/fsl_portals.c
@@ -28,7 +28,7 @@ void setup_qbman_portals(void)
 				CONFIG_SYS_BMAN_SWP_ISDR_REG;
 	void __iomem *qpaddr = (void *)CONFIG_SYS_QMAN_CINH_BASE +
 				CONFIG_SYS_QMAN_SWP_ISDR_REG;
-	struct ccsr_qman *qman = (void *)CONFIG_SYS_FSL_QMAN_ADDR;
+	struct ccsr_qman *qman = (void *)CFG_SYS_FSL_QMAN_ADDR;
 
 	/* Set the Qman initiator BAR to match the LAW (for DQRR stashing) */
 #ifdef CONFIG_PHYS_64BIT
@@ -159,7 +159,7 @@ static int fdt_qportal(void *blob, int off, int id, char *name,
 			if (!strncmp(name, "pme", 3)) {
 				u32 pme_rev1, pme_rev2;
 				ccsr_pme_t *pme_regs =
-					(void *)CONFIG_SYS_FSL_CORENET_PME_ADDR;
+					(void *)CFG_SYS_FSL_CORENET_PME_ADDR;
 
 				pme_rev1 = in_be32(&pme_regs->pm_ip_rev_1);
 				pme_rev2 = in_be32(&pme_regs->pm_ip_rev_2);
@@ -190,7 +190,7 @@ void fdt_fixup_qportals(void *blob)
 	int off, err;
 	unsigned int maj, min;
 	unsigned int ip_cfg;
-	struct ccsr_qman *qman = (void *)CONFIG_SYS_FSL_QMAN_ADDR;
+	struct ccsr_qman *qman = (void *)CFG_SYS_FSL_QMAN_ADDR;
 	u32 rev_1 = in_be32(&qman->ip_rev_1);
 	u32 rev_2 = in_be32(&qman->ip_rev_2);
 	char compat[64];
@@ -302,7 +302,7 @@ void fdt_fixup_bportals(void *blob)
 	int off, err;
 	unsigned int maj, min;
 	unsigned int ip_cfg;
-	struct ccsr_bman *bman = (void *)CONFIG_SYS_FSL_BMAN_ADDR;
+	struct ccsr_bman *bman = (void *)CFG_SYS_FSL_BMAN_ADDR;
 	u32 rev_1 = in_be32(&bman->ip_rev_1);
 	u32 rev_2 = in_be32(&bman->ip_rev_2);
 	char compat[64];