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

laforge at sita.openmoko.org laforge at sita.openmoko.org
Thu Feb 8 21:13:16 CET 2007


Author: laforge
Date: 2007-02-08 21:13:15 +0100 (Thu, 08 Feb 2007)
New Revision: 925

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


Modified: trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch	2007-02-08 20:12:54 UTC (rev 924)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch	2007-02-08 20:13:15 UTC (rev 925)
@@ -2,8 +2,8 @@
 
 Index: u-boot/drivers/Makefile
 ===================================================================
---- u-boot.orig/drivers/Makefile	2007-02-08 14:45:10.000000000 +0100
-+++ u-boot/drivers/Makefile	2007-02-08 14:45:37.000000000 +0100
+--- u-boot.orig/drivers/Makefile	2007-02-08 20:59:56.000000000 +0100
++++ u-boot/drivers/Makefile	2007-02-08 21:01:21.000000000 +0100
 @@ -46,7 +46,7 @@
  	  sl811_usb.o sm501.o smc91111.o smiLynxEM.o \
  	  status_led.o sym53c8xx.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-02-08 14:45:37.000000000 +0100
++++ u-boot/drivers/usbdcore_s3c2410.c	2007-02-08 21:01:21.000000000 +0100
 @@ -0,0 +1,708 @@
 +/* S3C2410 USB Device Controller Driver for u-boot
 + *
@@ -729,7 +729,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-02-08 14:45:37.000000000 +0100
++++ u-boot/drivers/usbdcore_s3c2410.h	2007-02-08 21:01:21.000000000 +0100
 @@ -0,0 +1,273 @@
 +/* linux/include/asm/arch-s3c2410/regs-udc.h
 + *
@@ -1006,8 +1006,8 @@
 +#endif
 Index: u-boot/include/s3c2410.h
 ===================================================================
---- u-boot.orig/include/s3c2410.h	2007-02-08 14:45:09.000000000 +0100
-+++ u-boot/include/s3c2410.h	2007-02-08 14:45:37.000000000 +0100
+--- u-boot.orig/include/s3c2410.h	2007-02-08 20:59:56.000000000 +0100
++++ u-boot/include/s3c2410.h	2007-02-08 21:01:21.000000000 +0100
 @@ -233,4 +233,40 @@
  		 rINTPND;\
  		 }
@@ -1051,8 +1051,8 @@
  #endif /*__S3C2410_H__*/
 Index: u-boot/drivers/usbdcore_ep0.c
 ===================================================================
---- u-boot.orig/drivers/usbdcore_ep0.c	2007-02-08 14:33:38.000000000 +0100
-+++ u-boot/drivers/usbdcore_ep0.c	2007-02-08 14:47:19.000000000 +0100
+--- u-boot.orig/drivers/usbdcore_ep0.c	2007-02-08 21:01:12.000000000 +0100
++++ u-boot/drivers/usbdcore_ep0.c	2007-02-08 21:02:28.000000000 +0100
 @@ -43,7 +43,7 @@
  
  #include <common.h>
@@ -1092,7 +1092,7 @@
  		}
  		/*dbg_ep0(3, "copied device configuration, actual_length: %x", urb->actual_length); */
  		break;
-@@ -251,11 +245,9 @@
+@@ -250,11 +244,9 @@
  					 index);
  				return -1;
  			}
@@ -1102,12 +1102,12 @@
 -				     max);
 -
 +			urb->buffer = configuration_descriptor;
-+			urb->actual_length = 
++			urb->actual_length =
 +				MIN(le16_to_cpu(configuration_descriptor->wTotalLength), max);
+ 		}
+ 		break;
  
- 			/* iterate across interfaces for specified configuration */
- 			dbg_ep0 (0, "bNumInterfaces: %d",
-@@ -642,7 +634,8 @@
+@@ -545,7 +537,8 @@
  			/*dbg_ep0(2, "address: %d %d %d", */
  			/*        request->wValue, le16_to_cpu(request->wValue), device->address); */
  
@@ -1119,8 +1119,8 @@
  		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-02-08 14:45:24.000000000 +0100
-+++ u-boot/include/configs/neo1973.h	2007-02-08 14:45:37.000000000 +0100
+--- u-boot.orig/include/configs/neo1973.h	2007-02-08 20:59:56.000000000 +0100
++++ u-boot/include/configs/neo1973.h	2007-02-08 21:01:21.000000000 +0100
 @@ -173,6 +173,18 @@
  #define CONFIG_USB_OHCI		1
  #endif
@@ -1142,8 +1142,8 @@
   */
 Index: u-boot/cpu/arm920t/s3c24x0/interrupts.c
 ===================================================================
---- u-boot.orig/cpu/arm920t/s3c24x0/interrupts.c	2007-02-08 14:45:24.000000000 +0100
-+++ u-boot/cpu/arm920t/s3c24x0/interrupts.c	2007-02-08 14:45:37.000000000 +0100
+--- u-boot.orig/cpu/arm920t/s3c24x0/interrupts.c	2007-02-08 20:59:56.000000000 +0100
++++ u-boot/cpu/arm920t/s3c24x0/interrupts.c	2007-02-08 21:01:21.000000000 +0100
 @@ -222,6 +222,13 @@
  	S3C24X0_INTERRUPT * irq = S3C24X0_GetBase_INTERRUPT();
  	u_int32_t intpnd = irq->INTPND;
@@ -1160,8 +1160,8 @@
  
 Index: u-boot/drivers/usbtty.h
 ===================================================================
---- u-boot.orig/drivers/usbtty.h	2007-02-08 14:45:26.000000000 +0100
-+++ u-boot/drivers/usbtty.h	2007-02-08 14:45:37.000000000 +0100
+--- u-boot.orig/drivers/usbtty.h	2007-02-08 20:59:56.000000000 +0100
++++ u-boot/drivers/usbtty.h	2007-02-08 21:01:21.000000000 +0100
 @@ -29,6 +29,8 @@
  #include "usbdcore_mpc8xx.h"
  #elif defined(CONFIG_OMAP1510)





More information about the commitlog mailing list