r1803 - trunk/src/target/u-boot/patches
laforge at sita.openmoko.org
laforge at sita.openmoko.org
Thu Apr 19 09:45:26 CEST 2007
Author: laforge
Date: 2007-04-19 09:45:25 +0200 (Thu, 19 Apr 2007)
New Revision: 1803
Removed:
trunk/src/target/u-boot/patches/mmc_parititon_fix.patch
Modified:
trunk/src/target/u-boot/patches/series
trunk/src/target/u-boot/patches/uboot-dfu.patch
trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch
Log:
* remove mmc_partition_fix since it is now in mainline u-boot
* make sure uboot-s3c2410_udc and uboot-dfu still apply (makefile hunk update)
* actually copy descriptor in DFU rather than assigning pointers
Deleted: trunk/src/target/u-boot/patches/mmc_parititon_fix.patch
===================================================================
--- trunk/src/target/u-boot/patches/mmc_parititon_fix.patch 2007-04-19 01:26:34 UTC (rev 1802)
+++ trunk/src/target/u-boot/patches/mmc_parititon_fix.patch 2007-04-19 07:45:25 UTC (rev 1803)
@@ -1,16 +0,0 @@
-This fixes a compile problem (no partition support for MMC)
-
-Signed-off-by: Harald Welte <laforge at openmoko.org>
-
-Index: u-boot.git/disk/part.c
-===================================================================
---- u-boot.git.orig/disk/part.c 2007-01-13 17:59:35.000000000 +0100
-+++ u-boot.git/disk/part.c 2007-01-13 17:59:45.000000000 +0100
-@@ -126,6 +126,7 @@
- #if ((CONFIG_COMMANDS & CFG_CMD_IDE) || \
- (CONFIG_COMMANDS & CFG_CMD_SCSI) || \
- (CONFIG_COMMANDS & CFG_CMD_USB) || \
-+ defined(CONFIG_MMC) || \
- defined(CONFIG_SYSTEMACE) )
-
- #if defined(CONFIG_MAC_PARTITION) || \
Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series 2007-04-19 01:26:34 UTC (rev 1802)
+++ trunk/src/target/u-boot/patches/series 2007-04-19 07:45:25 UTC (rev 1803)
@@ -8,7 +8,6 @@
uboot-s3c2410-warnings-fix.patch
uboot-strtoul.patch
uboot-cramfs_but_no_jffs2.patch
-mmc_parititon_fix.patch
nand-read_write_oob.patch
uboot-arm920t-gd_in_irq.patch
uboot-arm920_s3c2410_irq_demux.patch
Modified: trunk/src/target/u-boot/patches/uboot-dfu.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-dfu.patch 2007-04-19 01:26:34 UTC (rev 1802)
+++ trunk/src/target/u-boot/patches/uboot-dfu.patch 2007-04-19 07:45:25 UTC (rev 1803)
@@ -18,7 +18,7 @@
#if 0
#define dbg_ep0(lvl,fmt,args...) serial_printf("[%s] %s:%d: "fmt"\n",__FILE__,__FUNCTION__,__LINE__,##args)
#else
-@@ -213,7 +218,7 @@ static int ep0_get_descriptor (struct us
+@@ -213,7 +218,7 @@
urb->buffer = device_descriptor;
urb->actual_length = MIN(sizeof(*device_descriptor), max);
}
@@ -27,7 +27,7 @@
break;
case USB_DESCRIPTOR_TYPE_CONFIGURATION:
-@@ -267,7 +272,24 @@ static int ep0_get_descriptor (struct us
+@@ -267,7 +272,24 @@
return -1;
case USB_DESCRIPTOR_TYPE_ENDPOINT:
return -1;
@@ -52,7 +52,7 @@
{
return -1; /* unsupported at this time */
#if 0
-@@ -294,6 +316,7 @@ static int ep0_get_descriptor (struct us
+@@ -294,6 +316,7 @@
max);
#endif
}
@@ -60,7 +60,7 @@
break;
case USB_DESCRIPTOR_TYPE_REPORT:
{
-@@ -388,6 +411,24 @@ int ep0_recv_setup (struct urb *urb)
+@@ -388,6 +411,24 @@
le16_to_cpu (request->wLength),
USBD_DEVICE_REQUESTS (request->bRequest));
@@ -85,7 +85,7 @@
/* handle USB Standard Request (c.f. USB Spec table 9-2) */
if ((request->bmRequestType & USB_REQ_TYPE_MASK) != 0) {
if (device->device_state <= STATE_CONFIGURED)
-@@ -570,7 +611,8 @@ int ep0_recv_setup (struct urb *urb)
+@@ -570,7 +611,8 @@
device->interface = le16_to_cpu (request->wIndex);
device->alternate = le16_to_cpu (request->wValue);
/*dbg_ep0(2, "set interface: %d alternate: %d", device->interface, device->alternate); */
@@ -99,7 +99,7 @@
===================================================================
--- /dev/null
+++ u-boot/drivers/usbdfu.c
-@@ -0,0 +1,1043 @@
+@@ -0,0 +1,1042 @@
+/*
+ * (C) 2007 by OpenMoko, Inc.
+ * Author: Harald Welte <laforge at openmoko.org>
@@ -586,8 +586,7 @@
+ remain = len;
+
+ debug("copying %u bytes ", remain);
-+// memcpy(urb->buffer, ds->ptr, remain);
-+ urb->buffer = ds->ptr;
++ memcpy(urb->buffer, ds->ptr, remain);
+ ds->ptr += remain;
+ urb->actual_length = remain;
+
@@ -1147,15 +1146,15 @@
===================================================================
--- u-boot.orig/drivers/Makefile
+++ u-boot/drivers/Makefile
-@@ -46,7 +46,7 @@ COBJS = 3c589.o 5701rls.o ali512x.o atme
- sl811_usb.o sm501.o smc91111.o smiLynxEM.o \
+@@ -47,7 +47,7 @@
status_led.o sym53c8xx.o systemace.o ahci.o \
ti_pci1410a.o tigon3.o tsec.o \
+ tsi108_eth.o tsi108_i2c.o tsi108_pci.o \
- usbdcore.o usbdcore_ep0.o usbdcore_omap1510.o usbdcore_s3c2410.o usbtty.o \
+ usbdcore.o usbdfu.o usbdcore_ep0.o usbdcore_omap1510.o usbdcore_s3c2410.o usbtty.o \
videomodes.o w83c553f.o \
ks8695eth.o \
- pxa_pcmcia.o mpc8xx_pcmcia.o tqm8xx_pcmcia.o \
+ pcf50606.o \
Index: u-boot/drivers/usbdcore.c
===================================================================
--- u-boot.orig/drivers/usbdcore.c
@@ -1168,7 +1167,7 @@
#define MAX_INTERFACES 2
-@@ -212,6 +213,10 @@ struct usb_alternate_instance *usbd_devi
+@@ -212,6 +213,10 @@
*/
struct usb_device_descriptor *usbd_device_device_descriptor (struct usb_device_instance *device, int port)
{
@@ -1179,7 +1178,7 @@
return (device->device_descriptor);
}
-@@ -232,6 +237,10 @@ struct usb_configuration_descriptor *usb
+@@ -232,6 +237,10 @@
if (!(configuration_instance = usbd_device_configuration_instance (device, port, configuration))) {
return NULL;
}
@@ -1190,7 +1189,7 @@
return (configuration_instance->configuration_descriptor);
}
-@@ -253,6 +262,13 @@ struct usb_interface_descriptor *usbd_de
+@@ -253,6 +262,13 @@
if (!(interface_instance = usbd_device_interface_instance (device, port, configuration, interface))) {
return NULL;
}
@@ -1204,7 +1203,7 @@
if ((alternate < 0) || (alternate >= interface_instance->alternates)) {
return NULL;
}
-@@ -681,4 +697,7 @@ void usbd_device_event_irq (struct usb_d
+@@ -681,4 +697,7 @@
/* usbdbg("calling device->event"); */
device->event(device, event, data);
}
@@ -1225,7 +1224,7 @@
#include <config.h> /* If defined, override Linux identifiers with
* vendor specific ones */
-@@ -118,7 +120,7 @@ extern struct usb_string_descriptor **us
+@@ -118,7 +120,7 @@
static unsigned short rx_endpoint = 0;
static unsigned short tx_endpoint = 0;
static unsigned short interface_count = 0;
@@ -1234,7 +1233,7 @@
/* USB Descriptor Strings */
static u8 wstrLang[4] = {4,USB_DT_STRING,0x9,0x4};
-@@ -169,6 +171,10 @@ struct acm_config_desc {
+@@ -169,6 +171,10 @@
struct usb_interface_descriptor data_class_interface;
struct usb_endpoint_descriptor
data_endpoints[NUM_ENDPOINTS-1] __attribute__((packed));
@@ -1245,7 +1244,7 @@
} __attribute__((packed));
static struct acm_config_desc acm_configuration_descriptors[NUM_CONFIGS] = {
-@@ -179,7 +185,11 @@ static struct acm_config_desc acm_config
+@@ -179,7 +185,11 @@
.bDescriptorType = USB_DT_CONFIG,
.wTotalLength =
cpu_to_le16(sizeof(struct acm_config_desc)),
@@ -1257,7 +1256,7 @@
.bConfigurationValue = 1,
.iConfiguration = STR_CONFIG,
.bmAttributes =
-@@ -278,6 +288,11 @@ static struct acm_config_desc acm_config
+@@ -278,6 +288,11 @@
.bInterval = 0xFF,
},
},
@@ -1269,7 +1268,7 @@
},
};
-@@ -390,7 +405,7 @@ static int fill_buffer (circbuf_t * buf)
+@@ -390,7 +405,7 @@
void usbtty_poll (void);
/* utility function for converting char* to wide string used by USB */
@@ -1278,7 +1277,7 @@
{
int i;
for (i = 0; i < strlen (str) && str[i]; i++){
-@@ -652,6 +667,9 @@ static void usbtty_init_instances (void)
+@@ -652,6 +667,9 @@
device_instance->bus = bus_instance;
device_instance->configurations = NUM_CONFIGS;
device_instance->configuration_instance_array = config_instance;
@@ -1292,7 +1291,7 @@
===================================================================
--- u-boot.orig/include/configs/neo1973.h
+++ u-boot/include/configs/neo1973.h
-@@ -165,7 +165,7 @@
+@@ -167,7 +167,7 @@
*/
#define CONFIG_STACKSIZE (128*1024) /* regular stack */
#ifdef CONFIG_USE_IRQ
@@ -1301,7 +1300,7 @@
#define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */
#endif
-@@ -182,6 +182,10 @@
+@@ -184,6 +184,10 @@
#define CONFIG_USBD_MANUFACTURER "OpenMoko, Inc"
#define CONFIG_USBD_PRODUCT_NAME "Neo1973 Bootloader " U_BOOT_VERSION
#define CONFIG_EXTRA_ENV_SETTINGS "usbtty=cdc_acm\0"
@@ -1527,7 +1526,7 @@
#define MAX_URBS_QUEUED 5
-@@ -475,7 +476,11 @@ typedef struct urb_link {
+@@ -475,7 +476,11 @@
* function driver to inform it that data has arrived.
*/
@@ -1539,7 +1538,7 @@
struct urb {
struct usb_endpoint_instance *endpoint;
-@@ -603,6 +608,12 @@ struct usb_device_instance {
+@@ -603,6 +608,12 @@
unsigned long usbd_rxtx_timestamp;
unsigned long usbd_last_rxtx_timestamp;
@@ -1552,7 +1551,7 @@
};
/* Bus Interface configuration structure
-@@ -632,6 +643,8 @@ extern char *usbd_device_status[];
+@@ -632,6 +643,8 @@
extern char *usbd_device_requests[];
extern char *usbd_device_descriptors[];
Modified: trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch 2007-04-19 01:26:34 UTC (rev 1802)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch 2007-04-19 07:45:25 UTC (rev 1803)
@@ -2,12 +2,12 @@
Index: u-boot/drivers/Makefile
===================================================================
---- u-boot.orig/drivers/Makefile 2007-03-28 18:50:13.000000000 +0200
-+++ u-boot/drivers/Makefile 2007-03-28 18:50:57.000000000 +0200
-@@ -46,7 +46,7 @@
- sl811_usb.o sm501.o smc91111.o smiLynxEM.o \
+--- u-boot.orig/drivers/Makefile
++++ u-boot/drivers/Makefile
+@@ -47,7 +47,7 @@
status_led.o sym53c8xx.o systemace.o ahci.o \
ti_pci1410a.o tigon3.o tsec.o \
+ tsi108_eth.o tsi108_i2c.o tsi108_pci.o \
- usbdcore.o usbdcore_ep0.o usbdcore_omap1510.o usbtty.o \
+ usbdcore.o usbdcore_ep0.o usbdcore_omap1510.o usbdcore_s3c2410.o usbtty.o \
videomodes.o w83c553f.o \
@@ -15,8 +15,8 @@
pcf50606.o \
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-28 18:50:57.000000000 +0200
+--- /dev/null
++++ u-boot/drivers/usbdcore_s3c2410.c
@@ -0,0 +1,721 @@
+/* S3C2410 USB Device Controller Driver for u-boot
+ *
@@ -741,8 +741,8 @@
+#endif /* CONFIG_S3C2410 && CONFIG_USB_DEVICE */
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-28 18:50:57.000000000 +0200
+--- /dev/null
++++ u-boot/drivers/usbdcore_s3c2410.h
@@ -0,0 +1,273 @@
+/* linux/include/asm/arch-s3c2410/regs-udc.h
+ *
@@ -1019,8 +1019,8 @@
+#endif
Index: u-boot/drivers/usbdcore_ep0.c
===================================================================
---- u-boot.orig/drivers/usbdcore_ep0.c 2007-03-28 18:50:57.000000000 +0200
-+++ u-boot/drivers/usbdcore_ep0.c 2007-03-28 18:50:57.000000000 +0200
+--- u-boot.orig/drivers/usbdcore_ep0.c
++++ u-boot/drivers/usbdcore_ep0.c
@@ -43,7 +43,7 @@
#include <common.h>
@@ -1116,8 +1116,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-03-28 18:50:56.000000000 +0200
-+++ u-boot/include/configs/neo1973.h 2007-03-28 18:50:57.000000000 +0200
+--- u-boot.orig/include/configs/neo1973.h
++++ u-boot/include/configs/neo1973.h
@@ -173,6 +173,16 @@
#define CONFIG_USB_OHCI 1
#endif
@@ -1137,8 +1137,8 @@
*/
Index: u-boot/cpu/arm920t/s3c24x0/interrupts.c
===================================================================
---- u-boot.orig/cpu/arm920t/s3c24x0/interrupts.c 2007-03-28 18:50:57.000000000 +0200
-+++ u-boot/cpu/arm920t/s3c24x0/interrupts.c 2007-03-28 18:50:57.000000000 +0200
+--- u-boot.orig/cpu/arm920t/s3c24x0/interrupts.c
++++ u-boot/cpu/arm920t/s3c24x0/interrupts.c
@@ -222,6 +222,13 @@
S3C24X0_INTERRUPT * irq = S3C24X0_GetBase_INTERRUPT();
u_int32_t intpnd = irq->INTPND;
@@ -1155,8 +1155,8 @@
Index: u-boot/drivers/usbtty.h
===================================================================
---- u-boot.orig/drivers/usbtty.h 2007-03-28 18:50:56.000000000 +0200
-+++ u-boot/drivers/usbtty.h 2007-03-28 18:50:57.000000000 +0200
+--- u-boot.orig/drivers/usbtty.h
++++ u-boot/drivers/usbtty.h
@@ -29,6 +29,8 @@
#include "usbdcore_mpc8xx.h"
#elif defined(CONFIG_OMAP1510)
@@ -1168,8 +1168,8 @@
#include <config.h>
Index: u-boot/board/neo1973/cmd_neo1973.c
===================================================================
---- u-boot.orig/board/neo1973/cmd_neo1973.c 2007-03-28 18:50:14.000000000 +0200
-+++ u-boot/board/neo1973/cmd_neo1973.c 2007-03-28 18:50:57.000000000 +0200
+--- u-boot.orig/board/neo1973/cmd_neo1973.c
++++ u-boot/board/neo1973/cmd_neo1973.c
@@ -93,6 +93,18 @@
neo1973_vibrator(1);
else
@@ -1198,8 +1198,8 @@
#endif /* CFG_CMD_BDI */
Index: u-boot/board/neo1973/Makefile
===================================================================
---- u-boot.orig/board/neo1973/Makefile 2007-03-28 18:50:14.000000000 +0200
-+++ u-boot/board/neo1973/Makefile 2007-03-28 18:50:57.000000000 +0200
+--- u-boot.orig/board/neo1973/Makefile
++++ u-boot/board/neo1973/Makefile
@@ -25,7 +25,7 @@
LIB = lib$(BOARD).a
@@ -1211,8 +1211,8 @@
$(LIB): $(OBJS) $(SOBJS)
Index: u-boot/board/neo1973/udc.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/udc.c 2007-03-28 18:51:09.000000000 +0200
+--- /dev/null
++++ u-boot/board/neo1973/udc.c
@@ -0,0 +1,23 @@
+
+#include <common.h>
@@ -1239,8 +1239,8 @@
+}
Index: u-boot/include/usbdcore.h
===================================================================
---- u-boot.orig/include/usbdcore.h 2007-03-28 18:50:57.000000000 +0200
-+++ u-boot/include/usbdcore.h 2007-03-28 18:50:57.000000000 +0200
+--- u-boot.orig/include/usbdcore.h
++++ u-boot/include/usbdcore.h
@@ -671,4 +671,10 @@
void usbd_rcv_complete(struct usb_endpoint_instance *endpoint, int len, int urb_bad);
void usbd_tx_complete (struct usb_endpoint_instance *endpoint);
More information about the commitlog
mailing list
