Send commitlog mailing list submissions to
        [email protected]

To subscribe or unsubscribe via the World Wide Web, visit
        http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
        [EMAIL PROTECTED]

You can reach the person managing the list at
        [EMAIL PROTECTED]

When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:

   1. r2081 - trunk/src/target/u-boot/patches
      ([EMAIL PROTECTED])
   2. r2082 - trunk/src/target/u-boot/patches
      ([EMAIL PROTECTED])
   3. r2083 - trunk/src/target/u-boot/patches
      ([EMAIL PROTECTED])
   4. r2084 - trunk/src/target/u-boot/patches
      ([EMAIL PROTECTED])
   5. r2085 - trunk/src/target/u-boot/patches
      ([EMAIL PROTECTED])
--- Begin Message ---
Author: laforge
Date: 2007-05-25 01:13:09 +0200 (Fri, 25 May 2007)
New Revision: 2081

Removed:
   trunk/src/target/u-boot/patches/set-hwswp.patch
Modified:
   trunk/src/target/u-boot/patches/series
   trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
   trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch
   trunk/src/target/u-boot/patches/uboot-s3c2410_fb.patch
Log:
* merge set-hwswp.patch into uboot-s3c2410_fb.patch
* move LCD controller register initialization into per-board function
* implement this function for neo1973 and qt2410


Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series      2007-05-24 19:28:30 UTC (rev 
2080)
+++ trunk/src/target/u-boot/patches/series      2007-05-24 23:13:09 UTC (rev 
2081)
@@ -42,7 +42,6 @@
 
 # splash screen
 raise-limits.patch
-set-hwswp.patch
 splashimage-command.patch
 cmd-unzip.patch
 enable-splash-bmp.patch

Deleted: trunk/src/target/u-boot/patches/set-hwswp.patch
===================================================================
--- trunk/src/target/u-boot/patches/set-hwswp.patch     2007-05-24 19:28:30 UTC 
(rev 2080)
+++ trunk/src/target/u-boot/patches/set-hwswp.patch     2007-05-24 23:13:09 UTC 
(rev 2081)
@@ -1,57 +0,0 @@
-drivers/cfb_console.c: set SHORTSWAP to swap nibbles
-  [ clean this up when and if HWSWP is confirmed ]
-drivers/s3c2410_fb.c (video_hw_init): set HWSWP in LCDCON5
-drivers/s3c2410_fb.c (video_hw_init): use memset instead of open-coded
-   equivalent
-
-- Werner Almesberger <[EMAIL PROTECTED]>
-
-Index: u-boot/drivers/cfb_console.c
-===================================================================
---- u-boot.orig/drivers/cfb_console.c
-+++ u-boot/drivers/cfb_console.c
-@@ -315,6 +315,11 @@ void      console_cursor (int state);
- #define SHORTSWAP32(x)         (x)
- #endif
- 
-+#ifdef CONFIG_VIDEO_S3C2410
-+#undef SHORTSWAP32
-+#define       SHORTSWAP32(x)  ((((x) & 0xffff) << 16) | (((x) >> 16) & 
0xffff))
-+#endif
-+
- #if defined(DEBUG) || defined(DEBUG_CFB_CONSOLE)
- #define PRINTD(x)       printf(x)
- #else
-Index: u-boot/drivers/s3c2410_fb.c
-===================================================================
---- u-boot.orig/drivers/s3c2410_fb.c
-+++ u-boot/drivers/s3c2410_fb.c
-@@ -47,7 +47,6 @@ void *video_hw_init (void)
-       struct ctfb_res_modes *res_mode;
-       struct ctfb_res_modes var_mode;
-       unsigned char videoout;
--      unsigned int *vm;
- 
-       /* Search for video chip */
-       printf("Video: ");
-@@ -148,7 +147,7 @@ void *video_hw_init (void)
-       lcd->LCDCON2 = 0x019fc3c1;
-       lcd->LCDCON3 = 0x0039df67;
-       lcd->LCDCON4 = 0x00000007;
--      lcd->LCDCON5 = 0x0001cf08;
-+      lcd->LCDCON5 = 0x0001cf09;
-       lcd->LPCSEL  = 0x00000000;
- 
-       lcd->LCDSADDR1 = LCD_VIDEO_ADDR >> 1;
-@@ -164,10 +163,7 @@ void *video_hw_init (void)
-       }
- 
-       /* Clear video memory */
--      i = pGD->memSize/4;
--      vm = (unsigned int *)pGD->frameAdrs;
--      while(i--)
--              *vm++ = 0;
-+      memset(pGD->frameAdrs, 0, pGD->memSize);
- 
-       /* Enable  Display  */
-       lcd->LCDCON1 |= 0x01;   /* ENVID = 1 */

