rename CFG_ macros to CONFIG_SYS

[karo-tx-uboot.git] / cpu / ppc4xx / 40x_spd_sdram.c

diff --git a/cpu/ppc4xx/40x_spd_sdram.c b/cpu/ppc4xx/40x_spd_sdram.c
index 42fd7fb872f91c97f7823ecaf44f4423fda78e14..57861b3595a6d50a50102e9388e93bb9fe08ce4e 100644 (file)
--- a/cpu/ppc4xx/40x_spd_sdram.c
+++ b/cpu/ppc4xx/40x_spd_sdram.c
@@ -52,12 +52,12 @@
 /*
  * Set default values
  */
-#ifndef CFG_I2C_SPEED
-#define CFG_I2C_SPEED  50000
+#ifndef CONFIG_SYS_I2C_SPEED
+#define CONFIG_SYS_I2C_SPEED   50000
 #endif
 
-#ifndef CFG_I2C_SLAVE
-#define CFG_I2C_SLAVE  0xFE
+#ifndef CONFIG_SYS_I2C_SLAVE
+#define CONFIG_SYS_I2C_SLAVE   0xFE
 #endif
 
 #define ONE_BILLION    1000000000
@@ -126,9 +126,9 @@ long int spd_sdram(int(read_spd)(uint addr))
 
        int sdram0_pmit=0x07c00000;
 #ifndef CONFIG_405EP /* not on PPC405EP */
-       int sdram0_besr0=-1;
-       int sdram0_besr1=-1;
-       int sdram0_eccesr=-1;
+       int sdram0_besr0 = -1;
+       int sdram0_besr1 = -1;
+       int sdram0_eccesr = -1;
 #endif
        int sdram0_ecccfg;
 
@@ -163,7 +163,7 @@ long int spd_sdram(int(read_spd)(uint addr))
                 * Make sure I2C controller is initialized
                 * before continuing.
                 */
-               i2c_init(CFG_I2C_SPEED, CFG_I2C_SLAVE);
+               i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
        }
 
        /* Make shure we are using SDRAM */