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

[laforge at sita.openmoko.org]

Author: laforge
Date: 2007-03-26 16:16:13 +0200 (Mon, 26 Mar 2007)
New Revision: 1505

Modified:
   trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch
Log:
fix compilation


Modified: trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch	2007-03-26 13:15:00 UTC (rev 1504)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch	2007-03-26 14:16:13 UTC (rev 1505)
@@ -2,8 +2,8 @@
 
 Index: u-boot/drivers/Makefile
 ===================================================================
---- u-boot.orig/drivers/Makefile	2007-03-26 14:47:11.000000000 +0200
-+++ u-boot/drivers/Makefile	2007-03-26 15:12:30.000000000 +0200
+--- u-boot.orig/drivers/Makefile	2007-03-26 16:07:36.000000000 +0200
++++ u-boot/drivers/Makefile	2007-03-26 16:09:00.000000000 +0200
 @@ -46,7 +46,7 @@
  	  sl811_usb.o sm501.o smc91111.o smiLynxEM.o \
  	  status_led.o sym53c8xx.o systemace.o ahci.o \
@@ -16,7 +16,7 @@
 Index: u-boot/drivers/usbdcore_s3c2410.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/drivers/usbdcore_s3c2410.c	2007-03-26 15:13:28.000000000 +0200
++++ u-boot/drivers/usbdcore_s3c2410.c	2007-03-26 16:08:57.000000000 +0200
 @@ -0,0 +1,732 @@
 +/* S3C2410 USB Device Controller Driver for u-boot
 + *
@@ -637,7 +637,7 @@
 +{
 +	debug("connect, enable Pullup\n");
 +	S3C24X0_INTERRUPT * irq = S3C24X0_GetBase_INTERRUPT();
-+#if defined(CONFIG_ARCH_GTA01_v4) || defined(CONFIG_ARCH_GTA01B_v2) || \\
++#if defined(CONFIG_ARCH_GTA01_v4) || defined(CONFIG_ARCH_GTA01B_v2) || \
 +    defined(CONFIG_ARCH_GTA01B_v3) || defined(CONFIG_ARCH_GTA01B_v4)
 +	S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
 +
@@ -657,7 +657,7 @@
 +{
 +	debug("disconnect, disable Pullup\n");
 +	S3C24X0_INTERRUPT * irq = S3C24X0_GetBase_INTERRUPT();
-+#if defined(CONFIG_ARCH_GTA01_v4) || defined(CONFIG_ARCH_GTA01B_v2) || \\
++#if defined(CONFIG_ARCH_GTA01_v4) || defined(CONFIG_ARCH_GTA01B_v2) || \
 +    defined(CONFIG_ARCH_GTA01B_v3) || defined(CONFIG_ARCH_GTA01B_v4)
 +	S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
 +
@@ -753,7 +753,7 @@
 Index: u-boot/drivers/usbdcore_s3c2410.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/drivers/usbdcore_s3c2410.h	2007-03-26 15:12:30.000000000 +0200
++++ u-boot/drivers/usbdcore_s3c2410.h	2007-03-26 16:07:59.000000000 +0200
 @@ -0,0 +1,273 @@
 +/* linux/include/asm/arch-s3c2410/regs-udc.h
 + *
@@ -1030,8 +1030,8 @@
 +#endif
 Index: u-boot/drivers/usbdcore_ep0.c
 ===================================================================
---- u-boot.orig/drivers/usbdcore_ep0.c	2007-03-26 15:12:29.000000000 +0200
-+++ u-boot/drivers/usbdcore_ep0.c	2007-03-26 15:12:30.000000000 +0200
+--- u-boot.orig/drivers/usbdcore_ep0.c	2007-03-26 16:07:59.000000000 +0200
++++ u-boot/drivers/usbdcore_ep0.c	2007-03-26 16:09:00.000000000 +0200
 @@ -43,7 +43,7 @@
  
  #include <common.h>
@@ -1127,9 +1127,9 @@
  		case USB_REQ_SET_DESCRIPTOR:	/* XXX should we support this? */
 Index: u-boot/include/configs/neo1973.h
 ===================================================================
---- u-boot.orig/include/configs/neo1973.h	2007-03-26 15:12:27.000000000 +0200
-+++ u-boot/include/configs/neo1973.h	2007-03-26 15:12:30.000000000 +0200
-@@ -171,6 +171,16 @@
+--- u-boot.orig/include/configs/neo1973.h	2007-03-26 16:07:59.000000000 +0200
++++ u-boot/include/configs/neo1973.h	2007-03-26 16:09:01.000000000 +0200
+@@ -173,6 +173,16 @@
  #define CONFIG_USB_OHCI		1
  #endif
  
@@ -1148,8 +1148,8 @@
   */
 Index: u-boot/cpu/arm920t/s3c24x0/interrupts.c
 ===================================================================
---- u-boot.orig/cpu/arm920t/s3c24x0/interrupts.c	2007-03-26 15:12:29.000000000 +0200
-+++ u-boot/cpu/arm920t/s3c24x0/interrupts.c	2007-03-26 15:12:30.000000000 +0200
+--- u-boot.orig/cpu/arm920t/s3c24x0/interrupts.c	2007-03-26 16:07:59.000000000 +0200
++++ u-boot/cpu/arm920t/s3c24x0/interrupts.c	2007-03-26 16:07:59.000000000 +0200
 @@ -222,6 +222,13 @@
  	S3C24X0_INTERRUPT * irq = S3C24X0_GetBase_INTERRUPT();
  	u_int32_t intpnd = irq->INTPND;
@@ -1166,8 +1166,8 @@
  
 Index: u-boot/drivers/usbtty.h
 ===================================================================
---- u-boot.orig/drivers/usbtty.h	2007-03-26 15:12:29.000000000 +0200
-+++ u-boot/drivers/usbtty.h	2007-03-26 15:12:30.000000000 +0200
+--- u-boot.orig/drivers/usbtty.h	2007-03-26 16:07:59.000000000 +0200
++++ u-boot/drivers/usbtty.h	2007-03-26 16:09:00.000000000 +0200
 @@ -29,6 +29,8 @@
  #include "usbdcore_mpc8xx.h"
  #elif defined(CONFIG_OMAP1510)
@@ -1179,8 +1179,8 @@
  #include <config.h>
 Index: u-boot/board/neo1973/cmd_neo1973.c
 ===================================================================
---- u-boot.orig/board/neo1973/cmd_neo1973.c	2007-03-26 14:47:16.000000000 +0200
-+++ u-boot/board/neo1973/cmd_neo1973.c	2007-03-26 15:12:30.000000000 +0200
+--- u-boot.orig/board/neo1973/cmd_neo1973.c	2007-03-26 16:07:36.000000000 +0200
++++ u-boot/board/neo1973/cmd_neo1973.c	2007-03-26 16:07:59.000000000 +0200
 @@ -93,6 +93,18 @@
  			neo1973_vibrator(1);
  		else