Modified: trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch        
2007-05-24 19:28:30 UTC (rev 2080)
+++ trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch        
2007-05-24 23:13:09 UTC (rev 2081)
@@ -559,7 +559,7 @@
 ===================================================================
 --- /dev/null
 +++ u-boot/board/neo1973/common/jbt6k74.c
-@@ -0,0 +1,406 @@
+@@ -0,0 +1,420 @@
 +/* u-boot driver for the tpo JBT6K74-AS LCM ASIC
 + *
 + * Copyright (C) 2006-2007 by OpenMoko, Inc.
@@ -584,6 +584,7 @@
 + */
 +#include <common.h>
 +#include <spi.h>
++#include <video_fb.h>
 +#include <asm/errno.h>
 +#include <s3c2410.h>
 +#include "jbt6k74.h"
@@ -966,6 +967,19 @@
 +
 +      return 0;
 +}
++
++void board_video_init(GraphicDevice *pGD)
++{
++      S3C24X0_LCD * const lcd = S3C24X0_GetBase_LCD();
++
++      lcd->LCDCON1 = 0x00000178; /* CLKVAL=1, BPPMODE=16bpp, TFT, ENVID=0 */
++
++      lcd->LCDCON2 = 0x019fc3c1;
++      lcd->LCDCON3 = 0x0039df67;
++      lcd->LCDCON4 = 0x00000007;
++      lcd->LCDCON5 = 0x0001cf09;
++      lcd->LPCSEL  = 0x00000000;
++}
 Index: u-boot/board/neo1973/common/jbt6k74.h
 ===================================================================
 --- /dev/null

Modified: trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch 2007-05-24 
19:28:30 UTC (rev 2080)
+++ trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch 2007-05-24 
23:13:09 UTC (rev 2081)
@@ -7,7 +7,7 @@
 ===================================================================
 --- u-boot.orig/Makefile
 +++ u-boot/Makefile
-@@ -1976,6 +1976,9 @@
+@@ -2009,6 +2009,9 @@
  sbc2410x_config: unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
  
@@ -721,7 +721,7 @@
 ===================================================================
 --- /dev/null
 +++ u-boot/board/qt2410/qt2410.c
-@@ -0,0 +1,128 @@
+@@ -0,0 +1,145 @@
 +/*
 + * (C) 2006 by OpenMoko, Inc.
 + * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -755,6 +755,7 @@
 + */
 +
 +#include <common.h>
++#include <video_fb.h>
 +#include <s3c2410.h>
 +
 +DECLARE_GLOBAL_DATA_PTR;
@@ -843,6 +844,22 @@
 +      return 0;
 +}
 +
