Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash

[karo-tx-uboot.git] / board / esd / common / lcd.c

diff --git a/board/esd/common/lcd.c b/board/esd/common/lcd.c
index c23dc81a26616a7dc5af944c927c991c1760d94e..1a5f6565e52a070ed322f780809386a87740e464 100644 (file)
--- a/board/esd/common/lcd.c
+++ b/board/esd/common/lcd.c
@@ -37,7 +37,7 @@ int lcd_depth;
 unsigned char *glob_lcd_reg;
 unsigned char *glob_lcd_mem;
 
-#if defined(CFG_LCD_ENDIAN)
+#if defined(CONFIG_SYS_LCD_ENDIAN)
 void lcd_setup(int lcd, int config)
 {
        if (lcd == 0) {
@@ -47,21 +47,21 @@ void lcd_setup(int lcd, int config)
 
                /* set reset to low */
                out_be32((void*)GPIO0_OR,
-                        in_be32((void*)GPIO0_OR) & ~CFG_LCD0_RST);
+                        in_be32((void*)GPIO0_OR) & ~CONFIG_SYS_LCD0_RST);
                udelay(10); /* wait 10us */
                if (config == 1) {
                        /* big-endian */
                        out_be32((void*)GPIO0_OR,
-                                in_be32((void*)GPIO0_OR) | CFG_LCD_ENDIAN);
+                                in_be32((void*)GPIO0_OR) | CONFIG_SYS_LCD_ENDIAN);
                } else {
                        /* little-endian */
                        out_be32((void*)GPIO0_OR,
-                                in_be32((void*)GPIO0_OR) & ~CFG_LCD_ENDIAN);
+                                in_be32((void*)GPIO0_OR) & ~CONFIG_SYS_LCD_ENDIAN);
                }
                udelay(10); /* wait 10us */
                /* set reset to high */
                out_be32((void*)GPIO0_OR,
-                        in_be32((void*)GPIO0_OR) | CFG_LCD0_RST);
+                        in_be32((void*)GPIO0_OR) | CONFIG_SYS_LCD0_RST);
        } else {
                /*
                 * Set endianess and reset lcd controller 1 (big)
@@ -69,29 +69,29 @@ void lcd_setup(int lcd, int config)
 
                /* set reset to low */
                out_be32((void*)GPIO0_OR,
-                        in_be32((void*)GPIO0_OR) & ~CFG_LCD1_RST);
+                        in_be32((void*)GPIO0_OR) & ~CONFIG_SYS_LCD1_RST);
                udelay(10); /* wait 10us */
                if (config == 1) {
                        /* big-endian */
                        out_be32((void*)GPIO0_OR,
-                                in_be32((void*)GPIO0_OR) | CFG_LCD_ENDIAN);
+                                in_be32((void*)GPIO0_OR) | CONFIG_SYS_LCD_ENDIAN);
                } else {
                        /* little-endian */
                        out_be32((void*)GPIO0_OR,
-                                in_be32((void*)GPIO0_OR) & ~CFG_LCD_ENDIAN);
+                                in_be32((void*)GPIO0_OR) & ~CONFIG_SYS_LCD_ENDIAN);
                }
                udelay(10); /* wait 10us */
                /* set reset to high */
                out_be32((void*)GPIO0_OR,
-                        in_be32((void*)GPIO0_OR) | CFG_LCD1_RST);
+                        in_be32((void*)GPIO0_OR) | CONFIG_SYS_LCD1_RST);
        }
 
        /*
-        * CFG_LCD_ENDIAN may also be FPGA_RESET, so set inactive
+        * CONFIG_SYS_LCD_ENDIAN may also be FPGA_RESET, so set inactive
         */
-       out_be32((void*)GPIO0_OR, in_be32((void*)GPIO0_OR) | CFG_LCD_ENDIAN);
+       out_be32((void*)GPIO0_OR, in_be32((void*)GPIO0_OR) | CONFIG_SYS_LCD_ENDIAN);
 }
-#endif /* CFG_LCD_ENDIAN */
+#endif /* CONFIG_SYS_LCD_ENDIAN */
 
 
 int lcd_bmp(uchar *logo_bmp)
