Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

[u-boot] / board / freescale / mpc8610hpcd / mpc8610hpcd_diu.c

diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
index 4db941ced00a12bf7d24b2eea7a2140ac7bcefa9..4186a2ecdadf59aceac44da1020d597266683e89 100644 (file)
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
@@ -33,7 +33,7 @@
 #include "../common/fsl_diu_fb.h"
 
 #if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)
-#include <devices.h>
+#include <stdio_dev.h>
 #include <video_fb.h>
 #endif
 
@@ -43,7 +43,7 @@ static int xres, yres;
 
 void diu_set_pixel_clock(unsigned int pixclock)
 {
-       volatile immap_t *immap = (immap_t *)CFG_IMMR;
+       volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
        volatile ccsr_gur_t *gur = &immap->im_gur;
        volatile unsigned int *guts_clkdvdr = &gur->clkdvdr;
        unsigned long speed_ccb, temp, pixval;
@@ -69,9 +69,10 @@ void mpc8610hpcd_diu_init(void)
        unsigned int pixel_format;
        unsigned char tmp_val;
        unsigned char pixis_arch;
+       u8 *pixis_base = (u8 *)PIXIS_BASE;
 
-       tmp_val = in8(PIXIS_BASE + PIXIS_BRDCFG0);
-       pixis_arch = in8(PIXIS_BASE + PIXIS_VER);
+       tmp_val = in_8(pixis_base + PIXIS_BRDCFG0);
+       pixis_arch = in_8(pixis_base + PIXIS_VER);
 
        monitor_port = getenv("monitor");
        if (!strncmp(monitor_port, "0", 1)) {   /* 0 - DVI */
@@ -82,28 +83,28 @@ void mpc8610hpcd_diu_init(void)
                else
                        pixel_format = 0x88883316;
                gamma_fix = 0;
-               out8(PIXIS_BASE + PIXIS_BRDCFG0, tmp_val | 0x08);
+               out_8(pixis_base + PIXIS_BRDCFG0, tmp_val | 0x08);
 
        } else if (!strncmp(monitor_port, "1", 1)) { /* 1 - Single link LVDS */
                xres = 1024;
                yres = 768;
                pixel_format = 0x88883316;
                gamma_fix = 0;
-               out8(PIXIS_BASE + PIXIS_BRDCFG0, (tmp_val & 0xf7) | 0x10);
+               out_8(pixis_base + PIXIS_BRDCFG0, (tmp_val & 0xf7) | 0x10);
 
        } else if (!strncmp(monitor_port, "2", 1)) { /* 2 - Double link LVDS */
                xres = 1280;
                yres = 1024;
                pixel_format = 0x88883316;
                gamma_fix = 1;
-               out8(PIXIS_BASE + PIXIS_BRDCFG0, tmp_val & 0xe7);
+               out_8(pixis_base + PIXIS_BRDCFG0, tmp_val & 0xe7);
 
        } else {        /* DVI */
                xres = 1280;
                yres = 1024;
                pixel_format = 0x88882317;
                gamma_fix = 0;
-               out8(PIXIS_BASE + PIXIS_BRDCFG0, tmp_val | 0x08);
+               out_8(pixis_base + PIXIS_BRDCFG0, tmp_val | 0x08);
        }
 
        fsl_diu_init(xres, pixel_format, gamma_fix,
@@ -116,7 +117,7 @@ int mpc8610diu_init_show_bmp(cmd_tbl_t *cmdtp,
        unsigned int addr;
 
        if (argc < 2) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -137,11 +138,11 @@ int mpc8610diu_init_show_bmp(cmd_tbl_t *cmdtp,
 }
 
 U_BOOT_CMD(
-       diufb, CFG_MAXARGS, 1, mpc8610diu_init_show_bmp,
-       "diufb init | addr - Init or Display BMP file\n",
+       diufb, CONFIG_SYS_MAXARGS, 1, mpc8610diu_init_show_bmp,
+       "Init or Display BMP file",
        "init\n    - initialize DIU\n"
-       "addr\n    - display bmp at address 'addr'\n"
-       );
+       "addr\n    - display bmp at address 'addr'"
+);
 
 
 #if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)