* Fix startup problems with VFD display on TRABLABEL_2002_12_03_2230

* Patch by Pierre Aubert, 20 Nov 2002
  Add driver for Epson SED13806 graphic controller.
  Add support for BMP logos in cfb_console driver.

3 files changed, 407 insertions, 58 deletions

diff --git a/drivers/Makefile b/drivers/Makefile
index 3d3bbcef96c..afea752246e 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -31,7 +31,7 @@ OBJS	= 3c589.o 5701rls.o bcm570x.o bcm570x_autoneg.o \
 	  cfb_console.o cs8900.o dc2114x.o eepro100.o \
 	  i8042.o natsemi.o ns16550.o ns8382x.o ns87308.o \
 	  pci.o pci_auto.o pci_indirect.o \
-	  pcnet.o serial.o \
+	  pcnet.o sed13806.o serial.o \
 	  smc91111.o smiLynxEM.o sym53c8xx.o \
 	  tigon3.o w83c553f.o ct69000.o
 
diff --git a/drivers/cfb_console.c b/drivers/cfb_console.c
index ee2fa9c8453..d428b174eca 100644
--- a/drivers/cfb_console.c
+++ b/drivers/cfb_console.c
@@ -65,6 +65,7 @@
  CONFIG_CONSOLE_TIME         - display time/date in upper right corner,
                                needs CFG_CMD_DATE and CONFIG_CONSOLE_CURSOR
  CONFIG_VIDEO_LOGO           - display Linux Logo in upper left corner
+ CONFIG_VIDEO_BMP_LOGO       - use bmp_logo instead of linux_logo
  CONFIG_CONSOLE_EXTRA_INFO   - display additional board information strings
                                that normaly goes to serial port. This define
                                requires a board specific function:
@@ -93,6 +94,8 @@ CONFIG_VIDEO_HW_CURSOR:      - Uses the hardware cursor capability of the
 
 #ifdef CONFIG_CFB_CONSOLE
 
+#include <malloc.h>
+
 /*****************************************************************************/
 /* Console device defines with SMI graphic                                   */
 /* Any other graphic must change this section                                */
@@ -116,6 +119,16 @@ CONFIG_VIDEO_HW_CURSOR:      - Uses the hardware cursor capability of the
 #endif
 
 /*****************************************************************************/
+/* Defines for the SED13806 driver                                           */
+/*****************************************************************************/
+#ifdef CONFIG_VIDEO_SED13806
+
+#define VIDEO_FB_LITTLE_ENDIAN
+#define VIDEO_HW_RECTFILL
+#define VIDEO_HW_BITBLT
+#endif
+
+/*****************************************************************************/
 /* Include video_fb.h after definitions of VIDEO_HW_RECTFILL etc             */
 /*****************************************************************************/
 #include <video_fb.h>
@@ -217,6 +230,14 @@ void    console_cursor (int state);
 #endif  /* CONFIG_VIDEO_HW_CURSOR */
 
 #ifdef  CONFIG_VIDEO_LOGO
+#ifdef  CONFIG_VIDEO_BMP_LOGO
+#include <bmp_logo.h>
+#define VIDEO_LOGO_WIDTH        BMP_LOGO_WIDTH
+#define VIDEO_LOGO_HEIGHT       BMP_LOGO_HEIGHT
+#define VIDEO_LOGO_LUT_OFFSET   BMP_LOGO_OFFSET
+#define VIDEO_LOGO_COLORS       BMP_LOGO_COLORS
+
+#else   /* CONFIG_VIDEO_BMP_LOGO */
 #define LINUX_LOGO_WIDTH        80
 #define LINUX_LOGO_HEIGHT       80
 #define LINUX_LOGO_COLORS       214
@@ -225,13 +246,15 @@ void    console_cursor (int state);
 #include <linux_logo.h>
 #define VIDEO_LOGO_WIDTH        LINUX_LOGO_WIDTH
 #define VIDEO_LOGO_HEIGHT       LINUX_LOGO_HEIGHT
-
+#define VIDEO_LOGO_LUT_OFFSET   LINUX_LOGO_LUT_OFFSET
+#define VIDEO_LOGO_COLORS       LINUX_LOGO_COLORS
+#endif  /* CONFIG_VIDEO_BMP_LOGO */
 #define VIDEO_INFO_X            (VIDEO_LOGO_WIDTH)
 #define VIDEO_INFO_Y            (VIDEO_FONT_HEIGHT/2)
-#else
+#else   /* CONFIG_VIDEO_LOGO */
 #define VIDEO_LOGO_WIDTH        0
 #define VIDEO_LOGO_HEIGHT       0
