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. r1160 - trunk/src/target/gsm/src/libgsmd
([EMAIL PROTECTED])
2. r1161 - in trunk/src/target/gsm: include/libgsmd src/libgsmd
src/util ([EMAIL PROTECTED])
3. r1162 - in
trunk/src/target/OM-2007/applications/openmoko-dialer: . src
([EMAIL PROTECTED])
4. r1163 -
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0
([EMAIL PROTECTED])
5. r1164 - in
trunk/src/target/OM-2007/applications/openmoko-contacts: . src
([EMAIL PROTECTED])
6. r1165 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
7. r1166 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: laforge
Date: 2007-02-28 12:36:47 +0100 (Wed, 28 Feb 2007)
New Revision: 1160
Added:
trunk/src/target/gsm/src/libgsmd/libgsmd_device.c
Log:
add missing file from Commit rev. 1155 (tony guan)
Added: trunk/src/target/gsm/src/libgsmd/libgsmd_device.c
===================================================================
--- trunk/src/target/gsm/src/libgsmd/libgsmd_device.c 2007-02-28 08:22:40 UTC
(rev 1159)
+++ trunk/src/target/gsm/src/libgsmd/libgsmd_device.c 2007-02-28 11:36:47 UTC
(rev 1160)
@@ -0,0 +1,59 @@
+/* libgsmd phone related functions
+ *
+ * (C) 2006-2007 by OpenMoko, Inc.
+ * Written by Harald Welte <[EMAIL PROTECTED]>
+ * All Rights Reserved
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include <libgsmd/libgsmd.h>
+#include <libgsmd/misc.h>
+#include "lgsm_internals.h"
+
+int lgsm_get_info(struct lgsm_handle *lh,
+ lgsm_info_type type,
+ char *ret_string, unsigned int* len)
+{
+ switch (type)
+ {
+ case LGSM_INFO_TYPE_MANUF:
+ return lgsm_passthrough(lh,"AT+CGMI",ret_string,len);
+ break;
+ case LGSM_INFO_TYPE_MODEL:
+ return lgsm_passthrough(lh,"AT+CGMM",ret_string,len);
+ break;
+ case LGSM_INFO_TYPE_REVISION:
+ return lgsm_passthrough(lh,"AT+CGMR",ret_string,len);
+ break;
+ case LGSM_INFO_TYPE_SERIAL:
+ return lgsm_passthrough(lh,"AT+CGSN",ret_string,len);
+ break;
+ case LGSM_INFO_TYPE_IMSI:
+ return lgsm_passthrough(lh,"AT+CIMI",ret_string,len);
+ break;
+ case LGSM_INFO_TYPE_NONE:
+ default:
+ return -EINVAL;
+
+ }
+ return -EINVAL;
+}
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-02-28 12:55:34 +0100 (Wed, 28 Feb 2007)
New Revision: 1161
Removed:
trunk/src/target/gsm/src/libgsmd/libgsmd_device.c
Modified:
trunk/src/target/gsm/include/libgsmd/misc.h
trunk/src/target/gsm/src/libgsmd/Makefile.am
trunk/src/target/gsm/src/util/libgsmd-tool.c
trunk/src/target/gsm/src/util/shell.c
Log:
revert 'bug108' patch from tony guan.
Modified: trunk/src/target/gsm/include/libgsmd/misc.h
===================================================================
--- trunk/src/target/gsm/include/libgsmd/misc.h 2007-02-28 11:36:47 UTC (rev
1160)
+++ trunk/src/target/gsm/include/libgsmd/misc.h 2007-02-28 11:55:34 UTC (rev
1161)
@@ -1,5 +1,5 @@
-#ifndef _MISC_LIBGSMD_H
-#define _MISC_LIBGSMD_H
+#ifndef _LIBGSMD_H
+#define _LIBGSMD_H
/* libgsmd.h - Library API for gsmd, the GSM Daemon
* (C) 2006 by Harald Welte <[EMAIL PROTECTED]>
@@ -25,19 +25,19 @@
extern int lgsm_netreg_register(struct lgsm_handle *lh, int oper);
-typedef enum _lgsm_info_type {
+enum lgsm_info_type {
LGSM_INFO_TYPE_NONE = 0,
LGSM_INFO_TYPE_MANUF = 1,
LGSM_INFO_TYPE_MODEL = 2,
LGSM_INFO_TYPE_REVISION = 3,
LGSM_INFO_TYPE_SERIAL = 4,
LGSM_INFO_TYPE_IMSI = 5,
-}lgsm_info_type;
+};
/* Get some information about the handset */
extern int lgsm_get_info(struct lgsm_handle *lh,
- lgsm_info_type type,
- char *ret_string, unsigned int* len);
+ enum lgsm_info_type type,
+ char *ret_string, u_int16_t len);
/* Authenticate to SIM Card using specified null-terminated pin */
extern int lgsm_pin_auth(struct lgsm_handle *lh, const char *pin);
Modified: trunk/src/target/gsm/src/libgsmd/Makefile.am
===================================================================
--- trunk/src/target/gsm/src/libgsmd/Makefile.am 2007-02-28 11:36:47 UTC
(rev 1160)
+++ trunk/src/target/gsm/src/libgsmd/Makefile.am 2007-02-28 11:55:34 UTC
(rev 1161)
@@ -5,6 +5,6 @@
lib_LTLIBRARIES = libgsmd.la
libgsmd_la_LDFLAGS = -Wc,-nostartfiles -version-info $(LIBVERSION)
-libgsmd_la_SOURCES = libgsmd.c libgsmd_input.c libgsmd_voicecall.c
libgsmd_passthrough.c libgsmd_event.c libgsmd_phone.c libgsmd_network.c
libgsmd_device.c
+libgsmd_la_SOURCES = libgsmd.c libgsmd_input.c libgsmd_voicecall.c
libgsmd_passthrough.c libgsmd_event.c libgsmd_phone.c libgsmd_network.c
noinst_HEADERS = lgsm_internals.h
Deleted: trunk/src/target/gsm/src/libgsmd/libgsmd_device.c
===================================================================
--- trunk/src/target/gsm/src/libgsmd/libgsmd_device.c 2007-02-28 11:36:47 UTC
(rev 1160)
+++ trunk/src/target/gsm/src/libgsmd/libgsmd_device.c 2007-02-28 11:55:34 UTC
(rev 1161)
@@ -1,59 +0,0 @@
-/* libgsmd phone related functions
- *
- * (C) 2006-2007 by OpenMoko, Inc.
- * Written by Harald Welte <[EMAIL PROTECTED]>
- * All Rights Reserved
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <libgsmd/libgsmd.h>
-#include <libgsmd/misc.h>
-#include "lgsm_internals.h"
-
-int lgsm_get_info(struct lgsm_handle *lh,
- lgsm_info_type type,
- char *ret_string, unsigned int* len)
-{
- switch (type)
- {
- case LGSM_INFO_TYPE_MANUF:
- return lgsm_passthrough(lh,"AT+CGMI",ret_string,len);
- break;
- case LGSM_INFO_TYPE_MODEL:
- return lgsm_passthrough(lh,"AT+CGMM",ret_string,len);
- break;
- case LGSM_INFO_TYPE_REVISION:
- return lgsm_passthrough(lh,"AT+CGMR",ret_string,len);
- break;
- case LGSM_INFO_TYPE_SERIAL:
- return lgsm_passthrough(lh,"AT+CGSN",ret_string,len);
- break;
- case LGSM_INFO_TYPE_IMSI:
- return lgsm_passthrough(lh,"AT+CIMI",ret_string,len);
- break;
- case LGSM_INFO_TYPE_NONE:
- default:
- return -EINVAL;
-
- }
- return -EINVAL;
-}
Modified: trunk/src/target/gsm/src/util/libgsmd-tool.c
===================================================================
--- trunk/src/target/gsm/src/util/libgsmd-tool.c 2007-02-28 11:36:47 UTC
(rev 1160)
+++ trunk/src/target/gsm/src/util/libgsmd-tool.c 2007-02-28 11:55:34 UTC
(rev 1161)
@@ -95,14 +95,11 @@
printf("libgsm-tool - (C) 2006 by Harald Welte\n"
"This program is Free Software and has ABSOLUTELY NO
WARRANTY\n\n");
-
while (1) {
int c, option_index = 0;
c = getopt_long(argc, argv, "vVhm:p:", opts, &option_index);
if (c == -1)
- {
break;
- }
switch (c) {
case 'v':
Modified: trunk/src/target/gsm/src/util/shell.c
===================================================================
--- trunk/src/target/gsm/src/util/shell.c 2007-02-28 11:36:47 UTC (rev
1160)
+++ trunk/src/target/gsm/src/util/shell.c 2007-02-28 11:55:34 UTC (rev
1161)
@@ -48,7 +48,6 @@
"\to\tPower Off\n"
"\tR\tRegister Netowrk\n"
"\tT\tSend DTMF Tone\n"
- "\tI\tDevice Infor\n"
"\tq\tQuit\n"
);
}
@@ -59,7 +58,6 @@
char buf[STDIN_BUF_SIZE+1];
char rbuf[STDIN_BUF_SIZE+1];
int rlen = sizeof(rbuf);
-
fd_set readset;
lgsm_register_handler(lgsmh, GSMD_MSG_PASSTHROUGH, &pt_msghandler);
@@ -138,68 +136,9 @@
continue;
printf("DTMF: %c\n", buf[1]);
lgsm_voice_dtmf(lgsmh, buf[1]);
- } else if (buf[0] == 'I') {
- //FIXME: sometimes, lgsm_get_info returns directly, and
sometimes the result just gets lost.
- static int
infoindex=LGSM_INFO_TYPE_NONE;//information
- infoindex=infoindex%LGSM_INFO_TYPE_IMSI+1;
- rlen = sizeof(rbuf);
- switch(infoindex){
- case LGSM_INFO_TYPE_MANUF:
-
-
if(lgsm_get_info(lgsmh,LGSM_INFO_TYPE_MANUF,rbuf,&rlen))
- {
- printf("manufacturer:%s\n",rbuf);
- }
- else
- printf("manufacturer information
error!\n");
- break;
-
- case LGSM_INFO_TYPE_MODEL:
-
if(lgsm_get_info(lgsmh,LGSM_INFO_TYPE_MODEL,rbuf,&rlen))
- {
- printf("model:%s\n",rbuf);
- }
- else
- printf("model error!\n");
- break;
-
- case LGSM_INFO_TYPE_REVISION:
-
if(lgsm_get_info(lgsmh,LGSM_INFO_TYPE_REVISION,rbuf,&rlen))
- {
- printf("revision:%s\n",rbuf);
- }
- else
- printf("revision information error!\n");
- break;
-
- case LGSM_INFO_TYPE_IMSI:
-
if(lgsm_get_info(lgsmh,LGSM_INFO_TYPE_IMSI,rbuf,&rlen))
- {
- printf("imei:%s\n",rbuf);
- }
- else
- printf("imei information error!\n");
- break;
- case LGSM_INFO_TYPE_SERIAL:
-
if(lgsm_get_info(lgsmh,LGSM_INFO_TYPE_SERIAL,rbuf,&rlen))
- {
- printf("sn:%s\n",rbuf);
- }
- else
- printf("sn information error!\n");
- break;
- default:
- printf("something is wrong!\n");
- }
-
-
-
- }
- else {
+ } else {
printf("Unknown command `%s'\n", buf);
}
}
}
}
-
-
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-02-28 13:05:17 +0100 (Wed, 28 Feb 2007)
New Revision: 1162
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/configure.ac
trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c
Log:
* Clean up configure.ac and add a check for EContactPhotoType. Fixes bug 219.
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/configure.ac
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/configure.ac
2007-02-28 11:55:34 UTC (rev 1161)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/configure.ac
2007-02-28 12:05:17 UTC (rev 1162)
@@ -11,22 +11,21 @@
AC_PROG_LIBTOOL
# base deps
-PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.1,,
- AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.1 not
installed ***]))
-
-PKG_CHECK_MODULES(LIBGSMD, libgsmd ,,
- AC_MSG_ERROR([*** Required libgsmd not installed ***]))
+PKG_CHECK_MODULES(DIALER, openmoko-libs >= 0.0.1 libgsmd alsa libebook-1.2)
-PKG_CHECK_MODULES(LIBASOUND, alsa,,
- AC_MSG_ERROR([*** Required libasound not installed ***]))
+old_cflags=$CFLAGS
+CFLAGS=$DIALER_CFLAGS
+AC_CHECK_TYPE(EContactPhotoType, [], [], [#include <libebook/e-book.h>])
+CFLAGS=$old_cflags
+if test $ac_cv_type_EContactPhotoType = yes; then
+ AC_DEFINE(HAVE_ECONTACT_PHOTO_TYPE, 1, [Defined if EContactPhotoType
exists])
+fi
-PKG_CHECK_MODULES(LIBEBOOK, libebook-1.2,,
- AC_MSG_ERROR([*** Required libasound not installed ***]))
-LIBS="$LIBS $GTK_LIBS $LIBGSMD_LIBS $LIBASOUND_LIBS $LIBEBOOK_LIBS -lm -ldl"
+LIBS="$DIALER_LIBS -lm -ldl"
-CFLAGS="$CFLAGS $OPENMOKO_CFLAGS $LIBGSMD_CFLAGS $LIBASOUND_CFLAGS
$LIBEBOOK_CFLAGS"
+CFLAGS="$DIALER_CFLAGS"
# output stuff
AC_OUTPUT([
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
2007-02-28 11:55:34 UTC (rev 1161)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
2007-02-28 12:05:17 UTC (rev 1162)
@@ -1,6 +1,6 @@
AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
-DPKGDATADIR=\"$(pkgdatadir)\"
-AM_CFLAGS = -Wall -pedantic -std=c99 @OPENMOKO_CFLAGS@
+AM_CFLAGS = -Wall -pedantic -std=c99 @CFLAGS@
bin_PROGRAMS = openmoko-dialer
@@ -24,5 +24,5 @@
moko-dialer-status.c\
alsa.c
-openmoko_dialer_LDADD = @OPENMOKO_LIBS@
+openmoko_dialer_LDADD = @LIBS@
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c
2007-02-28 11:55:34 UTC (rev 1161)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c
2007-02-28 12:05:17 UTC (rev 1162)
@@ -15,8 +15,8 @@
*
* Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
*/
-#define LIBEBOOK1_2_5 1
#include "contacts.h"
+#include "config.h"
/**
* @brief initialze the contact list, this will be called from outside,
contactlist
@@ -644,11 +644,11 @@
if(photo)
if (photo)
{
-#ifndef LIBEBOOK1_2_5
+#ifdef HAVE_ECONTACT_PHOTO_TYPE
gdk_pixbuf_loader_write (loader, photo->data.inlined.data,
photo->data.inlined.length, NULL);
#else
- gdk_pixbuf_loader_write (loader, photo->data, photo->length, NULL); //just
temporaly modified.
+ gdk_pixbuf_loader_write (loader, photo->data, photo->length, NULL);
#endif
}
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-02-28 16:15:37 +0100 (Wed, 28 Feb 2007)
New Revision: 1163
Modified:
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokodetailswindow
Log:
* Set MokoDetailsWindow background as per mockup on
<http://wiki.openmoko.org/wiki/Look_%26_Feel#Native_Stylus-Based>
Modified:
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokodetailswindow
===================================================================
---
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokodetailswindow
2007-02-28 12:05:17 UTC (rev 1162)
+++
trunk/src/target/OM-2007/artwork/themes/openmoko-standard/gtk-2.0/mokodetailswindow
2007-02-28 15:15:37 UTC (rev 1163)
@@ -63,3 +63,10 @@
}
widget "*.mokodetailswindow-fullscreen-button-on" style
"mokodetailswindow-fullscreen-button-on"
+style "mokodetailswindow" {
+ bg[NORMAL] = "#e5e5e5"
+ fg[NORMAL] = "#000"
+ bg_pixmap[NORMAL] = ""
+}
+widget "*.MokoDetailsWindow.*" style "mokodetailswindow"
+
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-02-28 16:28:25 +0100 (Wed, 28 Feb 2007)
New Revision: 1164
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-contact-pane.c
Log:
* src/contacts-contact-pane.c: (make_widget): Set a widget name for the field
label
(contacts_contact_pane_set_editable): Save the contact when switching to view
mode
Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
2007-02-28 15:15:37 UTC (rev 1163)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
2007-02-28 15:28:25 UTC (rev 1164)
@@ -1,3 +1,10 @@
+2007-02-28 Thomas Wood <[EMAIL PROTECTED]>
+
+ * src/contacts-contact-pane.c: (make_widget): Set a widget name for the
field
+ label
+ (contacts_contact_pane_set_editable): Save the contact when switching
to view
+ mode
+
2007-02-25 Thomas Wood <[EMAIL PROTECTED]>
* src/contacts-contact-pane.c: (make_widget): Support custom field types
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-contact-pane.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-contact-pane.c
2007-02-28 15:15:37 UTC (rev 1163)
+++
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-contact-pane.c
2007-02-28 15:28:25 UTC (rev 1164)
@@ -70,7 +70,7 @@
static FieldInfo fields[] = {
{ EVC_FN, "Name", NULL, TRUE, "<big><b>%s</b></big>", NULL },
- { EVC_ORG, "Organization", NULL, TRUE, "<span size=\"x-small\">%s</span>",
NULL },
+ { EVC_ORG, "Organization", NULL, TRUE, "<span size=\"small\">%s</span>",
NULL },
{ EVC_EMAIL, "E-Mail", "stock_mail", FALSE, NULL, email_types },
{ EVC_TEL, "Telephone", NULL, FALSE, NULL, phone_types },
{ EVC_X_JABBER, "Jabber", GTK_STOCK_MISSING_IMAGE, FALSE, NULL, email_types
},
@@ -78,6 +78,7 @@
/* Function prototypes */
static GtkWidget * make_widget (ContactsContactPane *pane, EVCardAttribute
*attr, FieldInfo *info, GtkSizeGroup *size);
+static void on_commit_cb (EBook *book, EBookStatus status, gpointer closure);
/*
* TODO:
* - add EBookView and listen for changes
@@ -400,6 +401,7 @@
if (!info->unique && !pane->priv->editable) {
s = g_strdup_printf ("%s:", type);
type_label = gtk_label_new (s);
+ gtk_widget_set_name (type_label, "fieldlabel");
if (size)
gtk_size_group_add_widget (size, type_label);
gtk_box_pack_start (GTK_BOX (box), type_label, FALSE, FALSE, 4);
@@ -679,9 +681,17 @@
if (pane->priv->editable != editable) {
pane->priv->editable = editable;
- /* strip empty attributes */
- if (editable == FALSE && pane->priv->contact)
+ /* strip empty attributes and save the contact if we're switching to view
+ * mode
+ */
+ if (editable == FALSE && pane->priv->contact) {
strip_empty_attributes (E_VCARD (pane->priv->contact));
+ if (pane->priv->dirty && pane->priv->bookview) {
+ e_book_async_commit_contact (e_book_view_get_book
(pane->priv->bookview),
+ pane->priv->contact,
+ on_commit_cb, pane);
+ }
+ }
update_ui (pane);
}
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-03-01 02:45:44 +0100 (Thu, 01 Mar 2007)
New Revision: 1165
Modified:
trunk/src/target/u-boot/patches/uboot-neo1973-resume.patch
Log:
* re-order start.S to make sure resume gets handled in the correct order
* increase timeout waiting for refresh (the current one is very high, but
works reliably. this can receive some tuning
* first init UPLL then MPLL, not the other way around
* introduce 7 nop delay between UPLL and MPLL init
* initialize UART at the very beginning, this makes it easier for resume
debugging
Modified: trunk/src/target/u-boot/patches/uboot-neo1973-resume.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-neo1973-resume.patch 2007-02-28
15:28:25 UTC (rev 1164)
+++ trunk/src/target/u-boot/patches/uboot-neo1973-resume.patch 2007-03-01
01:45:44 UTC (rev 1165)
@@ -4,34 +4,83 @@
Index: u-boot/cpu/arm920t/start.S
===================================================================
---- u-boot.orig/cpu/arm920t/start.S
-+++ u-boot/cpu/arm920t/start.S
-@@ -156,18 +156,56 @@ reset:
+--- u-boot.orig/cpu/arm920t/start.S 2007-02-28 03:51:24.000000000 +0100
++++ u-boot/cpu/arm920t/start.S 2007-03-01 02:43:47.000000000 +0100
+@@ -158,18 +158,68 @@
str r1, [r0]
# endif
+ /* default FCLK is 202 MHz ! */
+#define LOCKTIME 0x4c000000
-+#define MPLLCON 0x4c000004
-+#define MPLLCFG ((0x90 << 12) + (0x2 << 4) + 0x2)
++#define UPLLCON 0x4c000008
++//#define MPLLCFG ((0x90 << 12) + (0x2 << 4) + 0x2)
++#define MPLLCFG ((0x90 << 12) + (0x7 << 4) + 0x0)
+#define UPLLCFG ((0x78 << 12) + (0x2 << 4) + 0x3)
+ ldr r0, =LOCKTIME
+ mov r1, #0xffffff
+ str r1, [r0]
+
-+ ldr r0, =MPLLCON
-+ ldr r1, =MPLLCFG
++ ldr r0, =UPLLCON
++ ldr r1, =UPLLCFG
+ str r1, [r0]
+
-+ ldr r1, =UPLLCFG
-+ str r1, [r0, #4] /* UPLLCON */
++ /* Page 7-19, seven nops between UPLL and MPLL */
++ nop
++ nop
++ nop
++ nop
++ nop
++ nop
++ nop
+
++ ldr r1, =MPLLCFG
++ str r1, [r0, #-4] /* MPLLCON */
++
/* FCLK:HCLK:PCLK = 1:2:4 */
- /* default FCLK is 120 MHz ! */
ldr r0, =CLKDIVN
mov r1, #3
str r1, [r0]
+
++#if 1
++ /* enable uart */
++ ldr r0, =0x4c00000c /* clkcon */
++ ldr r1, =0x7fff0 /* all clocks on */
++ str r1, [r0]
++
++ /* gpio UART0 init */
++ ldr r0, =0x56000070
++ mov r1, #0xaa
++ str r1, [r0]
++
++ /* init uart */
++ ldr r0, =0x50000000
++ mov r1, #0x03
++ str r1, [r0]
++ ldr r1, =0x245
++ str r1, [r0, #0x04]
++ mov r1, #0x01
++ str r1, [r0, #0x08]
++ mov r1, #0x00
++ str r1, [r0, #0x0c]
++ mov r1, #0x1a
++ str r1, [r0, #0x28]
++#endif
++
+ #endif /* CONFIG_S3C2400 || CONFIG_S3C2410 */
+
+ #ifndef CONFIG_SKIP_LOWLEVEL_INIT
+ #ifndef CONFIG_LL_INIT_NAND_ONLY
+ bl cpu_init_crit
+ #endif
+-#endif
+
+ #ifndef CONFIG_SKIP_RELOCATE_UBOOT
+ adr r0, _start /* r0 <- current position of code */
+@@ -202,9 +252,33 @@
+
+ #ifdef CONFIG_S3C2410_NAND_BOOT
+ nand_load:
+ /* take sdram out of power down */
+ ldr r0, =0x56000080 /* misccr */
+ ldr r1, [ r0 ]
@@ -42,16 +91,13 @@
+ mov r1, #128
+1: subs r1, r1, #1
+ bpl 1b
- #endif /* CONFIG_S3C2400 || CONFIG_S3C2410 */
-
- #ifndef CONFIG_SKIP_LOWLEVEL_INIT
- #ifndef CONFIG_LL_INIT_NAND_ONLY
++
+ #if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && defined(CONFIG_LL_INIT_NAND_ONLY)
bl cpu_init_crit
#endif
--#endif
+#if defined(CONFIG_S3C2410)
+ /* ensure some refresh has happened */
-+ mov r1, #4096
++ ldr r1, =0xfffff
+1: subs r1, r1, #1
+ bpl 1b
+
@@ -63,5 +109,5 @@
+#endif /* CONFIG_S3C2410 */
+#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
- #ifndef CONFIG_SKIP_RELOCATE_UBOOT
- adr r0, _start /* r0 <- current position of code */
+ /* mov r10, lr */
+
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-03-01 02:52:32 +0100 (Thu, 01 Mar 2007)
New Revision: 1166
Modified:
trunk/src/target/u-boot/patches/uboot-mokoversion.patch
Log:
bump mokoversion to '4' to indicate resume support
Modified: trunk/src/target/u-boot/patches/uboot-mokoversion.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-mokoversion.patch 2007-03-01
01:45:44 UTC (rev 1165)
+++ trunk/src/target/u-boot/patches/uboot-mokoversion.patch 2007-03-01
01:52:32 UTC (rev 1166)
@@ -7,4 +7,4 @@
fi
fi
+
-+printf '%s' -moko3
++printf '%s' -moko4
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
