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

[laforge at sita.openmoko.org]

Author: laforge
Date: 2007-09-07 06:26:34 +0200 (Fri, 07 Sep 2007)
New Revision: 2938

Modified:
   trunk/src/target/u-boot/patches/uboot-s3c2440.patch
   trunk/src/target/u-boot/patches/uboot-s3c2442.patch
   trunk/src/target/u-boot/patches/uboot-s3c24xx_multi_serial.patch
Log:
re-sync with u-boot mainline


Modified: trunk/src/target/u-boot/patches/uboot-s3c2440.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2440.patch	2007-09-07 04:13:50 UTC (rev 2937)
+++ trunk/src/target/u-boot/patches/uboot-s3c2440.patch	2007-09-07 04:26:34 UTC (rev 2938)
@@ -1466,10 +1466,10 @@
  #if defined(CONFIG_SERIAL1)
  	return &s3c24xx_serial0_device;
  #elif defined(CONFIG_SERIAL2)
-@@ -121,7 +121,7 @@
+@@ -129,7 +129,7 @@
+ #if defined (CONFIG_STUART)
+ 	serial_register(&serial_stuart_device);
  #endif
- #endif /* CFG_NS16550_SERIAL */
- 
 -#if defined(CONFIG_S3C2410)
 +#if defined(CONFIG_S3C2410) || defined(CONFIG_S3C2440)
  	serial_register(&s3c24xx_serial0_device);

Modified: trunk/src/target/u-boot/patches/uboot-s3c2442.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2442.patch	2007-09-07 04:13:50 UTC (rev 2937)
+++ trunk/src/target/u-boot/patches/uboot-s3c2442.patch	2007-09-07 04:26:34 UTC (rev 2938)
@@ -642,10 +642,10 @@
  #if defined(CONFIG_SERIAL1)
  	return &s3c24xx_serial0_device;
  #elif defined(CONFIG_SERIAL2)
-@@ -121,7 +122,8 @@
+@@ -129,7 +130,8 @@
+ #if defined (CONFIG_STUART)
+ 	serial_register(&serial_stuart_device);
  #endif
- #endif /* CFG_NS16550_SERIAL */
- 
 -#if defined(CONFIG_S3C2410) || defined(CONFIG_S3C2440)
 +#if defined(CONFIG_S3C2410) || defined(CONFIG_S3C2440) || \
 +    defined(CONFIG_S3C2442)

Modified: trunk/src/target/u-boot/patches/uboot-s3c24xx_multi_serial.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c24xx_multi_serial.patch	2007-09-07 04:13:50 UTC (rev 2937)
+++ trunk/src/target/u-boot/patches/uboot-s3c24xx_multi_serial.patch	2007-09-07 04:26:34 UTC (rev 2938)
@@ -19,17 +19,15 @@
  #else
  #error No default console
  #endif
-@@ -110,6 +120,13 @@
- 	serial_register(&eserial4_device);
+@@ -119,6 +129,11 @@
+ #if defined (CONFIG_STUART)
+ 	serial_register(&serial_stuart_device);
  #endif
- #endif /* CFG_NS16550_SERIAL */
-+
 +#if defined(CONFIG_S3C2410)
 +	serial_register(&s3c24xx_serial0_device);
 +	serial_register(&s3c24xx_serial1_device);
 +	serial_register(&s3c24xx_serial2_device);
 +#endif
-+
  	serial_assign (default_serial_console ()->name);
  }
  
@@ -288,13 +286,13 @@
 +extern struct serial_device s3c24xx_serial2_device;
 +#endif
  
- extern void serial_initialize(void);
- extern void serial_devices_init(void);
+ extern struct serial_device serial_ffuart_device;
+ extern struct serial_device serial_btuart_device;
 Index: u-boot/lib_arm/board.c
 ===================================================================
 --- u-boot.orig/lib_arm/board.c
 +++ u-boot/lib_arm/board.c
-@@ -345,6 +345,10 @@
+@@ -349,6 +349,10 @@
  #endif
  	}