3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/crypto/fsl/jobdesc.c b/drivers/crypto/fsl/jobdesc.c
index 542b1652d8..d32c1fe5c3 100644
--- a/drivers/crypto/fsl/jobdesc.c
+++ b/drivers/crypto/fsl/jobdesc.c
@@ -28,7 +28,7 @@ uint32_t secmem_set_cmd(uint32_t sec_mem_cmd)
 {
 	uint32_t temp_reg;
 
-	ccsr_sec_t *sec = (void *)CONFIG_SYS_FSL_SEC_ADDR;
+	ccsr_sec_t *sec = (void *)CFG_SYS_FSL_SEC_ADDR;
 	uint32_t sm_vid = SM_VERSION(sec_in32(&sec->smvid));
 	uint32_t jr_id = 0;
 
@@ -58,7 +58,7 @@ int caam_page_alloc(uint8_t page_num, uint8_t partition_num)
 {
 	uint32_t temp_reg;
 
-	ccsr_sec_t *sec = (void *)CONFIG_SYS_FSL_SEC_ADDR;
+	ccsr_sec_t *sec = (void *)CFG_SYS_FSL_SEC_ADDR;
 	uint32_t sm_vid = SM_VERSION(sec_in32(&sec->smvid));
 	uint32_t jr_id = 0;
 
@@ -116,7 +116,7 @@ int caam_page_alloc(uint8_t page_num, uint8_t partition_num)
 int inline_cnstr_jobdesc_blob_dek(uint32_t *desc, const uint8_t *plain_txt,
 				       uint8_t *dek_blob, uint32_t in_sz)
 {
-	ccsr_sec_t *sec = (void *)CONFIG_SYS_FSL_SEC_ADDR;
+	ccsr_sec_t *sec = (void *)CFG_SYS_FSL_SEC_ADDR;
 	uint32_t sm_vid = SM_VERSION(sec_in32(&sec->smvid));
 	uint32_t jr_id = 0;
 
diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c
index 8c0fb27b53..ee822edd6c 100644
--- a/drivers/crypto/fsl/jr.c
+++ b/drivers/crypto/fsl/jr.c
@@ -33,8 +33,8 @@
 uint32_t sec_offset[CONFIG_SYS_FSL_MAX_NUM_OF_SEC] = {
 	0,
 #if defined(CONFIG_ARCH_C29X)
-	CONFIG_SYS_FSL_SEC_IDX_OFFSET,
-	2 * CONFIG_SYS_FSL_SEC_IDX_OFFSET
+	CFG_SYS_FSL_SEC_IDX_OFFSET,
+	2 * CFG_SYS_FSL_SEC_IDX_OFFSET
 #endif
 };
 
@@ -42,11 +42,11 @@ uint32_t sec_offset[CONFIG_SYS_FSL_MAX_NUM_OF_SEC] = {
 struct udevice *caam_dev;
 #else
 #define SEC_ADDR(idx)	\
-	(ulong)((CONFIG_SYS_FSL_SEC_ADDR + sec_offset[idx]))
+	(ulong)((CFG_SYS_FSL_SEC_ADDR + sec_offset[idx]))
 
 #define SEC_JR0_ADDR(idx)	\
 	(ulong)(SEC_ADDR(idx) +	\
-	 (CONFIG_SYS_FSL_JR0_OFFSET - CONFIG_SYS_FSL_SEC_OFFSET))
+	 (CFG_SYS_FSL_JR0_OFFSET - CFG_SYS_FSL_SEC_OFFSET))
 struct caam_regs caam_st;
 #endif
 
diff --git a/drivers/crypto/fsl/sec.c b/drivers/crypto/fsl/sec.c
index f0a4a63d88..9de30a6112 100644
--- a/drivers/crypto/fsl/sec.c
+++ b/drivers/crypto/fsl/sec.c
@@ -128,7 +128,7 @@ u8 caam_get_era(void)
 		{0x0A1C, 1, 5}
 	};
 
-	ccsr_sec_t __iomem *sec = (void __iomem *)CONFIG_SYS_FSL_SEC_ADDR;
+	ccsr_sec_t __iomem *sec = (void __iomem *)CFG_SYS_FSL_SEC_ADDR;
 	u32 secvid_ms = sec_in32(&sec->secvid_ms);
 	u32 ccbvid = sec_in32(&sec->ccbvid);
 	u16 ip_id = (secvid_ms & SEC_SECVID_MS_IPID_MASK) >>