global: Move remaining CONFIG_SYS_* to CFG_SYS_*

[pandora-u-boot.git] / board / freescale / common / fsl_validate.c

diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c
index 3424d49..285ed9a 100644 (file)
--- a/board/freescale/common/fsl_validate.c
+++ b/board/freescale/common/fsl_validate.c
@@ -85,7 +85,7 @@ int get_csf_base_addr(u32 *csf_addr, u32 *flash_base_addr)
 {
        struct ccsr_gur __iomem *gur = (void *)(CFG_SYS_MPC85xx_GUTS_ADDR);
        u32 csf_hdr_addr = in_be32(&gur->scratchrw[0]);
-       u32 csf_flash_offset = csf_hdr_addr & ~(CONFIG_SYS_PBI_FLASH_BASE);
+       u32 csf_flash_offset = csf_hdr_addr & ~(CFG_SYS_PBI_FLASH_BASE);
        u32 flash_addr, addr;
        int found = 0;
        int i = 0;
@@ -160,7 +160,7 @@ static int get_ie_info_addr(uintptr_t *ie_addr)
         */
 #if defined(CONFIG_FSL_TRUST_ARCH_v1) && defined(CONFIG_FSL_CORENET)
        sg_tbl = (struct fsl_secboot_sg_table *)
-                (((u32)hdr->psgtable & ~(CONFIG_SYS_PBI_FLASH_BASE)) +
+                (((u32)hdr->psgtable & ~(CFG_SYS_PBI_FLASH_BASE)) +
                  flash_base_addr);
 #else
        sg_tbl = (struct fsl_secboot_sg_table *)(uintptr_t)(csf_addr +
@@ -170,7 +170,7 @@ static int get_ie_info_addr(uintptr_t *ie_addr)
        /* IE Key Table is the first entry in the SG Table */
 #if defined(CONFIG_MPC85xx)
        *ie_addr = (uintptr_t)((sg_tbl->src_addr &
-                       ~(CONFIG_SYS_PBI_FLASH_BASE)) +
+                       ~(CFG_SYS_PBI_FLASH_BASE)) +
                        flash_base_addr);
 #else
        *ie_addr = (uintptr_t)sg_tbl->src_addr;
@@ -203,7 +203,7 @@ static u32 check_srk(struct fsl_secboot_img_priv *img)
 /* This function returns ospr's key_revoc values.*/
 static u32 get_key_revoc(void)
 {
-       struct ccsr_sfp_regs *sfp_regs = (void *)(CONFIG_SYS_SFP_ADDR);
+       struct ccsr_sfp_regs *sfp_regs = (void *)(CFG_SYS_SFP_ADDR);
        return (sfp_in32(&sfp_regs->ospr) & OSPR_KEY_REVOC_MASK) >>
                OSPR_KEY_REVOC_SHIFT;
 }
@@ -342,7 +342,7 @@ static inline u32 get_key_len(struct fsl_secboot_img_priv *img)
  */
 static void fsl_secboot_header_verification_failure(void)
 {
-       struct ccsr_sfp_regs *sfp_regs = (void *)(CONFIG_SYS_SFP_ADDR);
+       struct ccsr_sfp_regs *sfp_regs = (void *)(CFG_SYS_SFP_ADDR);
 
        /* 29th bit of OSPR is ITS */
        u32 its = sfp_in32(&sfp_regs->ospr) >> 2;
@@ -367,7 +367,7 @@ static void fsl_secboot_header_verification_failure(void)
  */
 static void fsl_secboot_image_verification_failure(void)
 {
-       struct ccsr_sfp_regs *sfp_regs = (void *)(CONFIG_SYS_SFP_ADDR);
+       struct ccsr_sfp_regs *sfp_regs = (void *)(CFG_SYS_SFP_ADDR);
 
        u32 its = (sfp_in32(&sfp_regs->ospr) & ITS_MASK) >> ITS_BIT;
 
@@ -871,7 +871,7 @@ static int secboot_init(struct fsl_secboot_img_priv **img_ptr)
 int fsl_secboot_validate(uintptr_t haddr, char *arg_hash_str,
                        uintptr_t *img_addr_ptr)
 {
-       struct ccsr_sfp_regs *sfp_regs = (void *)(CONFIG_SYS_SFP_ADDR);
+       struct ccsr_sfp_regs *sfp_regs = (void *)(CFG_SYS_SFP_ADDR);
        ulong hash[SHA256_BYTES/sizeof(ulong)];
        char hash_str[NUM_HEX_CHARS + 1];
        struct fsl_secboot_img_priv *img;