Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r1148 - trunk/src/host/dfu-util/src ([EMAIL PROTECTED])
2. r1149 - trunk/src/target/OM-2007/openmoko-libs/libmokoui
([EMAIL PROTECTED])
3. r1150 - trunk/oe/conf/distro ([EMAIL PROTECTED])
4. r1151 - trunk/src/target/u-boot/patches ([EMAIL PROTECTED])
5. r1152 - trunk/src/host/dfu-util/src ([EMAIL PROTECTED])
6. r1153 -
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep
([EMAIL PROTECTED])
7. r1154 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
8. r1155 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: werner
Date: 2007-02-27 14:24:30 +0100 (Tue, 27 Feb 2007)
New Revision: 1148
Modified:
trunk/src/host/dfu-util/src/sam7dfu.c
Log:
sam7dfu.c (sam7dfu_do_upload): initialize total_bytes to zero
sam7dfu.c (sam7dfu_do_upload): set "ret" to total_bytes on short write
Modified: trunk/src/host/dfu-util/src/sam7dfu.c
===================================================================
--- trunk/src/host/dfu-util/src/sam7dfu.c 2007-02-27 08:37:06 UTC (rev
1147)
+++ trunk/src/host/dfu-util/src/sam7dfu.c 2007-02-27 13:24:30 UTC (rev
1148)
@@ -18,7 +18,7 @@
int sam7dfu_do_upload(struct usb_dev_handle *usb_handle, int interface,
int xfer_size, const char *fname)
{
- int ret, fd, total_bytes;
+ int ret, fd, total_bytes = 0;
char *buf = malloc(xfer_size);
if (!buf)
@@ -41,6 +41,7 @@
if (write_rc < rc) {
fprintf(stderr, "Short write: %s\n",
strerror(errno));
+ ret = total_bytes;
goto out_close;
}
total_bytes += rc;
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-02-27 15:18:35 +0100 (Tue, 27 Feb 2007)
New Revision: 1149
Modified:
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.c
Log:
* Prevent MokoAlignment from attempting to allocate negative width or height to
child widgets
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.c
2007-02-27 13:24:30 UTC (rev 1148)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.c
2007-02-27 14:18:35 UTC (rev 1149)
@@ -201,6 +201,8 @@
child_allocation.y = alignment->yalign * (height -
child_allocation.height) + border_width + p_top;
}
+ child_allocation.width = MAX (child_allocation.width, 0);
+ child_allocation.height = MAX (child_allocation.height, 0);
gtk_widget_size_allocate (bin->child, &child_allocation);
}
}
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-02-27 20:32:39 +0100 (Tue, 27 Feb 2007)
New Revision: 1150
Modified:
trunk/oe/conf/distro/openmoko.conf
Log:
oe/conf/distro/openmoko.conf: merge CVS_TARBALL_PATCH from Rod Whitby. closes
#214
Modified: trunk/oe/conf/distro/openmoko.conf
===================================================================
--- trunk/oe/conf/distro/openmoko.conf 2007-02-27 14:18:35 UTC (rev 1149)
+++ trunk/oe/conf/distro/openmoko.conf 2007-02-27 19:32:39 UTC (rev 1150)
@@ -26,3 +26,7 @@
PREFERRED_VERSION_glibc-intermediate ?= "2.4"
PREFERRED_VERSION_lmsensors-apps ?= "2.10.1"
+
+CVS_TARBALL_STASH = "\
+ http://downloads.openmoko.org/sources/ \
+ "
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-02-27 21:15:03 +0100 (Tue, 27 Feb 2007)
New Revision: 1151
Modified:
trunk/src/target/u-boot/patches/uboot-dfu.patch
Log:
drivers/usbdfu.c (get_partition_nand): mtdparts_init indicates failure with
non-zero return code, not just negative
drivers/usbdfu.c (get_partition_nand): check that "devices" is non-empty before
using its first element
Modified: trunk/src/target/u-boot/patches/uboot-dfu.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-dfu.patch 2007-02-27 19:32:39 UTC
(rev 1150)
+++ trunk/src/target/u-boot/patches/uboot-dfu.patch 2007-02-27 20:15:03 UTC
(rev 1151)
@@ -1,7 +1,7 @@
Index: u-boot/drivers/usbdcore_ep0.c
===================================================================
---- u-boot.orig/drivers/usbdcore_ep0.c 2007-02-27 00:38:10.000000000 +0100
-+++ u-boot/drivers/usbdcore_ep0.c 2007-02-27 00:38:11.000000000 +0100
+--- u-boot.orig/drivers/usbdcore_ep0.c
++++ u-boot/drivers/usbdcore_ep0.c
@@ -42,10 +42,15 @@
*/
@@ -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 @@
+@@ -213,7 +218,7 @@ static int ep0_get_descriptor (struct us
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 @@
+@@ -267,7 +272,24 @@ static int ep0_get_descriptor (struct us
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 @@
+@@ -294,6 +316,7 @@ static int ep0_get_descriptor (struct us
max);
#endif
}
@@ -60,7 +60,7 @@
break;
case USB_DESCRIPTOR_TYPE_REPORT:
{
-@@ -388,6 +411,24 @@
+@@ -388,6 +411,24 @@ int ep0_recv_setup (struct urb *urb)
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 @@
+@@ -570,7 +611,8 @@ int ep0_recv_setup (struct urb *urb)
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); */
@@ -97,9 +97,9 @@
case USB_REQ_GET_STATUS:
Index: u-boot/drivers/usbdfu.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/drivers/usbdfu.c 2007-02-27 00:38:11.000000000 +0100
-@@ -0,0 +1,995 @@
+--- /dev/null
++++ u-boot/drivers/usbdfu.c
+@@ -0,0 +1,997 @@
+/*
+ * (C) 2007 by OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -197,8 +197,10 @@
+ struct list_head *pentry;
+ int i;
+
-+ if (mtdparts_init() < 0)
++ if (mtdparts_init())
+ return NULL;
++ if (list_empty(&devices))
++ return NULL;
+
+ dev = list_entry(devices.next, struct mtd_device, link);
+ i = 0;
@@ -1097,9 +1099,9 @@
+#endif /* CONFIG_USBD_DFU */
Index: u-boot/drivers/Makefile
===================================================================
---- u-boot.orig/drivers/Makefile 2007-02-27 00:38:10.000000000 +0100
-+++ u-boot/drivers/Makefile 2007-02-27 00:38:11.000000000 +0100
-@@ -46,7 +46,7 @@
+--- 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 \
status_led.o sym53c8xx.o systemace.o ahci.o \
ti_pci1410a.o tigon3.o tsec.o \
@@ -1110,8 +1112,8 @@
pxa_pcmcia.o mpc8xx_pcmcia.o tqm8xx_pcmcia.o \
Index: u-boot/drivers/usbdcore.c
===================================================================
---- u-boot.orig/drivers/usbdcore.c 2007-02-27 00:37:59.000000000 +0100
-+++ u-boot/drivers/usbdcore.c 2007-02-27 00:38:11.000000000 +0100
+--- u-boot.orig/drivers/usbdcore.c
++++ u-boot/drivers/usbdcore.c
@@ -31,6 +31,7 @@
#include <malloc.h>
@@ -1120,7 +1122,7 @@
#define MAX_INTERFACES 2
-@@ -212,6 +213,10 @@
+@@ -212,6 +213,10 @@ struct usb_alternate_instance *usbd_devi
*/
struct usb_device_descriptor *usbd_device_device_descriptor (struct
usb_device_instance *device, int port)
{
@@ -1131,7 +1133,7 @@
return (device->device_descriptor);
}
-@@ -232,6 +237,10 @@
+@@ -232,6 +237,10 @@ struct usb_configuration_descriptor *usb
if (!(configuration_instance = usbd_device_configuration_instance
(device, port, configuration))) {
return NULL;
}
@@ -1142,7 +1144,7 @@
return (configuration_instance->configuration_descriptor);
}
-@@ -253,6 +262,13 @@
+@@ -253,6 +262,13 @@ struct usb_interface_descriptor *usbd_de
if (!(interface_instance = usbd_device_interface_instance (device,
port, configuration, interface))) {
return NULL;
}
@@ -1156,7 +1158,7 @@
if ((alternate < 0) || (alternate >= interface_instance->alternates)) {
return NULL;
}
-@@ -681,4 +697,7 @@
+@@ -681,4 +697,7 @@ void usbd_device_event_irq (struct usb_d
/* usbdbg("calling device->event"); */
device->event(device, event, data);
}
@@ -1166,8 +1168,8 @@
}
Index: u-boot/drivers/usbtty.c
===================================================================
---- u-boot.orig/drivers/usbtty.c 2007-02-27 00:38:10.000000000 +0100
-+++ u-boot/drivers/usbtty.c 2007-02-27 00:38:11.000000000 +0100
+--- u-boot.orig/drivers/usbtty.c
++++ u-boot/drivers/usbtty.c
@@ -31,6 +31,8 @@
#include "usbtty.h"
#include "usb_cdc_acm.h"
@@ -1177,7 +1179,7 @@
#include <config.h> /* If defined, override Linux identifiers with
* vendor specific ones */
-@@ -118,7 +120,7 @@
+@@ -118,7 +120,7 @@ extern struct usb_string_descriptor **us
static unsigned short rx_endpoint = 0;
static unsigned short tx_endpoint = 0;
static unsigned short interface_count = 0;
@@ -1186,7 +1188,7 @@
/* USB Descriptor Strings */
static u8 wstrLang[4] = {4,USB_DT_STRING,0x9,0x4};
-@@ -169,6 +171,10 @@
+@@ -169,6 +171,10 @@ struct acm_config_desc {
struct usb_interface_descriptor data_class_interface;
struct usb_endpoint_descriptor
data_endpoints[NUM_ENDPOINTS-1] __attribute__((packed));
@@ -1197,7 +1199,7 @@
} __attribute__((packed));
static struct acm_config_desc acm_configuration_descriptors[NUM_CONFIGS] = {
-@@ -179,7 +185,11 @@
+@@ -179,7 +185,11 @@ static struct acm_config_desc acm_config
.bDescriptorType = USB_DT_CONFIG,
.wTotalLength =
cpu_to_le16(sizeof(struct acm_config_desc)),
@@ -1209,7 +1211,7 @@
.bConfigurationValue = 1,
.iConfiguration = STR_CONFIG,
.bmAttributes =
-@@ -278,6 +288,11 @@
+@@ -278,6 +288,11 @@ static struct acm_config_desc acm_config
.bInterval = 0xFF,
},
},
@@ -1221,7 +1223,7 @@
},
};
-@@ -390,7 +405,7 @@
+@@ -390,7 +405,7 @@ static int fill_buffer (circbuf_t * buf)
void usbtty_poll (void);
/* utility function for converting char* to wide string used by USB */
@@ -1230,7 +1232,7 @@
{
int i;
for (i = 0; i < strlen (str) && str[i]; i++){
-@@ -652,6 +667,9 @@
+@@ -652,6 +667,9 @@ static void usbtty_init_instances (void)
device_instance->bus = bus_instance;
device_instance->configurations = NUM_CONFIGS;
device_instance->configuration_instance_array = config_instance;
@@ -1242,8 +1244,8 @@
memset (bus_instance, 0, sizeof (struct usb_bus_instance));
Index: u-boot/include/configs/neo1973.h
===================================================================
---- u-boot.orig/include/configs/neo1973.h 2007-02-27 00:38:11.000000000
+0100
-+++ u-boot/include/configs/neo1973.h 2007-02-27 00:38:11.000000000 +0100
+--- u-boot.orig/include/configs/neo1973.h
++++ u-boot/include/configs/neo1973.h
@@ -165,7 +165,7 @@
*/
#define CONFIG_STACKSIZE (128*1024) /* regular stack */
@@ -1266,8 +1268,8 @@
* Physical Memory Map
Index: u-boot/include/usb_dfu.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/include/usb_dfu.h 2007-02-27 00:39:48.000000000 +0100
+--- /dev/null
++++ u-boot/include/usb_dfu.h
@@ -0,0 +1,97 @@
+#ifndef _DFU_H
+#define _DFU_H
@@ -1368,8 +1370,8 @@
+#endif /* _DFU_H */
Index: u-boot/include/usb_dfu_descriptors.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/include/usb_dfu_descriptors.h 2007-02-27 00:38:11.000000000
+0100
+--- /dev/null
++++ u-boot/include/usb_dfu_descriptors.h
@@ -0,0 +1,94 @@
+#ifndef _USB_DFU_H
+#define _USB_DFU_H
@@ -1467,8 +1469,8 @@
+#endif /* _USB_DFU_H */
Index: u-boot/include/usbdcore.h
===================================================================
---- u-boot.orig/include/usbdcore.h 2007-02-27 00:38:10.000000000 +0100
-+++ u-boot/include/usbdcore.h 2007-02-27 00:38:11.000000000 +0100
+--- u-boot.orig/include/usbdcore.h
++++ u-boot/include/usbdcore.h
@@ -33,6 +33,7 @@
#include <common.h>
@@ -1477,7 +1479,7 @@
#define MAX_URBS_QUEUED 5
-@@ -475,7 +476,11 @@
+@@ -475,7 +476,11 @@ typedef struct urb_link {
* function driver to inform it that data has arrived.
*/
@@ -1489,7 +1491,7 @@
struct urb {
struct usb_endpoint_instance *endpoint;
-@@ -603,6 +608,12 @@
+@@ -603,6 +608,12 @@ struct usb_device_instance {
unsigned long usbd_rxtx_timestamp;
unsigned long usbd_last_rxtx_timestamp;
@@ -1502,7 +1504,7 @@
};
/* Bus Interface configuration structure
-@@ -632,6 +643,8 @@
+@@ -632,6 +643,8 @@ extern char *usbd_device_status[];
extern char *usbd_device_requests[];
extern char *usbd_device_descriptors[];
@@ -1513,8 +1515,8 @@
urb_link *first_urb_link (urb_link * hd);
Index: u-boot/drivers/usbtty.h
===================================================================
---- u-boot.orig/drivers/usbtty.h 2007-02-27 00:38:10.000000000 +0100
-+++ u-boot/drivers/usbtty.h 2007-02-27 00:38:11.000000000 +0100
+--- u-boot.orig/drivers/usbtty.h
++++ u-boot/drivers/usbtty.h
@@ -71,4 +71,10 @@
#define STR_CTRL_INTERFACE 0x06
#define STR_COUNT 0x07
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-02-27 21:40:11 +0100 (Tue, 27 Feb 2007)
New Revision: 1152
Modified:
trunk/src/host/dfu-util/src/main.c
trunk/src/host/dfu-util/src/sam7dfu.c
Log:
sam7dfu.c (sam7dfu_do_upload, sam7dfu_do_dnload): make error handling more
consistent by printing errors also if system calls fail
main.c (main): exit with non-zero exit status if sam7dfu_do_upload or
sam7dfu_do_dnload fail
Modified: trunk/src/host/dfu-util/src/main.c
===================================================================
--- trunk/src/host/dfu-util/src/main.c 2007-02-27 20:15:03 UTC (rev 1151)
+++ trunk/src/host/dfu-util/src/main.c 2007-02-27 20:40:11 UTC (rev 1152)
@@ -617,12 +617,14 @@
switch (mode) {
case MODE_UPLOAD:
- sam7dfu_do_upload(dif->dev_handle, dif->interface,
- transfer_size, filename);
+ if (sam7dfu_do_upload(dif->dev_handle, dif->interface,
+ transfer_size, filename) < 0)
+ exit(1);
break;
case MODE_DOWNLOAD:
- sam7dfu_do_dnload(dif->dev_handle, dif->interface,
- transfer_size, filename);
+ if (sam7dfu_do_dnload(dif->dev_handle, dif->interface,
+ transfer_size, filename) < 0)
+ exit(1);
break;
default:
fprintf(stderr, "Unsupported mode: %u\n", mode);
Modified: trunk/src/host/dfu-util/src/sam7dfu.c
===================================================================
--- trunk/src/host/dfu-util/src/sam7dfu.c 2007-02-27 20:15:03 UTC (rev
1151)
+++ trunk/src/host/dfu-util/src/sam7dfu.c 2007-02-27 20:40:11 UTC (rev
1152)
@@ -26,6 +26,7 @@
fd = creat(fname, 0644);
if (fd < 0) {
+ perror(fname);
ret = fd;
goto out_free;
}
@@ -74,13 +75,17 @@
fd = open(fname, O_RDONLY);
if (fd < 0) {
+ perror(fname);
ret = fd;
goto out_free;
}
ret = fstat(fd, &st);
- if (ret < 0)
+ if (ret < 0) {
+ perror(fname);
goto out_close;
+ perror(fname);
+ }
if (st.st_size <= 0 /* + DFU_HDR */) {
fprintf(stderr, "File seems a bit too small...\n");
@@ -94,8 +99,10 @@
printf("Starting download: [");
while (bytes_sent < st.st_size /* - DFU_HDR */) {
ret = read(fd, buf, xfer_size);
- if (ret < 0)
+ if (ret < 0) {
+ perror(fname);
goto out_close;
+ }
ret = dfu_download(usb_handle, interface, ret, buf);
if (ret < 0)
goto out_close;
--- End Message ---
--- Begin Message ---
Author: jiang_li
Date: 2007-02-28 03:13:44 +0100 (Wed, 28 Feb 2007)
New Revision: 1153
Modified:
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/mainwin.c
Log:
Thsi commit try to solve the problem of wrong position of the wheel
Modified:
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/mainwin.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/mainwin.c
2007-02-27 20:40:11 UTC (rev 1152)
+++
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/mainwin.c
2007-02-28 02:13:44 UTC (rev 1153)
@@ -4536,6 +4536,7 @@
/*******************************************/
gtk_widget_show_all(GTK_WIDGET(window));
+ gtk_window_present(GTK_WINDOW(window));
gtk_widget_show(GTK_WIDGET(moko_finger_window_get_wheel(window)));
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-02-28 03:45:22 +0100 (Wed, 28 Feb 2007)
New Revision: 1154
Modified:
trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch
Log:
add required CFG_UBOOT_SIZE variable to QT2410 config
Modified: trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch 2007-02-28
02:13:44 UTC (rev 1153)
+++ trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch 2007-02-28
02:45:22 UTC (rev 1154)
@@ -5,9 +5,9 @@
Index: u-boot/Makefile
===================================================================
---- u-boot.orig/Makefile 2007-02-21 10:57:09.000000000 +0100
-+++ u-boot/Makefile 2007-02-21 15:52:58.000000000 +0100
-@@ -1928,6 +1928,9 @@
+--- u-boot.orig/Makefile 2007-02-27 00:38:04.000000000 +0100
++++ u-boot/Makefile 2007-02-28 02:48:47.000000000 +0100
+@@ -1934,6 +1934,9 @@
sbc2410x_config: unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
@@ -20,7 +20,7 @@
Index: u-boot/board/qt2410/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/qt2410/Makefile 2007-02-21 10:58:40.000000000 +0100
++++ u-boot/board/qt2410/Makefile 2007-02-27 00:38:10.000000000 +0100
@@ -0,0 +1,47 @@
+#
+# (C) Copyright 2000, 2001, 2002
@@ -72,7 +72,7 @@
Index: u-boot/board/qt2410/config.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/qt2410/config.mk 2007-02-21 10:58:40.000000000 +0100
++++ u-boot/board/qt2410/config.mk 2007-02-27 00:38:10.000000000 +0100
@@ -0,0 +1,25 @@
+#
+# (C) Copyright 2002
@@ -102,7 +102,7 @@
Index: u-boot/board/qt2410/flash.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/qt2410/flash.c 2007-02-21 10:58:40.000000000 +0100
++++ u-boot/board/qt2410/flash.c 2007-02-27 00:38:10.000000000 +0100
@@ -0,0 +1,435 @@
+/*
+ * (C) Copyright 2002
@@ -542,7 +542,7 @@
Index: u-boot/board/qt2410/lowlevel_init.S
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/qt2410/lowlevel_init.S 2007-02-21 10:58:40.000000000
+0100
++++ u-boot/board/qt2410/lowlevel_init.S 2007-02-27 00:38:10.000000000
+0100
@@ -0,0 +1,173 @@
+/*
+ * Memory Setup stuff - taken from blob memsetup.S
@@ -720,7 +720,7 @@
Index: u-boot/board/qt2410/qt2410.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/qt2410/qt2410.c 2007-02-21 15:27:13.000000000 +0100
++++ u-boot/board/qt2410/qt2410.c 2007-02-27 00:38:10.000000000 +0100
@@ -0,0 +1,128 @@
+/*
+ * (C) 2006 by OpenMoko, Inc.
@@ -853,7 +853,7 @@
Index: u-boot/board/qt2410/u-boot.lds
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/qt2410/u-boot.lds 2007-02-21 10:58:40.000000000 +0100
++++ u-boot/board/qt2410/u-boot.lds 2007-02-27 00:38:10.000000000 +0100
@@ -0,0 +1,58 @@
+/*
+ * (C) Copyright 2002
@@ -916,8 +916,8 @@
Index: u-boot/include/configs/qt2410.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/include/configs/qt2410.h 2007-02-21 15:48:39.000000000 +0100
-@@ -0,0 +1,285 @@
++++ u-boot/include/configs/qt2410.h 2007-02-28 02:49:17.000000000 +0100
+@@ -0,0 +1,287 @@
+/*
+ * (C) Copyright 2002
+ * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
@@ -959,6 +959,8 @@
+#define CONFIG_S3C2410_NAND_SKIP_BAD 1
+#endif
+
++#define CFG_UBOOT_SIZE 0x40000
++
+/*
+ * High Level Configuration Options
+ * (easy to change)
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-02-28 03:53:26 +0100 (Wed, 28 Feb 2007)
New Revision: 1155
Modified:
trunk/src/target/u-boot/patches/uboot-dfu.patch
Log:
* add DFU relevant config fields for QT2410
Modified: trunk/src/target/u-boot/patches/uboot-dfu.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-dfu.patch 2007-02-28 02:45:22 UTC
(rev 1154)
+++ trunk/src/target/u-boot/patches/uboot-dfu.patch 2007-02-28 02:53:26 UTC
(rev 1155)
@@ -1,7 +1,7 @@
Index: u-boot/drivers/usbdcore_ep0.c
===================================================================
---- u-boot.orig/drivers/usbdcore_ep0.c
-+++ u-boot/drivers/usbdcore_ep0.c
+--- u-boot.orig/drivers/usbdcore_ep0.c 2007-02-28 03:51:25.000000000 +0100
++++ u-boot/drivers/usbdcore_ep0.c 2007-02-28 03:51:25.000000000 +0100
@@ -42,10 +42,15 @@
*/
@@ -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); */
@@ -97,9 +97,9 @@
case USB_REQ_GET_STATUS:
Index: u-boot/drivers/usbdfu.c
===================================================================
---- /dev/null
-+++ u-boot/drivers/usbdfu.c
-@@ -0,0 +1,997 @@
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ u-boot/drivers/usbdfu.c 2007-02-28 03:51:58.000000000 +0100
+@@ -0,0 +1,1000 @@
+/*
+ * (C) 2007 by OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -1006,8 +1006,11 @@
+ strdesc = create_usbstring(CONFIG_DFU_ALT0_STR);
+ } else {
+ struct part_info *part = get_partition_nand(i-1);
-+ if (!part)
-+ continue;
++ if (!part) {
++ part = create_usbstring("undefined partition");
++ if (!part)
++ continue;
++ }
+ strdesc = create_usbstring(part->name);
+ }
+ usb_strings[STR_COUNT+i+1] = strdesc;
@@ -1099,9 +1102,9 @@
+#endif /* CONFIG_USBD_DFU */
Index: u-boot/drivers/Makefile
===================================================================
---- u-boot.orig/drivers/Makefile
-+++ u-boot/drivers/Makefile
-@@ -46,7 +46,7 @@ COBJS = 3c589.o 5701rls.o ali512x.o atme
+--- u-boot.orig/drivers/Makefile 2007-02-28 03:51:25.000000000 +0100
++++ u-boot/drivers/Makefile 2007-02-28 03:51:25.000000000 +0100
+@@ -46,7 +46,7 @@
sl811_usb.o sm501.o smc91111.o smiLynxEM.o \
status_led.o sym53c8xx.o systemace.o ahci.o \
ti_pci1410a.o tigon3.o tsec.o \
@@ -1112,8 +1115,8 @@
pxa_pcmcia.o mpc8xx_pcmcia.o tqm8xx_pcmcia.o \
Index: u-boot/drivers/usbdcore.c
===================================================================
---- u-boot.orig/drivers/usbdcore.c
-+++ u-boot/drivers/usbdcore.c
+--- u-boot.orig/drivers/usbdcore.c 2007-02-28 03:47:38.000000000 +0100
++++ u-boot/drivers/usbdcore.c 2007-02-28 03:51:25.000000000 +0100
@@ -31,6 +31,7 @@
#include <malloc.h>
@@ -1122,7 +1125,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)
{
@@ -1133,7 +1136,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;
}
@@ -1144,7 +1147,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;
}
@@ -1158,7 +1161,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);
}
@@ -1168,8 +1171,8 @@
}
Index: u-boot/drivers/usbtty.c
===================================================================
---- u-boot.orig/drivers/usbtty.c
-+++ u-boot/drivers/usbtty.c
+--- u-boot.orig/drivers/usbtty.c 2007-02-28 03:51:24.000000000 +0100
++++ u-boot/drivers/usbtty.c 2007-02-28 03:51:25.000000000 +0100
@@ -31,6 +31,8 @@
#include "usbtty.h"
#include "usb_cdc_acm.h"
@@ -1179,7 +1182,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;
@@ -1188,7 +1191,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));
@@ -1199,7 +1202,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)),
@@ -1211,7 +1214,7 @@
.bConfigurationValue = 1,
.iConfiguration = STR_CONFIG,
.bmAttributes =
-@@ -278,6 +288,11 @@ static struct acm_config_desc acm_config
+@@ -278,6 +288,11 @@
.bInterval = 0xFF,
},
},
@@ -1223,7 +1226,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 */
@@ -1232,7 +1235,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;
@@ -1244,8 +1247,8 @@
memset (bus_instance, 0, sizeof (struct usb_bus_instance));
Index: u-boot/include/configs/neo1973.h
===================================================================
---- u-boot.orig/include/configs/neo1973.h
-+++ u-boot/include/configs/neo1973.h
+--- u-boot.orig/include/configs/neo1973.h 2007-02-28 03:51:25.000000000
+0100
++++ u-boot/include/configs/neo1973.h 2007-02-28 03:51:25.000000000 +0100
@@ -165,7 +165,7 @@
*/
#define CONFIG_STACKSIZE (128*1024) /* regular stack */
@@ -1268,8 +1271,8 @@
* Physical Memory Map
Index: u-boot/include/usb_dfu.h
===================================================================
---- /dev/null
-+++ u-boot/include/usb_dfu.h
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ u-boot/include/usb_dfu.h 2007-02-28 03:51:25.000000000 +0100
@@ -0,0 +1,97 @@
+#ifndef _DFU_H
+#define _DFU_H
@@ -1370,8 +1373,8 @@
+#endif /* _DFU_H */
Index: u-boot/include/usb_dfu_descriptors.h
===================================================================
---- /dev/null
-+++ u-boot/include/usb_dfu_descriptors.h
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ u-boot/include/usb_dfu_descriptors.h 2007-02-28 03:51:25.000000000
+0100
@@ -0,0 +1,94 @@
+#ifndef _USB_DFU_H
+#define _USB_DFU_H
@@ -1469,8 +1472,8 @@
+#endif /* _USB_DFU_H */
Index: u-boot/include/usbdcore.h
===================================================================
---- u-boot.orig/include/usbdcore.h
-+++ u-boot/include/usbdcore.h
+--- u-boot.orig/include/usbdcore.h 2007-02-28 03:51:24.000000000 +0100
++++ u-boot/include/usbdcore.h 2007-02-28 03:51:25.000000000 +0100
@@ -33,6 +33,7 @@
#include <common.h>
@@ -1479,7 +1482,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.
*/
@@ -1491,7 +1494,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;
@@ -1504,7 +1507,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[];
@@ -1515,8 +1518,8 @@
urb_link *first_urb_link (urb_link * hd);
Index: u-boot/drivers/usbtty.h
===================================================================
---- u-boot.orig/drivers/usbtty.h
-+++ u-boot/drivers/usbtty.h
+--- u-boot.orig/drivers/usbtty.h 2007-02-28 03:51:25.000000000 +0100
++++ u-boot/drivers/usbtty.h 2007-02-28 03:51:25.000000000 +0100
@@ -71,4 +71,10 @@
#define STR_CTRL_INTERFACE 0x06
#define STR_COUNT 0x07
@@ -1528,3 +1531,17 @@
+#endif
+
#endif
+Index: u-boot/include/configs/qt2410.h
+===================================================================
+--- u-boot.orig/include/configs/qt2410.h 2007-02-28 03:51:24.000000000
+0100
++++ u-boot/include/configs/qt2410.h 2007-02-28 03:51:25.000000000 +0100
+@@ -199,7 +199,8 @@
+ #define CONFIG_USBD_PRODUCT_NAME "QT2410 Bootloader " U_BOOT_VERSION
+ #define CONFIG_EXTRA_ENV_SETTINGS "usbtty=cdc_acm\0"
+ #define CONFIG_USBD_DFU 1
+-#define CONFIG_USBD_DFU_XFER_SIZE 0x4000
++#define CONFIG_USBD_DFU_XFER_SIZE 4096
++#define CONFIG_USBD_DFU_INTERFACE 2
+
+ /*-----------------------------------------------------------------------
+ * Physical Memory Map
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
