rename CFG_ macros to CONFIG_SYS

[platform/kernel/u-boot.git] / cpu / mpc8xx / video.c

diff --git a/cpu/mpc8xx/video.c b/cpu/mpc8xx/video.c
index ef91165..2e6a22a 100644 (file)
--- a/cpu/mpc8xx/video.c
+++ b/cpu/mpc8xx/video.c
@@ -517,7 +517,7 @@ static void inline video_mode_addentry (VRAM * vr,
 
 static int video_mode_generate (void)
 {
-       immap_t *immap = (immap_t *) CFG_IMMR;
+       immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
        VRAM *vr = (VRAM *) (((void *) immap) + 0xb00); /* Pointer to the VRAM table */
        int DX, X1, X2, DY, Y1, Y2, entry = 0, fifo;
 
@@ -808,7 +808,7 @@ static void video_encoder_init (void)
 
        /* Initialize the I2C */
        debug ("[VIDEO ENCODER] Initializing I2C bus...\n");
-       i2c_init (CFG_I2C_SPEED, CFG_I2C_SLAVE);
+       i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
 
 #ifdef CONFIG_FADS
        /* Reset ADV7176 chip */
@@ -856,7 +856,7 @@ static void video_encoder_init (void)
 
 static void video_ctrl_init (void *memptr)
 {
-       immap_t *immap = (immap_t *) CFG_IMMR;
+       immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
 
        video_fb_address = memptr;
 
@@ -1235,13 +1235,13 @@ static int video_init (void *videobase)
        video_setpalette  (CONSOLE_COLOR_GREY2,   0xF8, 0xF8, 0xF8);
        video_setpalette  (CONSOLE_COLOR_WHITE,   0xFF, 0xFF, 0xFF);
 
-#ifndef CFG_WHITE_ON_BLACK
+#ifndef CONFIG_SYS_WHITE_ON_BLACK
        video_setfgcolor (CONSOLE_COLOR_BLACK);
        video_setbgcolor (CONSOLE_COLOR_GREY2);
 #else
        video_setfgcolor (CONSOLE_COLOR_GREY2);
        video_setbgcolor (CONSOLE_COLOR_BLACK);
-#endif /* CFG_WHITE_ON_BLACK */
+#endif /* CONFIG_SYS_WHITE_ON_BLACK */
 
 #ifdef CONFIG_VIDEO_LOGO
        /* Paint the logo and retrieve tv base address */