++void board_video_init(GraphicDevice *pGD)
++{
++      S3C24X0_LCD * const lcd = S3C24X0_GetBase_LCD();
++
++      /* FIXME: select LCM type by env variable */
++
++      /* Configuration for GTA01 LCM on QT2410 */
++      lcd->LCDCON1 = 0x00000178; /* CLKVAL=1, BPPMODE=16bpp, TFT, ENVID=0 */
++
++      lcd->LCDCON2 = 0x019fc3c1;
++      lcd->LCDCON3 = 0x0039df67;
++      lcd->LCDCON4 = 0x00000007;
++      lcd->LCDCON5 = 0x0001cf09;
++      lcd->LPCSEL  = 0x00000000;
++}
++
 +int dram_init (void)
 +{
 +      gd->bd->bi_dram[0].start = PHYS_SDRAM_1;

Modified: trunk/src/target/u-boot/patches/uboot-s3c2410_fb.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410_fb.patch      2007-05-24 
19:28:30 UTC (rev 2080)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410_fb.patch      2007-05-24 
23:13:09 UTC (rev 2081)
@@ -15,7 +15,7 @@
 ===================================================================
 --- /dev/null
 +++ u-boot/drivers/s3c2410_fb.c
-@@ -0,0 +1,187 @@
+@@ -0,0 +1,166 @@
 +/*
 + * (C) Copyright 2006 by OpenMoko, Inc.
 + * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -50,6 +50,8 @@
 +
 +#define VIDEO_MEM_SIZE        0x200000        /* 480x640x16bit = 614400 bytes 
*/
 +
++extern void board_video_init(GraphicDevice *pGD);
++
 
+/*******************************************************************************
 + *
 + * Init video chip with common Linux graphic modes (lilo)
@@ -65,7 +67,6 @@
 +      struct ctfb_res_modes *res_mode;
 +      struct ctfb_res_modes var_mode;
 +      unsigned char videoout;
-+      unsigned int *vm;
 +
 +      /* Search for video chip */
 +      printf("Video: ");
@@ -151,41 +152,19 @@
 +      pGD->gdfBytesPP = 2;
 +      pGD->gdfIndex = GDF_16BIT_565RGB;
 +
-+#if 0
-+      pGD->isaBase = CFG_ISA_IO;
-+      pGD->pciBase = pci_mem_base;
-+      pGD->dprBase = (pci_mem_base + 0x400000 + 0x8000);
-+      pGD->vprBase = (pci_mem_base + 0x400000 + 0xc000);
-+      pGD->cprBase = (pci_mem_base + 0x400000 + 0xe000);
-+#endif
 +      pGD->frameAdrs = LCD_VIDEO_ADDR;
 +      pGD->memSize = VIDEO_MEM_SIZE;
 +
-+      lcd->LCDCON1 = 0x00000178; /* CLKVAL=1, BPPMODE=16bpp, TFT, ENVID=0 */
++      board_video_init(pGD);
 +
-+      lcd->LCDCON2 = 0x019fc3c1;
-+      lcd->LCDCON3 = 0x0039df67;
-+      lcd->LCDCON4 = 0x00000007;
-+      lcd->LCDCON5 = 0x0001cf08;
-+      lcd->LPCSEL  = 0x00000000;
++      lcd->LCDSADDR1 = pGD->frameAdrs >> 1;
 +
-+      lcd->LCDSADDR1 = LCD_VIDEO_ADDR >> 1;
-+
 +      /* 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) {
-+              /* deceide if it is a string */
-+              videoout = (int) simple_strtoul (penv, NULL, 16);
-+      }
-+
 +      /* Clear video memory */
-+      i = pGD->memSize/4;
-+      vm = (unsigned int *)pGD->frameAdrs;
-+      while(i--)
-+              *vm++ = 0;
++      memset(pGD->frameAdrs, 0, pGD->memSize);
 +
 +      /* Enable  Display  */
 +      lcd->LCDCON1 |= 0x01;   /* ENVID = 1 */
@@ -222,3 +201,15 @@
  /* Include video_fb.h after definitions of VIDEO_HW_RECTFILL etc           */
  
/*****************************************************************************/
  #include <video_fb.h>
+@@ -307,6 +315,11 @@
+ #define SHORTSWAP32(x)         (x)
+ #endif
+ 
++#ifdef CONFIG_VIDEO_S3C2410
++#undef SHORTSWAP32
++#define       SHORTSWAP32(x)  ((((x) & 0xffff) << 16) | (((x) >> 16) & 
0xffff))
++#endif
++
+ #if defined(DEBUG) || defined(DEBUG_CFB_CONSOLE)
+ #define PRINTD(x)       printf(x)
+ #else




--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-05-25 01:14:10 +0200 (Fri, 25 May 2007)
New Revision: 2082

Modified:
   trunk/src/target/u-boot/patches/uboot-gta02.patch
Log:
* make sure memory bank configuration is correct for smedia
* add smedai framebuffer driver stub (just skeleton)


Modified: trunk/src/target/u-boot/patches/uboot-gta02.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-gta02.patch   2007-05-24 23:13:09 UTC 
(rev 2081)
+++ trunk/src/target/u-boot/patches/uboot-gta02.patch   2007-05-24 23:14:10 UTC 
(rev 2082)
@@ -1103,6 +1103,28 @@
 ===================================================================
 --- u-boot.orig/board/neo1973/common/lowlevel_init.S
 +++ u-boot/board/neo1973/common/lowlevel_init.S
