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. r3480 - in
trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src
([EMAIL PROTECTED])
2. r3481 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
src/dialer ([EMAIL PROTECTED])
3. r3482 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
src/phone-kit ([EMAIL PROTECTED])
4. r3483 - trunk/src/target ([EMAIL PROTECTED])
5. r3484 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: chris
Date: 2007-11-22 19:48:45 +0100 (Thu, 22 Nov 2007)
New Revision: 3480
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.c
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-main.c
Log:
* src/sms-compose.c: (send_clicked_cb):
* src/sms-main.c: (main):
Adjust due to phone-kit changes
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2007-11-22 18:47:13 UTC (rev 3479)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2007-11-22 18:48:45 UTC (rev 3480)
@@ -1,6 +1,12 @@
2007-11-22 Chris Lord <[EMAIL PROTECTED]>
* src/sms-compose.c: (send_clicked_cb):
+ * src/sms-main.c: (main):
+ Adjust due to phone-kit changes
+
+2007-11-22 Chris Lord <[EMAIL PROTECTED]>
+
+ * src/sms-compose.c: (send_clicked_cb):
Check if message is NULL, only switch page back on successful send and
empty text entry after sending text
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.c
2007-11-22 18:47:13 UTC (rev 3479)
+++
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.c
2007-11-22 18:48:45 UTC (rev 3480)
@@ -170,9 +170,9 @@
if (message && (message[0] != '\0')) {
g_debug ("Sending message '%s' to %s", message, number);
- if (!dbus_g_proxy_call (data->sms_proxy, "Send", &error,
- G_TYPE_STRING, number, G_TYPE_STRING, message,
- G_TYPE_INVALID, G_TYPE_STRING, NULL,
+ if (!dbus_g_proxy_call (data->sms_proxy, "SendSms",
+ &error, G_TYPE_STRING, number, G_TYPE_STRING,
+ message, G_TYPE_INVALID, G_TYPE_STRING, NULL,
G_TYPE_INVALID)) {
g_warning ("Error sending message: %s",
error->message);
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-main.c
2007-11-22 18:47:13 UTC (rev 3479)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-main.c
2007-11-22 18:48:45 UTC (rev 3480)
@@ -66,7 +66,7 @@
data.sms_proxy = NULL;
} else {
data.sms_proxy = dbus_g_proxy_new_for_name (connection,
- "org.openmoko.Dialer", "/org/openmoko/Dialer/SMS",
+ "org.openmoko.Dialer", "/org/openmoko/Dialer",
"org.openmoko.Dialer");
}
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-11-22 19:59:36 +0100 (Thu, 22 Nov 2007)
New Revision: 3481
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
Log:
* configure.ac:
Replace libmokogsmd2 with libgsmd
* src/dialer/moko-history.c:
Remove unnecessary include
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-11-22 18:48:45 UTC (rev 3480)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-11-22 18:59:36 UTC (rev 3481)
@@ -1,5 +1,13 @@
2007-11-22 Chris Lord <[EMAIL PROTECTED]>
+ * configure.ac:
+ Replace libmokogsmd2 with libgsmd
+
+ * src/dialer/moko-history.c:
+ Remove unnecessary include
+
+2007-11-22 Chris Lord <[EMAIL PROTECTED]>
+
* src/phone-kit/Makefile.am:
* src/phone-kit/dialer-main.c: (main):
* src/phone-kit/moko-dialer-dbus.xml:
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac
2007-11-22 18:48:45 UTC (rev 3480)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac
2007-11-22 18:59:36 UTC (rev 3481)
@@ -15,8 +15,8 @@
dbus-glib-1
gtk+-2.0
libebook-1.2
+ libgsmd
libmokojournal2
- libmokogsmd2
libmokoui2
libpulse)
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
2007-11-22 18:48:45 UTC (rev 3480)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-history.c
2007-11-22 18:59:36 UTC (rev 3481)
@@ -23,7 +23,6 @@
#include <string.h>
-#include <moko-gsmd-connection.h>
#include <moko-journal.h>
#include <moko-stock.h>
#include <moko-finger-scroll.h>
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-11-23 11:28:30 +0100 (Fri, 23 Nov 2007)
New Revision: 3482
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.h
Log:
* src/phone-kit/moko-dialer.c: (moko_dialer_rejected):
* src/phone-kit/moko-talking.c: (moko_talking_class_init),
(window_delete_event_cb), (on_pad_user_input), (moko_talking_init):
* src/phone-kit/moko-talking.h:
Add DTMF pad while in call
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-11-22 18:59:36 UTC (rev 3481)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-11-23 10:28:30 UTC (rev 3482)
@@ -1,3 +1,12 @@
+2007-11-23 Thomas Wood <[EMAIL PROTECTED]>
+
+ * src/phone-kit/moko-dialer.c: (moko_dialer_rejected):
+ * src/phone-kit/moko-talking.c: (moko_talking_class_init),
+ (window_delete_event_cb), (on_pad_user_input), (moko_talking_init):
+ * src/phone-kit/moko-talking.h:
+
+ Add DTMF pad while in call
+
2007-11-22 Chris Lord <[EMAIL PROTECTED]>
* configure.ac:
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
2007-11-22 18:59:36 UTC (rev 3481)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
2007-11-23 10:28:30 UTC (rev 3482)
@@ -282,30 +282,7 @@
g_signal_emit (G_OBJECT (dialer), dialer_signals[REJECTED], 0);
}
-
-#if 0
static void
-on_keypad_pin_entry (MokoKeypad *keypad,
- const gchar *in_pin,
- MokoDialer *dialer)
-{
- MokoDialerPrivate *priv;
- gchar *pin;
-
- g_return_if_fail (MOKO_IS_DIALER (dialer));
- priv = dialer->priv;
-
- pin = g_strdup (in_pin);
-
- g_debug ("Sending pin %s", pin);
- moko_gsmd_connection_send_pin (priv->connection, pin);
-
- moko_keypad_set_pin_mode (MOKO_KEYPAD (priv->keypad), FALSE);
- g_free (pin);
-}
-#endif
-
-static void
on_talking_accept_call (MokoTalking *talking, MokoDialer *dialer)
{
MokoDialerPrivate *priv;
@@ -397,9 +374,9 @@
g_debug ("Speaker toggled");
}
-#if 0
+
static void
-on_keypad_digit_pressed (MokoKeypad *keypad,
+on_keypad_digit_pressed (MokoTalking *talking,
const gchar digit,
MokoDialer *dialer)
{
@@ -412,9 +389,11 @@
return;
if (priv->status == DIALER_STATUS_TALKING)
- moko_gsmd_connection_voice_dtmf (priv->connection, digit);
+ {
+ lgsm_voice_dtmf (priv->handle, digit);
+ }
}
-#endif
+
/* Callbacks for gsmd events */
static void
on_network_registered (MokoDialer *dialer,
@@ -1121,7 +1100,8 @@
G_CALLBACK (on_talking_silence), (gpointer)dialer);
g_signal_connect (G_OBJECT (priv->talking), "speaker_toggle",
G_CALLBACK (on_talking_speaker_toggle), (gpointer)dialer);
-
+ g_signal_connect (priv->talking, "dtmf_key_press",
+ G_CALLBACK (on_keypad_digit_pressed), dialer);
}
MokoDialer*
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
2007-11-22 18:59:36 UTC (rev 3481)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
2007-11-23 10:28:30 UTC (rev 3482)
@@ -24,6 +24,8 @@
#include "moko-sound.h"
#include "moko-talking.h"
+#include "moko-dialer-panel.h"
+#include "moko-dialer-textview.h"
G_DEFINE_TYPE (MokoTalking, moko_talking, GTK_TYPE_WIDGET)
@@ -40,28 +42,31 @@
struct _MokoTalkingPrivate
{
- MokoJournal *journal;
+ MokoJournal *journal;
- GtkWidget *window;
+ GtkWidget *window;
- GtkWidget *incoming_bar;
- GtkWidget *main_bar;
+ GtkWidget *incoming_bar;
+ GtkWidget *main_bar;
- GtkWidget *title;
- GtkWidget *duration;
- GtkWidget *icon;
+ GtkWidget *title;
+ GtkWidget *duration;
+ GtkWidget *icon;
- GtkWidget *person;
- GtkWidget *status;
+ GtkWidget *person;
+ GtkWidget *status;
+
+ GtkWidget *dtmf_display;
+ GtkWidget *dtmf_pad;
- GdkPixbuf *talking[N_PICS];
- GdkPixbuf *incoming[4];
- GdkPixbuf *outgoing[4];
+ GdkPixbuf *talking[N_PICS];
+ GdkPixbuf *incoming[4];
+ GdkPixbuf *outgoing[4];
- GTimer *dtimer;
- guint timeout;
+ GTimer *dtimer;
+ guint timeout;
- gint call_direction;
+ gint call_direction;
};
enum
@@ -71,13 +76,13 @@
CANCEL_CALL,
SILENCE,
SPEAKER_TOGGLE,
+ DTMF_KEY_PRESS,
LAST_SIGNAL
};
static guint talking_signals[LAST_SIGNAL] = {0, };
-
void
moko_talking_set_clip (MokoTalking *talking,
const gchar *number,
@@ -406,6 +411,15 @@
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+ talking_signals[DTMF_KEY_PRESS] =
+ g_signal_new ("dtmf_key_press",
+ G_TYPE_FROM_CLASS (obj_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (MokoTalkingClass, dtmf_key_press),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__CHAR,
+ G_TYPE_NONE, 1, G_TYPE_CHAR);
+
g_type_class_add_private (obj_class, sizeof (MokoTalkingPrivate));
}
@@ -422,9 +436,28 @@
}
static void
+on_pad_user_input (MokoDialerPanel *panel, const gchar digit,
+ MokoTalking *talking)
+{
+ MokoTalkingPrivate *priv;
+ gchar buf[2];
+ priv = MOKO_TALKING_GET_PRIVATE (talking);
+
+ /* Create a string from the new digit */
+ buf[0] = digit;
+ buf[1] = '\0';
+
+ moko_dialer_textview_insert (MOKO_DIALER_TEXTVIEW (priv->dtmf_display), buf);
+
+ g_signal_emit (G_OBJECT (talking), talking_signals[DTMF_KEY_PRESS],
+ 0, digit);
+}
+
+static void
moko_talking_init (MokoTalking *talking)
{
MokoTalkingPrivate *priv;
+ GtkWidget *notebook;
GtkWidget *toolbar, *image, *vbox, *hbox, *label, *align, *frame, *main_vbox;
GtkWidget *duration;
GtkToolItem *item;
@@ -432,7 +465,15 @@
priv = talking->priv = MOKO_TALKING_GET_PRIVATE (talking);
+ notebook = gtk_notebook_new ();
+ gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), GTK_POS_BOTTOM);
+
+ /* status page */
main_vbox = gtk_vbox_new (FALSE, 0);
+ gtk_notebook_append_page (GTK_NOTEBOOK (notebook), main_vbox,
+ gtk_image_new_from_file (PKGDATADIR"/phone.png"));
+ gtk_container_child_set (GTK_CONTAINER (notebook), main_vbox, "tab-expand",
+ TRUE, NULL);
priv->incoming_bar = toolbar = gtk_toolbar_new ();
gtk_box_pack_start (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0);
@@ -505,7 +546,7 @@
priv->person = image = gtk_image_new ();
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
- priv->status = label = gtk_label_new ("01923 820 124");
+ priv->status = label = gtk_label_new ("");
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
/* Load the pixbufs */
@@ -540,12 +581,29 @@
g_object_ref (priv->incoming[i]);
}
+
+ /* dtmf page */
+ GtkWidget *pad, *display;
+ main_vbox = gtk_vbox_new (FALSE, 0);
+ gtk_notebook_append_page (GTK_NOTEBOOK (notebook), main_vbox,
+ gtk_image_new_from_file (PKGDATADIR"/dtmf.png"));
+ gtk_container_child_set (GTK_CONTAINER (notebook), main_vbox, "tab-expand",
+ TRUE, NULL);
+
+ display = moko_dialer_textview_new ();
+ gtk_box_pack_start_defaults (GTK_BOX (main_vbox), display);
+ priv->dtmf_display = display;
+
+ pad = moko_dialer_panel_new ();
+ gtk_box_pack_start_defaults (GTK_BOX (main_vbox), pad);
+ g_signal_connect (pad, "user_input", G_CALLBACK (on_pad_user_input),
talking);
+ priv->dtmf_pad = pad;
priv->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
g_signal_connect (priv->window, "delete-event", G_CALLBACK
(window_delete_event_cb), talking);
- gtk_container_add (GTK_CONTAINER (priv->window), main_vbox);
+ gtk_container_add (GTK_CONTAINER (priv->window), notebook);
- gtk_widget_show_all (main_vbox);
+ gtk_widget_show_all (notebook);
}
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.h
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.h
2007-11-22 18:59:36 UTC (rev 3481)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.h
2007-11-23 10:28:30 UTC (rev 3482)
@@ -67,6 +67,7 @@
void (*cancel_call) (MokoTalking *talking);
void (*silence) (MokoTalking *talking);
void (*speaker_toggle) (MokoTalking *talking, gboolean speaker_phone);
+ void (*dtmf_key_press) (MokoTalking *talking, const char key);
};
GType moko_talking_get_type (void) G_GNUC_CONST;
--- End Message ---
--- Begin Message ---
Author: olv
Date: 2007-11-23 11:34:49 +0100 (Fri, 23 Nov 2007)
New Revision: 3483
Added:
trunk/src/target/xserver/
Log:
Move the development of Xglamo under trunk/
Copied: trunk/src/target/xserver (from rev 3482, developers/olv/xserver)
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-11-23 11:50:23 +0100 (Fri, 23 Nov 2007)
New Revision: 3484
Modified:
trunk/src/target/u-boot/patches/boot-menu.patch
trunk/src/target/u-boot/patches/env_nand_oob.patch
trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
trunk/src/target/u-boot/patches/uboot-cmd_s3c2410.patch
trunk/src/target/u-boot/patches/uboot-dfu.patch
trunk/src/target/u-boot/patches/uboot-gta02.patch
trunk/src/target/u-boot/patches/uboot-license.patch
trunk/src/target/u-boot/patches/uboot-s3c2410-mmc.patch
trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch
trunk/src/target/u-boot/patches/uboot-s3c2410_fb.patch
trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch
trunk/src/target/u-boot/patches/uboot-serial_terminal.patch
Log:
sync with mainline git rev 9a337ddc154a10a26f117fd147b009abcdeba75a
(only makefile changes)
Modified: trunk/src/target/u-boot/patches/boot-menu.patch
===================================================================
--- trunk/src/target/u-boot/patches/boot-menu.patch 2007-11-23 10:34:49 UTC
(rev 3483)
+++ trunk/src/target/u-boot/patches/boot-menu.patch 2007-11-23 10:50:23 UTC
(rev 3484)
@@ -151,7 +151,7 @@
===================================================================
--- u-boot.orig/board/neo1973/gta01/gta01.c
+++ u-boot/board/neo1973/gta01/gta01.c
-@@ -229,10 +229,15 @@
+@@ -230,10 +230,15 @@
extern unsigned char booted_from_nand;
unsigned char tmp;
char buf[32];
@@ -167,7 +167,7 @@
if (!booted_from_nand)
goto woken_by_reset;
-@@ -242,45 +247,41 @@
+@@ -243,45 +248,41 @@
setenv("pcf50606_int1", buf);
if (tmp & PCF50606_INT1_ALARM) {
@@ -235,7 +235,7 @@
continue_boot:
jbt6k74_init();
-@@ -304,6 +305,11 @@
+@@ -305,6 +306,11 @@
}
#endif
@@ -247,8 +247,8 @@
return 0;
}
-@@ -369,7 +375,17 @@
- #endif
+@@ -433,7 +439,17 @@
+ printf("not implemented yet!\n");
}
-int neo1973_911_key_pressed(void)
@@ -283,7 +283,7 @@
===================================================================
--- u-boot.orig/board/neo1973/common/neo1973.h
+++ u-boot/board/neo1973/common/neo1973.h
-@@ -29,4 +29,10 @@
+@@ -32,4 +32,10 @@
const char *neo1973_get_charge_status(void);
int neo1973_set_charge_mode(enum neo1973_charger_cmd cmd);
@@ -354,16 +354,14 @@
===================================================================
--- u-boot.orig/common/Makefile
+++ u-boot/common/Makefile
-@@ -50,7 +50,8 @@
- memsize.o miiphybb.o miiphyutil.o \
- s_record.o serial.o soft_i2c.o soft_spi.o spartan2.o spartan3.o \
- usb.o usb_kbd.o usb_storage.o \
-- virtex2.o xilinx.o crc16.o xyzModem.o cmd_mac.o cmd_mfsl.o
-+ virtex2.o xilinx.o crc16.o xyzModem.o cmd_mac.o cmd_mfsl.o \
-+ bootmenu.o
-
- SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c)
- OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS))
+@@ -31,6 +31,7 @@
+ COBJS-y += ACEX1K.o
+ COBJS-y += altera.o
+ COBJS-y += bedbug.o
++COBJS-y += bootmenu.o
+ COBJS-y += circbuf.o
+ COBJS-y += cmd_autoscript.o
+ COBJS-y += cmd_bdinfo.o
Index: u-boot/common/bootmenu.c
===================================================================
--- /dev/null
@@ -769,7 +767,7 @@
===================================================================
--- u-boot.orig/include/configs/neo1973_gta01.h
+++ u-boot/include/configs/neo1973_gta01.h
-@@ -148,6 +148,8 @@
+@@ -150,6 +150,8 @@
/* valid baudrates */
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
Modified: trunk/src/target/u-boot/patches/env_nand_oob.patch
===================================================================
--- trunk/src/target/u-boot/patches/env_nand_oob.patch 2007-11-23 10:34:49 UTC
(rev 3483)
+++ trunk/src/target/u-boot/patches/env_nand_oob.patch 2007-11-23 10:50:23 UTC
(rev 3484)
@@ -97,15 +97,14 @@
===================================================================
--- u-boot.orig/common/Makefile
+++ u-boot/common/Makefile
-@@ -31,7 +31,7 @@
- cmd_bdinfo.o cmd_bedbug.o cmd_bmp.o cmd_boot.o cmd_bootm.o \
- cmd_cache.o cmd_console.o \
- cmd_date.o cmd_dcr.o cmd_diag.o cmd_display.o cmd_doc.o cmd_dtt.o \
-- cmd_eeprom.o cmd_elf.o cmd_ext2.o \
-+ cmd_dynenv.o cmd_eeprom.o cmd_elf.o cmd_ext2.o \
- cmd_fat.o cmd_fdc.o cmd_fdt.o cmd_fdos.o cmd_flash.o cmd_fpga.o \
- cmd_i2c.o cmd_ide.o cmd_immap.o cmd_itest.o cmd_jffs2.o \
- cmd_load.o cmd_log.o \
+@@ -46,6 +46,7 @@
+ COBJS-y += cmd_display.o
+ COBJS-y += cmd_doc.o
+ COBJS-y += cmd_dtt.o
++COBJS-y += cmd_dynenv.o
+ COBJS-y += cmd_eeprom.o
+ COBJS-y += cmd_elf.o
+ COBJS-y += cmd_ext2.o
Index: u-boot/common/cmd_dynenv.c
===================================================================
--- /dev/null
Modified: trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
2007-11-23 10:34:49 UTC (rev 3483)
+++ trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
2007-11-23 10:50:23 UTC (rev 3484)
@@ -8,7 +8,7 @@
===================================================================
--- u-boot.orig/Makefile
+++ u-boot/Makefile
-@@ -2175,6 +2175,14 @@
+@@ -2195,6 +2195,14 @@
sbc2410x_config: unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
@@ -48,14 +48,14 @@
===================================================================
--- u-boot.orig/drivers/Makefile
+++ u-boot/drivers/Makefile
-@@ -52,6 +52,7 @@
- usbtty.o \
- videomodes.o w83c553f.o \
- ks8695eth.o \
-+ pcf50606.o \
- pxa_pcmcia.o mpc8xx_pcmcia.o tqm8xx_pcmcia.o \
- rpx_pcmcia.o \
- fsl_i2c.o fsl_pci_init.o ati_radeon_fb.o s3c2410_fb.o
+@@ -142,6 +142,7 @@
+ #
+ COBJS-y += ali512x.o
+ COBJS-y += ns87308.o
++COBJS-y += pcf50606.o
+ COBJS-y += status_led.o
+
+ COBJS := $(COBJS-y)
Index: u-boot/drivers/pcf50606.c
===================================================================
--- /dev/null
Modified: trunk/src/target/u-boot/patches/uboot-cmd_s3c2410.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-cmd_s3c2410.patch 2007-11-23
10:34:49 UTC (rev 3483)
+++ trunk/src/target/u-boot/patches/uboot-cmd_s3c2410.patch 2007-11-23
10:50:23 UTC (rev 3484)
@@ -7,12 +7,13 @@
===================================================================
--- u-boot.orig/cpu/arm920t/s3c24x0/Makefile
+++ u-boot/cpu/arm920t/s3c24x0/Makefile
-@@ -26,7 +26,7 @@
+@@ -26,7 +26,8 @@
LIB = $(obj)lib$(SOC).a
COBJS = i2c.o interrupts.o serial.o speed.o \
-- usb.o nand_read.o nand.o
-+ usb.o nand_read.o nand.o cmd_s3c24xx.o
+- usb.o usb_ohci.o nand_read.o nand.o
++ usb.o usb_ohci.o nand_read.o nand.o \
++ cmd_s3c24xx.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
Modified: trunk/src/target/u-boot/patches/uboot-dfu.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-dfu.patch 2007-11-23 10:34:49 UTC
(rev 3483)
+++ trunk/src/target/u-boot/patches/uboot-dfu.patch 2007-11-23 10:50:23 UTC
(rev 3484)
@@ -1164,15 +1164,14 @@
===================================================================
--- u-boot.orig/drivers/Makefile
+++ u-boot/drivers/Makefile
-@@ -48,7 +48,7 @@
- ti_pci1410a.o tigon3.o tsec.o \
- tsi108_eth.o tsi108_i2c.o tsi108_pci.o \
- usb_ohci.o \
-- usbdcore.o usbdcore_ep0.o usbdcore_mpc8xx.o usbdcore_omap1510.o
usbdcore_s3c2410.o \
-+ usbdcore.o usbdfu.o usbdcore_ep0.o usbdcore_mpc8xx.o
usbdcore_omap1510.o usbdcore_s3c2410.o \
- usbtty.o \
- videomodes.o w83c553f.o \
- ks8695eth.o \
+@@ -132,6 +132,7 @@
+ COBJS-y += isp116x-hcd.o
+ COBJS-y += sl811_usb.o
+ COBJS-y += usb_ohci.o
++COBJS-y += usbdfu.o
+ COBJS-y += usbdcore.o
+ COBJS-y += usbdcore_ep0.o
+ COBJS-y += usbdcore_mpc8xx.o
Index: u-boot/drivers/usbdcore.c
===================================================================
--- u-boot.orig/drivers/usbdcore.c
@@ -1309,7 +1308,7 @@
===================================================================
--- u-boot.orig/include/configs/neo1973_gta01.h
+++ u-boot/include/configs/neo1973_gta01.h
-@@ -157,7 +157,7 @@
+@@ -159,7 +159,7 @@
*/
#define CONFIG_STACKSIZE (128*1024) /* regular stack */
#ifdef CONFIG_USE_IRQ
@@ -1318,7 +1317,7 @@
#define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */
#endif
-@@ -174,6 +174,10 @@
+@@ -176,6 +176,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"
@@ -1994,7 +1993,7 @@
===================================================================
--- u-boot.orig/Makefile
+++ u-boot/Makefile
-@@ -267,6 +267,12 @@
+@@ -270,6 +270,12 @@
$(obj)u-boot.bin: $(obj)u-boot
$(OBJCOPY) ${OBJCFLAGS} -O binary $< $@
Modified: trunk/src/target/u-boot/patches/uboot-gta02.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-gta02.patch 2007-11-23 10:34:49 UTC
(rev 3483)
+++ trunk/src/target/u-boot/patches/uboot-gta02.patch 2007-11-23 10:50:23 UTC
(rev 3484)
@@ -4,7 +4,7 @@
===================================================================
--- u-boot.orig/Makefile
+++ u-boot/Makefile
-@@ -2181,6 +2181,13 @@
+@@ -2201,6 +2201,13 @@
sbc2410x_config: unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
@@ -547,7 +547,6 @@
+ else
+ gpio->GPBDAT &= ~(1 << led);
+}
-+
Index: u-boot/board/neo1973/gta02/u-boot.lds
===================================================================
--- /dev/null
@@ -1868,19 +1867,22 @@
===================================================================
--- u-boot.orig/drivers/Makefile
+++ u-boot/drivers/Makefile
-@@ -52,10 +52,10 @@
- usbtty.o \
- videomodes.o w83c553f.o \
- ks8695eth.o \
-- pcf50606.o \
-+ pcf50606.o pcf50633.o \
- pxa_pcmcia.o mpc8xx_pcmcia.o tqm8xx_pcmcia.o \
- rpx_pcmcia.o \
-- fsl_i2c.o fsl_pci_init.o ati_radeon_fb.o s3c2410_fb.o
-+ fsl_i2c.o fsl_pci_init.o ati_radeon_fb.o s3c2410_fb.o smedia3362.o
+@@ -67,6 +67,7 @@
+ COBJS-y += serial_max3100.o
+ COBJS-y += serial_xuartlite.o
+ COBJS-y += sm501.o
++COBJS-y += smedia3362.o
+ COBJS-y += smiLynxEM.o
+ COBJS-y += usbtty.o
+ COBJS-y += videomodes.o
+@@ -145,6 +146,7 @@
+ COBJS-y += ali512x.o
+ COBJS-y += ns87308.o
+ COBJS-y += pcf50606.o
++COBJS-y += pcf50633.o
+ COBJS-y += status_led.o
- SRCS := $(COBJS:.o=.c)
- OBJS := $(addprefix $(obj),$(COBJS))
+ COBJS := $(COBJS-y)
Index: u-boot/common/cmd_nand.c
===================================================================
--- u-boot.orig/common/cmd_nand.c
Modified: trunk/src/target/u-boot/patches/uboot-license.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-license.patch 2007-11-23 10:34:49 UTC
(rev 3483)
+++ trunk/src/target/u-boot/patches/uboot-license.patch 2007-11-23 10:50:23 UTC
(rev 3484)
@@ -2,15 +2,14 @@
===================================================================
--- u-boot.orig/common/Makefile
+++ u-boot/common/Makefile
-@@ -34,7 +34,7 @@
- cmd_dynenv.o cmd_eeprom.o cmd_elf.o cmd_ext2.o \
- cmd_fat.o cmd_fdc.o cmd_fdt.o cmd_fdos.o cmd_flash.o cmd_fpga.o \
- cmd_i2c.o cmd_ide.o cmd_immap.o cmd_itest.o cmd_jffs2.o \
-- cmd_load.o cmd_log.o \
-+ cmd_license.o cmd_load.o cmd_log.o \
- cmd_mem.o cmd_mii.o cmd_misc.o cmd_mmc.o \
- cmd_nand.o cmd_net.o cmd_nvedit.o \
- cmd_pci.o cmd_pcmcia.o cmd_portio.o \
+@@ -62,6 +62,7 @@
+ COBJS-y += cmd_immap.o
+ COBJS-y += cmd_itest.o
+ COBJS-y += cmd_jffs2.o
++COBJS-y += cmd_license.o
+ COBJS-y += cmd_load.o
+ COBJS-y += cmd_log.o
+ COBJS-y += cmd_mem.o
Index: u-boot/common/cmd_license.c
===================================================================
--- /dev/null
Modified: trunk/src/target/u-boot/patches/uboot-s3c2410-mmc.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410-mmc.patch 2007-11-23
10:34:49 UTC (rev 3483)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410-mmc.patch 2007-11-23
10:50:23 UTC (rev 3484)
@@ -7,12 +7,12 @@
===================================================================
--- u-boot.orig/cpu/arm920t/s3c24x0/Makefile
+++ u-boot/cpu/arm920t/s3c24x0/Makefile
-@@ -26,7 +26,7 @@
- LIB = $(obj)lib$(SOC).a
+@@ -27,7 +27,7 @@
COBJS = i2c.o interrupts.o serial.o speed.o \
-- usb.o nand_read.o nand.o cmd_s3c24xx.o
-+ usb.o nand_read.o nand.o mmc.o cmd_s3c24xx.o
+ usb.o usb_ohci.o nand_read.o nand.o \
+- cmd_s3c24xx.o
++ cmd_s3c24xx.o mmc.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
Modified: trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch 2007-11-23
10:34:49 UTC (rev 3483)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch 2007-11-23
10:50:23 UTC (rev 3484)
@@ -11,8 +11,8 @@
LIB = $(obj)lib$(SOC).a
COBJS = i2c.o interrupts.o serial.o speed.o \
-- usb.o
-+ usb.o nand_read.o nand.o
+- usb.o usb_ohci.o
++ usb.o usb_ohci.o nand_read.o nand.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
Modified: trunk/src/target/u-boot/patches/uboot-s3c2410_fb.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410_fb.patch 2007-11-23
10:34:49 UTC (rev 3483)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410_fb.patch 2007-11-23
10:50:23 UTC (rev 3484)
@@ -2,15 +2,14 @@
===================================================================
--- u-boot.orig/drivers/Makefile
+++ u-boot/drivers/Makefile
-@@ -54,7 +54,7 @@
- ks8695eth.o \
- pxa_pcmcia.o mpc8xx_pcmcia.o tqm8xx_pcmcia.o \
- rpx_pcmcia.o \
-- fsl_i2c.o fsl_pci_init.o ati_radeon_fb.o
-+ fsl_i2c.o fsl_pci_init.o ati_radeon_fb.o s3c2410_fb.o
-
- SRCS := $(COBJS:.o=.c)
- OBJS := $(addprefix $(obj),$(COBJS))
+@@ -59,6 +59,7 @@
+ COBJS-y += pc_keyb.o
+ COBJS-y += ps2ser.o
+ COBJS-y += ps2mult.o
++COBJS-y += s3c2410_fb.o
+ COBJS-y += s3c4510b_uart.o
+ COBJS-y += sed13806.o
+ COBJS-y += sed156x.o
Index: u-boot/drivers/s3c2410_fb.c
===================================================================
--- /dev/null
Modified: trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch 2007-11-23
10:34:49 UTC (rev 3483)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch 2007-11-23
10:50:23 UTC (rev 3484)
@@ -4,15 +4,14 @@
===================================================================
--- u-boot.orig/drivers/Makefile
+++ u-boot/drivers/Makefile
-@@ -48,7 +48,7 @@
- ti_pci1410a.o tigon3.o tsec.o \
- tsi108_eth.o tsi108_i2c.o tsi108_pci.o \
- usb_ohci.o \
-- usbdcore.o usbdcore_ep0.o usbdcore_mpc8xx.o usbdcore_omap1510.o \
-+ usbdcore.o usbdcore_ep0.o usbdcore_mpc8xx.o usbdcore_omap1510.o
usbdcore_s3c2410.o \
- usbtty.o \
- videomodes.o w83c553f.o \
- ks8695eth.o \
+@@ -136,6 +136,7 @@
+ COBJS-y += usbdcore_ep0.o
+ COBJS-y += usbdcore_mpc8xx.o
+ COBJS-y += usbdcore_omap1510.o
++COBJS-y += usbdcore_s3c2410.o
+
+ #
+ # Miscellaneous Drivers
Index: u-boot/drivers/usbdcore_s3c2410.c
===================================================================
--- /dev/null
@@ -1135,7 +1134,7 @@
===================================================================
--- u-boot.orig/include/configs/neo1973_gta01.h
+++ u-boot/include/configs/neo1973_gta01.h
-@@ -161,6 +161,16 @@
+@@ -163,6 +163,16 @@
#define CONFIG_USB_OHCI 1
#endif
@@ -1187,7 +1186,7 @@
===================================================================
--- u-boot.orig/board/neo1973/common/cmd_neo1973.c
+++ u-boot/board/neo1973/common/cmd_neo1973.c
-@@ -86,6 +86,18 @@
+@@ -94,6 +94,18 @@
neo1973_gps(1);
else
neo1973_gps(0);
@@ -1206,7 +1205,7 @@
} else {
out_help:
printf("Usage:\n%s\n", cmdtp->usage);
-@@ -111,5 +123,6 @@
+@@ -120,5 +132,6 @@
"neo1973 vibrator (on|off) - switch vibrator on or off\n"
"neo1973 gsm (on|off) - switch GSM Modem on or off\n"
"neo1973 gps (on|off) - switch GPS system on or off\n"
@@ -1273,7 +1272,7 @@
===================================================================
--- u-boot.orig/board/neo1973/gta01/gta01.c
+++ u-boot/board/neo1973/gta01/gta01.c
-@@ -333,6 +333,7 @@
+@@ -334,6 +334,7 @@
void neo1973_poweroff(void)
{
serial_printf("poweroff\n");
Modified: trunk/src/target/u-boot/patches/uboot-serial_terminal.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-serial_terminal.patch 2007-11-23
10:34:49 UTC (rev 3483)
+++ trunk/src/target/u-boot/patches/uboot-serial_terminal.patch 2007-11-23
10:50:23 UTC (rev 3484)
@@ -5,15 +5,14 @@
===================================================================
--- u-boot.orig/common/Makefile
+++ u-boot/common/Makefile
-@@ -39,7 +39,7 @@
- cmd_nand.o cmd_net.o cmd_nvedit.o \
- cmd_pci.o cmd_pcmcia.o cmd_portio.o \
- cmd_reginfo.o cmd_reiser.o cmd_sata.o cmd_scsi.o cmd_spi.o \
-- cmd_universe.o cmd_usb.o cmd_vfd.o \
-+ cmd_terminal.o cmd_universe.o cmd_usb.o cmd_vfd.o \
- command.o console.o cyclon2.o devices.o dlmalloc.o docecc.o \
- environment.o env_common.o \
- env_nand.o env_dataflash.o env_flash.o env_eeprom.o \
+@@ -78,6 +78,7 @@
+ COBJS-y += cmd_sata.o
+ COBJS-y += cmd_scsi.o
+ COBJS-y += cmd_spi.o
++COBJS-y += cmd_terminal.o
+ COBJS-y += cmd_universe.o
+ COBJS-y += cmd_usb.o
+ COBJS-y += cmd_vfd.o
Index: u-boot/common/cmd_terminal.c
===================================================================
--- /dev/null
@@ -125,7 +124,7 @@
===================================================================
--- u-boot.orig/include/config_cmd_all.h
+++ u-boot/include/config_cmd_all.h
-@@ -72,6 +72,7 @@
+@@ -73,6 +73,7 @@
#define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */
#define CONFIG_CMD_SNTP /* SNTP support */
#define CONFIG_CMD_SPI /* SPI utility */
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