-#endif
+#endif  /* CONFIG_VIDEO_LOGO */
 
 #define VIDEO_COLS              VIDEO_VISIBLE_COLS
 #define VIDEO_ROWS              VIDEO_VISIBLE_ROWS
@@ -463,11 +486,7 @@ static inline void video_drawstring(int xx, int yy, unsigned char *s)
 
 static void video_putchar(int xx, int yy, unsigned char c)
 {
-#ifdef CONFIG_VIDEO_LOGO
     video_drawchars (xx, yy + VIDEO_LOGO_HEIGHT, &c, 1);
-#else
-    video_drawchars (xx, yy, &c, 1);
-#endif
 }
 
 /*****************************************************************************/
@@ -676,83 +695,107 @@ void video_puts (const char *s)
 #ifdef CONFIG_VIDEO_LOGO
 void logo_plot (void *screen, int width, int x, int y)
 {
-    int skip = (width - LINUX_LOGO_WIDTH) * VIDEO_PIXEL_SIZE,
+
+    int skip = (width - VIDEO_LOGO_WIDTH) * VIDEO_PIXEL_SIZE,
         xcount, i,
-        ycount = LINUX_LOGO_HEIGHT;
+        ycount = VIDEO_LOGO_HEIGHT;
     unsigned char
-        *source = linux_logo,
+        *source,
         *dest   = (unsigned char *) screen + ((y * width * VIDEO_PIXEL_SIZE) + x),
-        r, g, b;
-
+        r, g, b, *logo_red, *logo_blue, *logo_green;
+
+#ifdef CONFIG_VIDEO_BMP_LOGO
+    source = bmp_logo_bitmap;
+    
+    /* Allocate temporary space for computing colormap                       */
+    logo_red = malloc (BMP_LOGO_COLORS);
+    logo_green = malloc (BMP_LOGO_COLORS);
+    logo_blue = malloc (BMP_LOGO_COLORS);
+    /* Compute color map                                                     */
+    for (i = 0; i < VIDEO_LOGO_COLORS; i++) {
+        logo_red [i] = (bmp_logo_palette [i] & 0x0f00) >> 4;
+        logo_green [i] = (bmp_logo_palette [i] & 0x00f0);
+        logo_blue [i] = (bmp_logo_palette [i] & 0x000f) << 4;
+    }
+#else
+    source = linux_logo;
+    logo_red = linux_logo_red;
+    logo_green = linux_logo_green;
+    logo_blue = linux_logo_blue;
+#endif
+    
     if (VIDEO_DATA_FORMAT == GDF__8BIT_INDEX)
     {
-        for (i = 0; i < LINUX_LOGO_COLORS; i++)
+        for (i = 0; i < VIDEO_LOGO_COLORS; i++)
         {
-            r = (unsigned char)linux_logo_red  [i];
-            g = (unsigned char)linux_logo_green[i];
-            b = (unsigned char)linux_logo_blue [i];
-            video_set_lut (LINUX_LOGO_LUT_OFFSET + i, r, g, b);
+            video_set_lut (i + VIDEO_LOGO_LUT_OFFSET,
+                           logo_red [i], logo_green [i], logo_blue [i]);
         }
     }
 
     while (ycount--)
     {
-    xcount = LINUX_LOGO_WIDTH;
-    while (xcount--)
-    {
-        r = (unsigned char)linux_logo_red  [*source - LINUX_LOGO_LUT_OFFSET];
-        g = (unsigned char)linux_logo_green[*source - LINUX_LOGO_LUT_OFFSET];
-        b = (unsigned char)linux_logo_blue [*source - LINUX_LOGO_LUT_OFFSET];
-
-        switch (VIDEO_DATA_FORMAT)
+        xcount = VIDEO_LOGO_WIDTH;
+        while (xcount--)
         {
-        case GDF__8BIT_INDEX:
-            *dest = *source;
-            break;
-        case GDF__8BIT_332RGB:
-            *dest = ((r>>5)<<5) | ((g>>5)<<2) | (b>>6);
-            break;
-        case GDF_15BIT_555RGB:
-            *(unsigned short *)dest =
-            SWAP16((unsigned short)(((r>>3)<<10) | ((g>>3)<<5) | (b>>3)));
-            break;
-        case GDF_16BIT_565RGB:
-            *(unsigned short *)dest =
-            SWAP16((unsigned short)(((r>>3)<<11) | ((g>>2)<<5) | (b>>3)));
-            break;
-        case GDF_32BIT_X888RGB:
-            *(unsigned long  *)dest =
-            SWAP32((unsigned long)((r<<16) | (g<<8) | b));
-            break;
-        case GDF_24BIT_888RGB:
+            r = logo_red [*source - VIDEO_LOGO_LUT_OFFSET];
+            g = logo_green [*source - VIDEO_LOGO_LUT_OFFSET];
+            b = logo_blue [*source - VIDEO_LOGO_LUT_OFFSET];
+            
+            switch (VIDEO_DATA_FORMAT)
+            {
+            case GDF__8BIT_INDEX:
+                *dest = *source;
+                break;
+            case GDF__8BIT_332RGB:
+                *dest = ((r>>5)<<5) | ((g>>5)<<2) | (b>>6);
+                break;
+            case GDF_15BIT_555RGB:
+                *(unsigned short *)dest =
+                    SWAP16((unsigned short)(((r>>3)<<10) | ((g>>3)<<5) | (b>>3)));
+                break;
+            case GDF_16BIT_565RGB:
+                *(unsigned short *)dest =
+                    SWAP16((unsigned short)(((r>>3)<<11) | ((g>>2)<<5) | (b>>3)));
+                break;
+            case GDF_32BIT_X888RGB:
+                *(unsigned long  *)dest =
+                    SWAP32((unsigned long)((r<<16) | (g<<8) | b));
+                break;
+            case GDF_24BIT_888RGB:
 #ifdef VIDEO_FB_LITTLE_ENDIAN
-            dest[0] = b;
-            dest[1] = g;
-            dest[2] = r;
+                dest[0] = b;
+                dest[1] = g;
+                dest[2] = r;
 #else
-            dest[0] = r;
-            dest[1] = g;
-            dest[2] = b;
+                dest[0] = r;
+                dest[1] = g;
+                dest[2] = b;
 #endif
-            break;
+                break;
+            }
+            source++;
+            dest += VIDEO_PIXEL_SIZE;
         }
-        source++;
-        dest += VIDEO_PIXEL_SIZE;
-    }
-    dest += skip;
+        dest += skip;
     }
+#ifdef CONFIG_VIDEO_BMP_LOGO
+    free (logo_red);
+    free (logo_green);
+    free (logo_blue);
+#endif
 }
 
