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

[werner at sita.openmoko.org]

Author: werner
Date: 2008-01-12 18:31:35 +0100 (Sat, 12 Jan 2008)
New Revision: 3818

Modified:
   trunk/src/target/u-boot/patches/console-ansi.patch
   trunk/src/target/u-boot/patches/uboot-s3c2410_fb.patch
Log:
Upgrading to upstream version 3afac79ec27b91df185f090b31dad9620779f440 required
two simple changes.

uboot-s3c2410_fb.patch:
- drivers/video/Makefile: trivial patch breakage after upgrade to upstream
  version 3afac79ec27b91df185f090b31dad9620779f440

console-ansi.patch:
- drivers/video/cfb_console.c (video_putc): upstream now handles \r, so we
  don't have to



Modified: trunk/src/target/u-boot/patches/console-ansi.patch
===================================================================
--- trunk/src/target/u-boot/patches/console-ansi.patch	2008-01-11 21:49:33 UTC (rev 3817)
+++ trunk/src/target/u-boot/patches/console-ansi.patch	2008-01-12 17:31:35 UTC (rev 3818)
@@ -8,7 +8,7 @@
 ===================================================================
 --- u-boot.orig/drivers/video/cfb_console.c
 +++ u-boot/drivers/video/cfb_console.c
-@@ -181,6 +181,7 @@ CONFIG_VIDEO_HW_CURSOR:	     - Uses the 
+@@ -185,6 +185,7 @@
  
  #include <version.h>
  #include <linux/types.h>
@@ -16,10 +16,11 @@
  #include <devices.h>
  #include <video_font.h>
  
-@@ -676,10 +677,96 @@ static void console_newline (void)
+@@ -691,10 +692,95 @@
  
  /*****************************************************************************/
  
++
 +static enum {
 +	CS_NORMAL = 0,
 +	CS_ESC,
@@ -100,6 +101,8 @@
 +
  void video_putc (const char c)
  {
+ 	static int nl = 1;
+ 
 +	if (state) {
 +		escape_sequence(c);
 +		CURSOR_SET;
@@ -107,14 +110,9 @@
 +	}
 +
  	switch (c) {
--	case 13:		/* ignore */
-+	case 13:		/* return to beginning of line */
-+		CURSOR_OFF;
-+		console_col = 0;
- 		break;
- 
- 	case '\n':		/* next line */
-@@ -698,6 +785,10 @@ void video_putc (const char c)
+ 	case 13:		/* back to first column */
+ 		console_cr ();
+@@ -718,6 +804,10 @@
  		console_back ();
  		break;
  

Modified: trunk/src/target/u-boot/patches/uboot-s3c2410_fb.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410_fb.patch	2008-01-11 21:49:33 UTC (rev 3817)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410_fb.patch	2008-01-12 17:31:35 UTC (rev 3818)
@@ -2,10 +2,10 @@
 ===================================================================
 --- u-boot.orig/drivers/video/Makefile
 +++ u-boot/drivers/video/Makefile
-@@ -28,6 +28,7 @@
- COBJS-y += ati_radeon_fb.o
+@@ -29,6 +29,7 @@
  COBJS-y += cfb_console.o
  COBJS-y += ct69000.o
+ COBJS-y += mb862xx.o
 +COBJS-y += s3c2410_fb.o
  COBJS-y += sed13806.o
  COBJS-y += sed156x.o