+@@ -49,7 +49,7 @@
+ #define WAIT                  (0x1<<2)
+ #define UBLB                  (0x1<<3)
+ 
+-#define B1_BWSCON             (DW32)
++#define B1_BWSCON             (DW16 + WAIT + UBLB)
+ #define B2_BWSCON             (DW16)
+ #define B3_BWSCON             (DW16 + WAIT + UBLB)
+ #define B4_BWSCON             (DW16)
+@@ -68,9 +68,9 @@
+ 
+ /* BANK1CON */
+ #define B1_Tacs                       0x0     /*  0clk */
+-#define B1_Tcos                       0x0     /*  0clk */
+-#define B1_Tacc                       0x7     /* 14clk */
+-#define B1_Tcoh                       0x0     /*  0clk */
++#define B1_Tcos                       0x1     /*  1clk */
++#define B1_Tacc                       0x4     /*  4clk */
++#define B1_Tcoh                       0x1     /*  1clk */
+ #define B1_Tah                        0x0     /*  0clk */
+ #define B1_Tacp                       0x0
+ #define B1_PMC                        0x0
 @@ -167,6 +167,18 @@
        str     r1, [r0]
  #endif
@@ -1218,3 +1240,42 @@
 +sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 +
 +TEXT_BASE = 0x33F80000
+Index: u-boot/drivers/smedia3362.c
+===================================================================
+--- /dev/null
++++ u-boot/drivers/smedia3362.c
+@@ -0,0 +1,34 @@
++/*
++ * (C) Copyright 2007 by OpenMoko, Inc.
++ * Author: Harald Welte <[EMAIL PROTECTED]>
++ *
++ * 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
++ */
++
++#include <common.h>
++
++#if defined(CONFIG_VIDEO_GLAMO3362)
++
++#include <video_fb.h>
++#include "videomodes.h"
++#include <s3c2410.h>
++/*
++ * Export Graphic Device
++ */
++GraphicDevice smi;
++
++
++#endif /* CONFIG_VIDEO_GLAMO3362 */




--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-05-25 01:17:19 +0200 (Fri, 25 May 2007)
New Revision: 2083

Modified:
   trunk/src/target/u-boot/patches/uboot-hxd8.patch
Log:
implement [untested] hxd8 multiple nand chip support


Modified: trunk/src/target/u-boot/patches/uboot-hxd8.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-hxd8.patch    2007-05-24 23:14:10 UTC 
(rev 2082)
+++ trunk/src/target/u-boot/patches/uboot-hxd8.patch    2007-05-24 23:17:19 UTC 
(rev 2083)
@@ -88,7 +88,7 @@
 ===================================================================
 --- /dev/null
 +++ u-boot/board/hxd8/hxd8.c
-@@ -0,0 +1,172 @@
+@@ -0,0 +1,204 @@
 +/*
 + * (C) Copyright 2007 by OpenMoko, Inc.
 + * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -120,6 +120,8 @@
 + */
 +
 +#include <common.h>
++#include <nand.h>
++#include <pcf50606.h>
 +#include <s3c2440.h>
 +
 +DECLARE_GLOBAL_DATA_PTR;
@@ -190,7 +192,7 @@
 +      gpio->GPADAT = 0x0001C000;
 +      gpio->GPBCON = 0x00045542;
 +      gpio->GPBUP = 0x000007FF;
-+      gpio->GPCCON = 0xAAAA55A9;
++      gpio->GPCCON = 0xAAAA02A9;
 +      gpio->GPCUP = 0x0000FFFF;
 +      gpio->GPDCON = 0xAAAAAAAA;
 +      gpio->GPDUP = 0x0000FFFF;
@@ -260,7 +262,37 @@
 +char *dynpart_names[] = {
 +    "u-boot", "u-boot_env", "kernel", "splash", "rootfs", NULL };
 +