@@ -116,20 +116,20 @@ int lcd_bmp(uchar *logo_bmp)
                /*
                 * Decompress bmp image
                 */
-               len = CFG_VIDEO_LOGO_MAX_SIZE;
-               dst = malloc(CFG_VIDEO_LOGO_MAX_SIZE);
+               len = CONFIG_SYS_VIDEO_LOGO_MAX_SIZE;
+               dst = malloc(CONFIG_SYS_VIDEO_LOGO_MAX_SIZE);
                if (dst == NULL) {
                        printf("Error: malloc for gunzip failed!\n");
                        return 1;
                }
-               if (gunzip(dst, CFG_VIDEO_LOGO_MAX_SIZE,
+               if (gunzip(dst, CONFIG_SYS_VIDEO_LOGO_MAX_SIZE,
                           (uchar *)logo_bmp, &len) != 0) {
                        free(dst);
                        return 1;
                }
-               if (len == CFG_VIDEO_LOGO_MAX_SIZE) {
+               if (len == CONFIG_SYS_VIDEO_LOGO_MAX_SIZE) {
                        printf("Image could be truncated"
-                              " (increase CFG_VIDEO_LOGO_MAX_SIZE)!\n");
+                              " (increase CONFIG_SYS_VIDEO_LOGO_MAX_SIZE)!\n");
                }
 
                /*
@@ -260,7 +260,7 @@ int lcd_init(uchar *lcd_reg, uchar *lcd_mem, S1D_REGS *regs, int reg_count,
                /*
                 * Big epson detected
                 */
-               reg_byte_swap = FALSE;
+               reg_byte_swap = false;
                palette_index = 0x1e2;
                palette_value = 0x1e4;
                lcd_depth = 16;
@@ -269,7 +269,7 @@ int lcd_init(uchar *lcd_reg, uchar *lcd_mem, S1D_REGS *regs, int reg_count,
                /*
                 * Big epson detected (with register swap bug)
                 */
-               reg_byte_swap = TRUE;
+               reg_byte_swap = true;
                palette_index = 0x1e3;
                palette_value = 0x1e5;
                lcd_depth = 16;
@@ -278,7 +278,7 @@ int lcd_init(uchar *lcd_reg, uchar *lcd_mem, S1D_REGS *regs, int reg_count,
                /*
                 * Small epson detected (704)
                 */
-               reg_byte_swap = FALSE;
+               reg_byte_swap = false;
                palette_index = 0x15;
                palette_value = 0x17;
                lcd_depth = 8;
@@ -287,7 +287,7 @@ int lcd_init(uchar *lcd_reg, uchar *lcd_mem, S1D_REGS *regs, int reg_count,
                /*
                 * Small epson detected (705)
                 */
-               reg_byte_swap = FALSE;
+               reg_byte_swap = false;
                palette_index = 0x15;
                palette_value = 0x17;
                lcd_depth = 8;
@@ -300,7 +300,7 @@ int lcd_init(uchar *lcd_reg, uchar *lcd_mem, S1D_REGS *regs, int reg_count,
                        /*
                         * S1D13505 detected
                         */
-                       reg_byte_swap = TRUE;
+                       reg_byte_swap = true;
                        palette_index = 0x25;
                        palette_value = 0x27;
                        lcd_depth = 16;
@@ -339,16 +339,14 @@ int lcd_init(uchar *lcd_reg, uchar *lcd_mem, S1D_REGS *regs, int reg_count,
        return lcd_bmp(logo_bmp);
 }
 
-int do_esdbmp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_esdbmp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        ulong addr;
 #ifdef CONFIG_VIDEO_SM501
        char *str;
 #endif
-       if (argc != 2) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
-               return 1;
-       }
+       if (argc != 2)
+               return cmd_usage(cmdtp);
 
        addr = simple_strtoul(argv[1], NULL, 16);
 
@@ -372,6 +370,6 @@ int do_esdbmp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        esdbmp, 2,      1,      do_esdbmp,
-       "esdbmp   - display BMP image\n",
-       "<imageAddr> - display image\n"
+       "display BMP image",
+       "<imageAddr> - display image"
 );