Changeset 976 for trunk/src/target/u-boot/patches/uboot-s3c2410_fb.patch

Timestamp:

02/13/07 02:21:56 (6 years ago)

Author:

laforge

Message:

console output is now completely working at full 480x640. However, byte
swapping problem of image display still persists. Check
​https://people.openmoko.org/laforge/photos/uboot-s3c2410fb/uboot-s3c2410fb-hwswap-better.jpg

File:

• trunk/src/target/u-boot/patches/uboot-s3c2410_fb.patch (modified) (7 diffs)

trunk/src/target/u-boot/patches/uboot-s3c2410_fb.patch

@@ -1 @@
-Index: u-boot.git/drivers/Makefile
+Index: u-boot/drivers/Makefile
 ===================================================================
---- u-boot.git.orig/drivers/Makefile    2007-02-06 11:56:37.000000000 +0100
-+++ u-boot.git/drivers/Makefile 2007-02-06 11:59:08.000000000 +0100
+--- u-boot.orig/drivers/Makefile        2007-02-12 20:56:01.000000000 +0100
++++ u-boot/drivers/Makefile     2007-02-13 02:20:11.000000000 +0100
 @@ -51,7 +51,7 @@
           ks8695eth.o \
@@ -12 +12 @@
  SRCS   := $(COBJS:.o=.c)
  OBJS   := $(addprefix $(obj),$(COBJS))
-Index: u-boot.git/drivers/s3c2410_fb.c
+Index: u-boot/drivers/s3c2410_fb.c
 ===================================================================
 --- /dev/null   1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/drivers/s3c2410_fb.c     2007-02-06 11:59:08.000000000 +0100
-@@ -0,0 +1,183 @@
++++ u-boot/drivers/s3c2410_fb.c 2007-02-13 01:54:27.000000000 +0100
+@@ -0,0 +1,189 @@
 +/*
 + * (C) Copyright 2006 by OpenMoko, Inc.
@@ -49 +49 @@
 +GraphicDevice smi;
 +
-+#define VIDEO_MEM_SIZE 0x200000
++#define VIDEO_MEM_SIZE 0x200000        /* 480x640x16bit = 614400 bytes */
 +
 +/*******************************************************************************
@@ -146 +146 @@
 +       }
 +
++       /* statically configure settings */
++       pGD->winSizeX = pGD->plnSizeX = 480;
++       pGD->winSizeY = pGD->plnSizeY = 640;
++       pGD->gdfBytesPP = 2;
++       pGD->gdfIndex = GDF_16BIT_565RGB;
++
 +#if 0
 +       pGD->isaBase = CFG_ISA_IO;
@@ -156 +162 @@
 +       pGD->memSize = VIDEO_MEM_SIZE;
 +
++       lcd->LCDCON1 = 0x00000178; /* CLKVAL=1, BPPMODE=16bpp, TFT, ENVID=0 */
++
++       lcd->LCDCON2 = 0x019fc3c1;
++       lcd->LCDCON3 = 0x0039df67;
++       lcd->LCDCON4 = 0x00000007;
++       lcd->LCDCON5 = 0x0001cb08;
++       lcd->LPCSEL  = 0x00000000;
++
 +       lcd->LCDSADDR1 = LCD_VIDEO_ADDR >> 1;
-+       lcd->LCDSADDR2 = (LCD_VIDEO_ADDR + 0x4b000) >> 1;
-+       lcd->LCDSADDR3 = 0x000000f0;
-+
-+       lcd->LCDCON1 = 0x00000479;
-+       lcd->LCDCON2 = 0x014fc183;
-+       lcd->LCDCON3 = 0x0060ef07;
-+       lcd->LCDCON4 = 0x00000003;
-+       lcd->LCDCON5 = 0x00000b09;
-+       lcd->LPCSEL  = 0x00000cf0;
-+
-+       pGD->winSizeX = pGD->plnSizeX = 240;
-+       pGD->winSizeY = pGD->plnSizeY = 320;
-+       pGD->gdfBytesPP = 2;
-+       pGD->gdfIndex = GDF_16BIT_565RGB;
-+
-+       /* Enable  Display  */
++
++       /* This marks the end of the frame buffer. */
++       lcd->LCDSADDR2 = (lcd->LCDSADDR1&0x1fffff) + (pGD->winSizeX+0) * pGD->winSizeY;
++       lcd->LCDSADDR3 = pGD->winSizeX;
++
 +       videoout = 2;       /* Default output is CRT */
 +       if ((penv = getenv ("videoout")) != NULL) {
@@ -185 +188 @@
 +       while(i--)
 +               *vm++ = 0;
++
++       /* Enable  Display  */
++       lcd->LCDCON1 |= 0x01;   /* ENVID = 1 */
 +
 +       printf("returning from video_hw_init\n");
@@ -200 +206 @@
 +
 +#endif /* CONFIG_VIDEO_S3C2410 */
+Index: u-boot/drivers/cfb_console.c
+===================================================================
+--- u-boot.orig/drivers/cfb_console.c   2007-02-12 22:31:30.000000000 +0100
++++ u-boot/drivers/cfb_console.c        2007-02-12 22:37:27.000000000 +0100
+@@ -141,6 +141,14 @@
+ #endif
+ 
+ /*****************************************************************************/
++/* Defines for the S3C2410 driver                                           */
++/*****************************************************************************/
++#ifdef CONFIG_VIDEO_S3C2410
++/* it actually is little-endian, but the host CPU, too ! */
++//#define VIDEO_FB_LITTLE_ENDIAN
++#endif
++
++/*****************************************************************************/
+ /* Include video_fb.h after definitions of VIDEO_HW_RECTFILL etc            */
+ /*****************************************************************************/
+ #include <video_fb.h>