-
 /*****************************************************************************/
 
 static void *video_logo (void)
 {
     char info[128];
+    extern char version_string;
 
     logo_plot (video_fb_address, VIDEO_COLS, 0, 0);
 
-    sprintf(info, " %s (%s - %s)", U_BOOT_VERSION, __DATE__, __TIME__);
+    sprintf(info, " %s", &version_string);
     video_drawstring (VIDEO_INFO_X, VIDEO_INFO_Y, info);
 
 #ifdef CONFIG_CONSOLE_EXTRA_INFO
diff --git a/drivers/sed13806.c b/drivers/sed13806.c
new file mode 100644
index 00000000000..55fceef9486
--- /dev/null
+++ b/drivers/sed13806.c
@@ -0,0 +1,306 @@
+/*
+ * (C) Copyright 2002
+ * Stäubli Faverges - <www.staubli.com>
+ * Pierre AUBERT  p.aubert@staubli.com
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+/* Video support for Epson SED13806 chipset                                  */
+
+#include <common.h>
+
+#ifdef CONFIG_VIDEO_SED13806
+
+#include <video_fb.h>
+#include <sed13806.h>
+
+#define readByte(ptrReg)                \
+    *(volatile unsigned char *)(sed13806.isaBase + ptrReg)
+
+#define writeByte(ptrReg,value) \
+    *(volatile unsigned char *)(sed13806.isaBase + ptrReg) = value
+
+#define writeWord(ptrReg,value) \
+    (*(volatile unsigned short *)(sed13806.isaBase + ptrReg) = ((value >> 8 ) & 0xff) | ((value << 8) & 0xff00))
+
+
+GraphicDevice sed13806;
+
+/*-----------------------------------------------------------------------------
+ * EpsonSetRegs -- 
+ *-----------------------------------------------------------------------------
+ */
+static void EpsonSetRegs (void)
+{
+    /* the content of the chipset register depends on the board (clocks, ...)*/
+    const S1D_REGS *preg = board_get_regs ();
+    while (preg -> Index) {
+        writeByte (preg -> Index, preg -> Value);
+        preg ++;
+    }
+}
+    
+/*-----------------------------------------------------------------------------
+ * video_hw_init -- 
+ *-----------------------------------------------------------------------------
+ */
+void *video_hw_init (void)
+{
+    unsigned int *vm, i;
+
+    memset (&sed13806, 0, sizeof (GraphicDevice));
+
+    /* Initialization of the access to the graphic chipset
+       Retreive base address of the chipset
+       (see board/RPXClassic/eccx.c)                                         */
+    if ((sed13806.isaBase = board_video_init ()) == 0) {
+        return (NULL);
+    }
+
+    sed13806.frameAdrs = sed13806.isaBase + FRAME_BUFFER_OFFSET;
+    sed13806.winSizeX = board_get_width ();
+    sed13806.winSizeY = board_get_height ();
+
+#if defined(CONFIG_VIDEO_SED13806_8BPP)
+    sed13806.gdfIndex = GDF__8BIT_INDEX;
+    sed13806.gdfBytesPP = 1;
+    
+#elif defined(CONFIG_VIDEO_SED13806_16BPP)
+    sed13806.gdfIndex = GDF_16BIT_565RGB;
+    sed13806.gdfBytesPP = 2;
+
+#else
+#error Unsupported SED13806 BPP
+#endif
+
+    sed13806.memSize = sed13806.winSizeX * sed13806.winSizeY * sed13806.gdfBytesPP;
+
+    /* Load SED registers                                                    */
+    EpsonSetRegs ();
+
+    /* (see board/RPXClassic/RPXClassic.c)                                   */
+    board_validate_screen (sed13806.isaBase);
+
+    /* Clear video memory */
+    i = sed13806.memSize/4;
+    vm = (unsigned int *)sed13806.frameAdrs;
+    while(i--)
+        *vm++ = 0;
+    
+    
+    return (&sed13806);
+}
+/*-----------------------------------------------------------------------------
+ * Epson_wait_idle -- Wait for hardware to become idle
+ *-----------------------------------------------------------------------------
+ */
+static void Epson_wait_idle (void)
+{
+    while (readByte (BLT_CTRL0) & 0x80);
+
+    /* Read a word in the BitBLT memory area to shutdown the BitBLT engine   */
+    *(volatile unsigned short *)(sed13806.isaBase + BLT_REG);
+}
+
+/*-----------------------------------------------------------------------------
+ * video_hw_bitblt -- 
+ *-----------------------------------------------------------------------------
+ */
+void video_hw_bitblt (
+    unsigned int bpp,             /* bytes per pixel */
+    unsigned int src_x,           /* source pos x */
+    unsigned int src_y,           /* source pos y */
+    unsigned int dst_x,           /* dest pos x */
+    unsigned int dst_y,           /* dest pos y */
+    unsigned int dim_x,           /* frame width */
+    unsigned int dim_y            /* frame height */
+    )
+{
+    register GraphicDevice *pGD = (GraphicDevice *)&sed13806;
+    unsigned long	srcAddr, dstAddr;
+    unsigned int stride = bpp * pGD -> winSizeX;
+
+    srcAddr = (src_y * stride) + (src_x * bpp);
+    dstAddr = (dst_y * stride) + (dst_x * bpp);
+
+    Epson_wait_idle ();
+    
+    writeByte(BLT_ROP,0x0C);	// source
+    writeByte(BLT_OP,0x02);// move blit in positive direction with ROP
+    writeWord(BLT_MEM_OFF0, stride / 2);
+    if (pGD -> gdfIndex == GDF__8BIT_INDEX) {
+        writeByte(BLT_CTRL1,0x00);
+    }
+    else {
+        writeByte(BLT_CTRL1,0x01);
+    }
+
+    writeWord(BLT_WIDTH0,(dim_x - 1));
+    writeWord(BLT_HEIGHT0,(dim_y - 1));
+    
+    /* set up blit registers                                                 */
+    writeByte(BLT_SRC_ADDR0,srcAddr);
+    writeByte(BLT_SRC_ADDR1,srcAddr>>8); 
+    writeByte(BLT_SRC_ADDR2,srcAddr>>16); 
+    
+    writeByte(BLT_DST_ADDR0,dstAddr);
+    writeByte(BLT_DST_ADDR1,dstAddr>>8); 
+    writeByte(BLT_DST_ADDR2,dstAddr>>16); 
+    
+    /* Engage the blt engine                                                 */
+    /* rectangular region for src and dst                                    */
+    writeByte(BLT_CTRL0,0x80);
+
+    /* wait untill current blits finished                                    */
+    Epson_wait_idle ();
+}
+/*-----------------------------------------------------------------------------
+ * video_hw_rectfill -- 
+ *-----------------------------------------------------------------------------
+ */
+void video_hw_rectfill (
+    unsigned int bpp,             /* bytes per pixel */
+    unsigned int dst_x,           /* dest pos x */
+    unsigned int dst_y,           /* dest pos y */
+    unsigned int dim_x,           /* frame width */
+    unsigned int dim_y,           /* frame height */
+    unsigned int color            /* fill color */
+     )
+{
+    register GraphicDevice *pGD = (GraphicDevice *)&sed13806;
+    unsigned long	dstAddr;
+    unsigned int stride = bpp * pGD -> winSizeX;
+
+    dstAddr = (dst_y * stride) + (dst_x * bpp);
+
+    Epson_wait_idle ();
+
+    /* set up blit registers                                                 */
+    writeByte(BLT_DST_ADDR0,dstAddr);
+    writeByte(BLT_DST_ADDR1,dstAddr>>8); 
+    writeByte(BLT_DST_ADDR2,dstAddr>>16); 
+
+    writeWord(BLT_WIDTH0,(dim_x - 1));
+    writeWord(BLT_HEIGHT0,(dim_y - 1));
+    writeWord(BLT_FGCOLOR0,color);
+
+    writeByte(BLT_OP,0x0C);  /* solid fill                                   */
+    writeWord(BLT_MEM_OFF0,stride / 2);
+
+    if (pGD -> gdfIndex == GDF__8BIT_INDEX) {
+        writeByte(BLT_CTRL1,0x00);
+    }
+    else {
+        writeByte(BLT_CTRL1,0x01);
+    }
+	
+    /* Engage the blt engine                                                 */
+    /* rectangular region for src and dst                                    */
+    writeByte(BLT_CTRL0,0x80);
+
+    /* wait untill current blits finished                                    */
+    Epson_wait_idle ();
+}
+
+/*-----------------------------------------------------------------------------
+ * video_set_lut -- 
+ *-----------------------------------------------------------------------------
+ */
+void video_set_lut (
+    unsigned int index,           /* color number */
+    unsigned char r,              /* red */
+    unsigned char g,              /* green */
+    unsigned char b               /* blue */
+    )
+{
+    writeByte(REG_LUT_ADDR, index );
+    writeByte(REG_LUT_DATA, r);
+    writeByte(REG_LUT_DATA, g);
+    writeByte(REG_LUT_DATA, b);
+}
+#ifdef CONFIG_VIDEO_HW_CURSOR
+/*-----------------------------------------------------------------------------
+ * video_set_hw_cursor -- 
+ *-----------------------------------------------------------------------------
+ */
+void video_set_hw_cursor (int x, int y)
+{
+    writeByte (LCD_CURSOR_XL, (x & 0xff));
+    writeByte (LCD_CURSOR_XM, (x >> 8));
+    writeByte (LCD_CURSOR_YL, (y & 0xff));
+    writeByte (LCD_CURSOR_YM, (y >> 8));
+}
+
+/*-----------------------------------------------------------------------------
+ * video_init_hw_cursor -- 
+ *-----------------------------------------------------------------------------
+ */
+void video_init_hw_cursor (int font_width, int font_height)
+{
+    volatile unsigned char *ptr;
+    unsigned char pattern;
+    int i;
+    
+
+    /* Init cursor content
+       Cursor size is 64x64 pixels
+       Start of the cursor memory depends on panel type (dual panel ...)     */
+    if ((i = readByte (LCD_CURSOR_START)) == 0) {
+        ptr = (unsigned char *)(sed13806.frameAdrs + DEFAULT_VIDEO_MEMORY_SIZE - HWCURSORSIZE);
+    }
+    else {
+        ptr = (unsigned char *)(sed13806.frameAdrs + DEFAULT_VIDEO_MEMORY_SIZE - (i * 8192));
+    }
+
+    /* Fill the first line and the first empty line after cursor             */
+    for (i = 0, pattern = 0; i < 64; i++) {
+        if (i < font_width) {
+            /* Invert background                                             */
+            pattern |= 0x3;
+            
+        }
+        else {
+            /* Background                                                    */
+            pattern |= 0x2;
+        }
+        if ((i & 3) == 3) {
+            *ptr = pattern;
+            *(ptr + font_height * 16) = 0xaa;
+            ptr ++;
+            pattern = 0;
+        }
+        pattern <<= 2;
+    }
+
+    /* Duplicate this line                                                   */
+    for (i = 1; i < font_height; i++) {
+        memcpy ((void *)ptr, (void *)(ptr - 16), 16);
+        ptr += 16;
+    }
+    
+    for (; i < 64; i++) {
+        memcpy ((void *)(ptr + 16), (void *)ptr, 16);
+        ptr += 16;
+    }
+
+    /* Select cursor mode                                                    */
+    writeByte (LCD_CURSOR_CNTL, 1);
+}
+#endif
+#endif