++/* 4G Nand flash chip select function */
++void board_nand_select_device(struct nand_chip *this, int chip)
++{
++      S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
 +
++      if (chip == 0)
++              gpio->GPGDAT &=  ~(1 << 1);
++      else
++              gpio->GPGDAT |=  (1 << 1);
++
++      if (chip == 1)
++              gpio->GPADAT &=  ~(1 << 15);
++      else
++              gpio->GPADAT |= (1 << 15);
++
++      if (chip == 2)
++              gpio->GPADAT &=  ~(1 << 16);
++      else
++              gpio->GPADAT |=  (1 << 16);
++
++      if (chip == 3)
++              gpio->GPADAT &=  ~(1 << 14);
++      else
++              gpio->GPADAT |= (1 << 14);
++
++      /* UGLY: ew don't have mtd_info pointer, but know that
++       * s3c24xx hwcontrol function does not use it for CLRNCE */
++      if (chip == -1)
++              this->hwcontrol(NULL, NAND_CTL_CLRNCE);
++}
++
 Index: u-boot/board/hxd8/lowlevel_init.S
 ===================================================================
 --- /dev/null
@@ -441,7 +473,7 @@
 ===================================================================
 --- /dev/null
 +++ u-boot/include/configs/hxd8.h
-@@ -0,0 +1,275 @@
+@@ -0,0 +1,278 @@
 +/*
 + * (C) Copyright 2007 OpenMoko, Inc.
 + * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -484,6 +516,7 @@
 +#define CONFIG_ARM920T                1       /* This is an ARM920T Core      
*/
 +#define       CONFIG_S3C2440          1       /* in a SAMSUNG S3C2440 SoC     
*/
 +#define CONFIG_SMDK2440               1       /* on a SAMSUNG SMDK2440 Board  
*/
++#define CONFIG_HXD8           1       /* on a FIC HXD8 Board  */
 +
 +/* input clock of PLL */
 +#define CONFIG_SYS_CLK_FREQ   16934400/* the HXD8 has this input clock */
@@ -649,9 +682,11 @@
 +#define CFG_ENV_OFFSET_OOB    1               /* Location of ENV stored in 
block 0 OOB */
 +#define       CFG_PREBOOT_OVERRIDE    1       /* allow preboot from memory */
 +
-+#define NAND_MAX_CHIPS                1
++#define NAND_MAX_CHIPS                3
 +#define CFG_NAND_BASE         0x4e000000
-+#define CFG_MAX_NAND_DEVICE   1
++#define CFG_MAX_NAND_DEVICE   NAND_MAX_CHIPS
++#define CFG_NAND_BASE_LIST    { CFG_NAND_BASE, CFG_NAND_BASE, CFG_NAND_BASE }
++#define CFG_NAND_SELECT_DEVICE
 +
 +#define CONFIG_MMC            1
 +#define CFG_MMC_BASE          0xff000000
@@ -1072,3 +1107,47 @@
 +      .bss : { *(.bss) }
 +      _end = .;
 +}
+Index: u-boot/cpu/arm920t/s3c24x0/nand.c
+===================================================================
+--- u-boot.orig/cpu/arm920t/s3c24x0/nand.c
++++ u-boot/cpu/arm920t/s3c24x0/nand.c
+@@ -83,6 +83,26 @@
+ #define       NFDATA          __REGb(NF_BASE + oNFDATA)
+ #define       NFSTAT          __REGb(NF_BASE + oNFSTAT)
+ 
++#if defined(CONFIG_HXD8)
++static int hxd8_dev_ready(struct mtd_info *mtd)
++{
++      S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
++      u_int32_t val = gpio->GPCDAT;
++
++      switch (nand_curr_device) {
++              case 0:
++                      return (NFSTAT & 0x01);
++              case 1: /* RnB 3 */
++                      return ((val>>6) & 0x01);
++              case 2: /* RnB 4 */
++                      return ((val>>7) & 0x01);
++              case 3: /* RnB 2 */
++                      return  ((val>>5) & 0x01);
++              default:
++                      return 0;
++      }
++}
++#endif
+ 
+ static void s3c2410_hwcontrol(struct mtd_info *mtd, int cmd)
+ {
+@@ -251,6 +271,12 @@
+       nand->eccmode = NAND_ECC_SOFT;
+ #endif
+ 
++#if defined(CONFIG_HXD8)
++      //printk("Initial new cs\n");
++      //nand->select_chip = hxd8_nand_select_chip;
++      nand->dev_ready = hxd8_dev_ready;
++#endif
++
+ #ifdef CONFIG_S3C2410_NAND_BBT
+       nand->options = NAND_USE_FLASH_BBT | NAND_DONT_CREATE_BBT;
+ #else




--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-05-25 01:36:22 +0200 (Fri, 25 May 2007)
New Revision: 2084

Modified:
   trunk/src/target/u-boot/patches/uboot-hxd8.patch
Log:
enable framebuffer support on hxd8


Modified: trunk/src/target/u-boot/patches/uboot-hxd8.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-hxd8.patch    2007-05-24 23:17:19 UTC 
(rev 2083)
+++ trunk/src/target/u-boot/patches/uboot-hxd8.patch    2007-05-24 23:36:22 UTC 
(rev 2084)
@@ -88,7 +88,7 @@
 ===================================================================
 --- /dev/null
 +++ u-boot/board/hxd8/hxd8.c
-@@ -0,0 +1,204 @@
+@@ -0,0 +1,219 @@
 +/*
 + * (C) Copyright 2007 by OpenMoko, Inc.
 + * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -120,6 +120,7 @@
 + */
 +
 +#include <common.h>
++#include <video_fb.h>
 +#include <nand.h>
 +#include <pcf50606.h>
 +#include <s3c2440.h>
@@ -200,7 +201,7 @@
 +      gpio->GPEUP = 0x0000FFFF;
 +      gpio->GPFCON = 0x0000AAA9;
 +      gpio->GPFUP = 0x000000FF;
-+      gpio->GPGCON = 0x027D0016;
++      gpio->GPGCON = 0x027D0316;
 +      gpio->GPGUP = 0x0000FFFF;
 +      gpio->GPHCON = 0x0014AAAA;
 +      gpio->GPHUP = 0x000007FF;
@@ -232,6 +233,21 @@
 +      return 0;
 +}
 +
