r4026 - trunk/src/target/u-boot/patches

[werner at sita.openmoko.org]

Author: werner
Date: 2008-02-08 09:46:02 +0100 (Fri, 08 Feb 2008)
New Revision: 4026

Modified:
   trunk/src/target/u-boot/patches/enable-splash-bmp.patch
   trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
   trunk/src/target/u-boot/patches/uboot-gta02.patch
Log:
Brought back use of SHORTSWAP32, since we need it for the GTA02 u-boot console.

This undoes the HWSWP change in revision 3774.
GTA01 splash screen images have to be generated without -swap, like before
revision 3774.


uboot-20061030-neo1973.patch:
- include/configs/neo1973_gta01.h: set VIDEO_FB_16BPP_PIXEL_SWAP
- board/neo1973/common/jbt6k74.c (board_video_init): enable HWSWP in LCDCON5

enable-splash-bmp.patch:
- include/configs/neo1973_gta01.h: adapted for context changes

uboot-gta02.patch:
- include/configs/neo1973_gta02.h: set VIDEO_FB_16BPP_PIXEL_SWAP



Modified: trunk/src/target/u-boot/patches/enable-splash-bmp.patch
===================================================================
--- trunk/src/target/u-boot/patches/enable-splash-bmp.patch	2008-02-07 15:19:20 UTC (rev 4025)
+++ trunk/src/target/u-boot/patches/enable-splash-bmp.patch	2008-02-08 08:46:02 UTC (rev 4026)
@@ -10,7 +10,7 @@
 ===================================================================
 --- u-boot.orig/drivers/video/cfb_console.c
 +++ u-boot/drivers/video/cfb_console.c
-@@ -191,6 +191,7 @@
+@@ -195,6 +195,7 @@
  #if defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
  #include <watchdog.h>
  #include <bmp_layout.h>
@@ -22,7 +22,7 @@
 ===================================================================
 --- u-boot.orig/include/configs/neo1973_gta01.h
 +++ u-boot/include/configs/neo1973_gta01.h
-@@ -81,6 +81,7 @@
+@@ -82,6 +82,7 @@
  #define CONFIG_CMD_ENV
  #define CONFIG_CMD_BOOTD
  #define CONFIG_CMD_CONSOLE
@@ -30,7 +30,7 @@
  #define CONFIG_CMD_ASKENV
  #define CONFIG_CMD_RUN
  #define CONFIG_CMD_ECHO
-@@ -237,19 +238,21 @@
+@@ -239,12 +240,15 @@
  /* we have a board_late_init() function */
  #define BOARD_LATE_INIT			1
  
@@ -40,13 +40,14 @@
  #define CONFIG_CFB_CONSOLE
  #define CONFIG_VIDEO_LOGO
 +#define CONFIG_SPLASH_SCREEN
-+#define CFG_VIDEO_LOGO_MAX_SIZE	(640*480+1024+100) /* 100 = slack */
++#define CFG_VIDEO_LOGO_MAX_SIZE		(640*480+1024+100) /* 100 = slack */
 +#define CONFIG_VIDEO_BMP_GZIP
  #define CONFIG_VGA_AS_SINGLE_DEVICE
 +#define CONFIG_CMD_UNZIP
  
- #define VIDEO_KBD_INIT_FCT	0
- #define VIDEO_TSTC_FCT		serial_tstc
+ #define VIDEO_FB_16BPP_PIXEL_SWAP
+ 
+@@ -253,7 +257,6 @@
  #define VIDEO_GETC_FCT		serial_getc
  
  #define LCD_VIDEO_ADDR		0x33d00000

Modified: trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch	2008-02-07 15:19:20 UTC (rev 4025)
+++ trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch	2008-02-08 08:46:02 UTC (rev 4026)
@@ -8,7 +8,7 @@
 ===================================================================
 --- u-boot.orig/Makefile
 +++ u-boot/Makefile
-@@ -2323,6 +2323,14 @@
+@@ -2417,6 +2417,14 @@
  sbc2410x_config: unconfig
  	@$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
  
@@ -873,7 +873,7 @@
 +	lcd->LCDCON2 = 0x019fc3c1;
 +	lcd->LCDCON3 = 0x0039df67;
 +	lcd->LCDCON4 = 0x00000007;
-+	lcd->LCDCON5 = 0x0001cf08;
++	lcd->LCDCON5 = 0x0001cf09;
 +	lcd->LPCSEL  = 0x00000000;
 +}
 Index: u-boot/board/neo1973/common/jbt6k74.h
@@ -1908,7 +1908,7 @@
 ===================================================================
 --- /dev/null
 +++ u-boot/include/configs/neo1973_gta01.h
-@@ -0,0 +1,255 @@
+@@ -0,0 +1,257 @@
 +/*
 + * (C) Copyright 2006 OpenMoko, Inc.
 + * Author: Harald Welte <laforge at openmoko.org>
@@ -2150,6 +2150,8 @@
 +#define CONFIG_VIDEO_LOGO
 +#define CONFIG_VGA_AS_SINGLE_DEVICE
 +
++#define VIDEO_FB_16BPP_PIXEL_SWAP
++
 +#define VIDEO_KBD_INIT_FCT	0
 +#define VIDEO_TSTC_FCT		serial_tstc
 +#define VIDEO_GETC_FCT		serial_getc
@@ -2250,8 +2252,8 @@
  COBJS-y += ns87308.o
 +COBJS-y += pcf50606.o
  COBJS-y += status_led.o
+ COBJS-$(CONFIG_FSL_LAW) += fsl_law.o
  
- COBJS	:= $(COBJS-y)
 Index: u-boot/drivers/misc/pcf50606.c
 ===================================================================
 --- /dev/null

Modified: trunk/src/target/u-boot/patches/uboot-gta02.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-gta02.patch	2008-02-07 15:19:20 UTC (rev 4025)
+++ trunk/src/target/u-boot/patches/uboot-gta02.patch	2008-02-08 08:46:02 UTC (rev 4026)
@@ -609,7 +609,7 @@
 ===================================================================
 --- /dev/null
 +++ u-boot/include/configs/neo1973_gta02.h
-@@ -0,0 +1,284 @@
+@@ -0,0 +1,286 @@
 +/*
 + * (C) Copyright 2007 OpenMoko, Inc.
 + * Author: Harald Welte <laforge at openmoko.org>
@@ -873,6 +873,8 @@
 +#define CONFIG_VGA_AS_SINGLE_DEVICE
 +#define CONFIG_CMD_UNZIP
 +
++#define VIDEO_FB_16BPP_PIXEL_SWAP
++
 +#define VIDEO_KBD_INIT_FCT	0
 +#define VIDEO_TSTC_FCT		serial_tstc
 +#define VIDEO_GETC_FCT		serial_getc