++void board_video_init(GraphicDevice *pGD)
++{
++      S3C24X0_LCD * const lcd = S3C24X0_GetBase_LCD();
++
++      lcd->LCDCON1 = 0x0000057b;
++      lcd->LCDCON2 = 0x0143c049;
++      lcd->LCDCON3 = 0x0009df01;
++      lcd->LCDCON4 = 0x00000028;
++      lcd->LCDCON5 = 0x00000b08;
++
++      lcd->TPAL = 0x01202020;
++
++      //lcd->LCDCON5 |= (0x01 << 3);
++}
++
 +int board_late_init(void)
 +{
 +      /* Initialize the Power Management Unit with a safe register set */
@@ -292,7 +308,6 @@
 +      if (chip == -1)
 +              this->hwcontrol(NULL, NAND_CTL_CLRNCE);
 +}
-+
 Index: u-boot/board/hxd8/lowlevel_init.S
 ===================================================================
 --- /dev/null
@@ -723,7 +738,7 @@
 +/* we have a board_late_init() function */
 +#define BOARD_LATE_INIT                       1
 +
-+#if 0
++#if 1
 +#define CONFIG_VIDEO
 +#define CONFIG_VIDEO_S3C2410
 +#define CONFIG_CFB_CONSOLE




--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-05-25 01:41:11 +0200 (Fri, 25 May 2007)
New Revision: 2085

Modified:
   trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch
Log:
* add dummy udc_ctrl() function to qt2410 code (fix compilation)


Modified: trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch 2007-05-24 
23:36:22 UTC (rev 2084)
+++ trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch 2007-05-24 
23:41:11 UTC (rev 2085)
@@ -721,7 +721,7 @@
 ===================================================================
 --- /dev/null
 +++ u-boot/board/qt2410/qt2410.c
-@@ -0,0 +1,145 @@
+@@ -0,0 +1,152 @@
 +/*
 + * (C) 2006 by OpenMoko, Inc.
 + * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -756,6 +756,7 @@
 +
 +#include <common.h>
 +#include <video_fb.h>
++#include <usbdcore.h>
 +#include <s3c2410.h>
 +
 +DECLARE_GLOBAL_DATA_PTR;
@@ -844,6 +845,12 @@
 +      return 0;
 +}
 +
++#if defined(CONFIG_USB_DEVICE)
++void udc_ctrl(enum usbd_event event, int param)
++{
++}
++#endif
++
 +void board_video_init(GraphicDevice *pGD)
 +{
 +      S3C24X0_LCD * const lcd = S3C24X0_GetBase_LCD();




--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog

Reply via email to