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. r4156 - trunk/src/host/devirginator ([EMAIL PROTECTED])
2. r4157 -
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit
([EMAIL PROTECTED])
3. r4158 - trunk/src/target ([EMAIL PROTECTED])
4. r4159 - in trunk/src/target/gsm: include/gsmd include/libgsmd
src/gsmd ([EMAIL PROTECTED])
5. r4160 - in trunk/src/host/dfu-util: . doc
([EMAIL PROTECTED])
6. r4161 - developers/tick/Test_env_script_GTA02A5
([EMAIL PROTECTED])
7. r4162 - in trunk/src/target/gsm: include/gsmd include/libgsmd
src/gsmd ([EMAIL PROTECTED])
8. r4163 - in trunk/src/target: . OM-2007.2/misc
([EMAIL PROTECTED])
9. r4164 - trunk/src/target/u-boot/patches ([EMAIL PROTECTED])
--- Begin Message ---
Author: werner
Date: 2008-03-04 04:38:36 +0100 (Tue, 04 Mar 2008)
New Revision: 4156
Modified:
trunk/src/host/devirginator/environment.in
Log:
The copy u-boot from NOR to NAND feature produced a non-bootable system.
At least the preboot pointers where wrong and this change fixes them.
However, there may be more issues.
Since the usefulness of this feature is somewhat questionable, we just
turn it off by default, and maybe look into it again at a later time.
Modified: trunk/src/host/devirginator/environment.in
===================================================================
--- trunk/src/host/devirginator/environment.in 2008-03-04 03:27:05 UTC (rev
4155)
+++ trunk/src/host/devirginator/environment.in 2008-03-04 03:38:36 UTC (rev
4156)
@@ -100,12 +100,12 @@
ext2load mmc MMC_NUM 0x32000000 /boot/${sd_image_name};
bootm 0x32000000
-#ifdef NOR_ENV
+#ifdef look_into_this_later_NOR_ENV
menu_3=
Copy u-boot from NOR to NAND:
cp.l 0x18000000 0x32000000 0x10000;
- mw.l 0x32000040 0 2;
+ mw.l 0x32000040 0 2; # preboot_override and env_override
nand write.e 0x32000000 0 0x40000;
dynenv set u-boot_env
--- End Message ---
--- Begin Message ---
Author: erin_yueh
Date: 2008-03-04 04:45:41 +0100 (Tue, 04 Mar 2008)
New Revision: 4157
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c
Log:
sms: change debug msg (Erin Yueh)
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c
2008-03-04 03:38:36 UTC (rev 4156)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c
2008-03-04 03:45:41 UTC (rev 4157)
@@ -288,13 +288,13 @@
message = NULL;
switch (sms->payload.coding_scheme) {
case ALPHABET_DEFAULT :
- g_debug ("Decoding 7-bit ASCII message");
+ g_debug ("Decoding 7-bit ASCII message:");
message = g_malloc0 (GSMD_SMS_DATA_MAXLEN);
unpacking_7bit_character (&sms->payload, message);
break;
case ALPHABET_8BIT :
/* TODO: Verify: Is this encoding just UTF-8? (it is on my Samsung phone)
*/
- g_debug ("Decoding UTF-8 message");
+ g_debug ("Decoding UTF-8 message:");
message = g_strdup (sms->payload.data);
break;
case ALPHABET_UCS2 :
@@ -302,7 +302,7 @@
gint i;
gunichar2 *ucs2 = (gunichar2 *)sms->payload.data;
- g_debug ("Decoding UCS-2 message");
+ g_debug ("Decoding UCS-2 message:");
for (i = 0; i < sms->payload.length / 2; i++)
ucs2[i] = GUINT16_FROM_BE(ucs2[i]);
--- End Message ---
--- Begin Message ---
Author: sean_chiang
Date: 2008-03-04 04:53:02 +0100 (Tue, 04 Mar 2008)
New Revision: 4158
Removed:
trunk/src/target/audio/
Log:
duplicated
--- End Message ---
--- Begin Message ---
Author: erin_yueh
Date: 2008-03-04 04:56:36 +0100 (Tue, 04 Mar 2008)
New Revision: 4159
Modified:
trunk/src/target/gsm/include/gsmd/usock.h
trunk/src/target/gsm/include/libgsmd/phonebook.h
trunk/src/target/gsm/src/gsmd/gsmd.c
Log:
gsmd: change TE character set to UCS2 (olv)
Modified: trunk/src/target/gsm/include/gsmd/usock.h
===================================================================
--- trunk/src/target/gsm/include/gsmd/usock.h 2008-03-04 03:53:02 UTC (rev
4158)
+++ trunk/src/target/gsm/include/gsmd/usock.h 2008-03-04 03:56:36 UTC (rev
4159)
@@ -638,7 +638,7 @@
/* Refer to GSM 07.07 subclause 8.14 */
/* FIXME: the nlength and tlength depend on SIM, use +CPBR=? to get */
#define GSMD_PB_NUMB_MAXLEN 44
-#define GSMD_PB_TEXT_MAXLEN 14
+#define GSMD_PB_TEXT_MAXLEN (14*4)
struct gsmd_phonebook {
int8_t index;
char numb[GSMD_PB_NUMB_MAXLEN+1];
Modified: trunk/src/target/gsm/include/libgsmd/phonebook.h
===================================================================
--- trunk/src/target/gsm/include/libgsmd/phonebook.h 2008-03-04 03:53:02 UTC
(rev 4158)
+++ trunk/src/target/gsm/include/libgsmd/phonebook.h 2008-03-04 03:56:36 UTC
(rev 4159)
@@ -35,7 +35,7 @@
/* Refer to GSM 07.07 subclause 8.14 */
/* FIXME: the nlength and tlength depend on SIM, use +CPBR=? to get */
#define LGSM_PB_NUMB_MAXLEN 44
-#define LGSM_PB_TEXT_MAXLEN 14
+#define LGSM_PB_TEXT_MAXLEN (14*4)
struct lgsm_phonebook {
int index;
char numb[LGSM_PB_NUMB_MAXLEN+1];
Modified: trunk/src/target/gsm/src/gsmd/gsmd.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/gsmd.c 2008-03-04 03:53:02 UTC (rev
4158)
+++ trunk/src/target/gsm/src/gsmd/gsmd.c 2008-03-04 03:56:36 UTC (rev
4159)
@@ -193,6 +193,7 @@
atcmd_submit(gsmd, atcmd_fill("AT+CIMI", 7+1,
&gsmd_get_imsi_cb, gsmd, 0, NULL));
+ rc |= gsmd_simplecmd(gsmd, "AT+CSCS=\"UCS2\"");
sms_cb_init(gsmd);
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-03-04 05:10:10 +0100 (Tue, 04 Mar 2008)
New Revision: 4160
Added:
trunk/src/host/dfu-util/doc/
trunk/src/host/dfu-util/doc/dfu-util.1
Log:
From: Uwe Hermann <[EMAIL PROTECTED]>
Here's a small manpage I've written for dfu-util.
Added: trunk/src/host/dfu-util/doc/dfu-util.1
===================================================================
--- trunk/src/host/dfu-util/doc/dfu-util.1 2008-03-04 03:56:36 UTC (rev
4159)
+++ trunk/src/host/dfu-util/doc/dfu-util.1 2008-03-04 04:10:10 UTC (rev
4160)
@@ -0,0 +1,115 @@
+.TH DFU-UTIL 1 "February 29, 2008"
+.SH NAME
+dfu-util \- Device firmware update (DFU) USB programmer
+.SH SYNOPSIS
+.B dfu-util \fR[\fB\-ldpciatUDRhV\fR]
+.SH DESCRIPTION
+.B dfu-util
+is a program that implements the host (PC) side of the USB DFU
+(Universal Serial Bus Device Firmware Upgrade) protocol.
+.sp
+In the OpenMoko project (for example), this program is used to communicate
+with the specially enhanced u-boot boot loader, which implements the DFU
+device side.
+.SH OPTIONS
+.TP
+.B "\-l, \-\-list"
+List the currently attached DFU capable USB devices.
+.TP
+.BR "\-d, \-\-device" " VENDOR:PRODUCT"
+Specify vendor/product ID of the DFU device. Both
+.B VENDOR
+and
+.B PRODUCT
+are hex-numbers which must start with
+.BR 0x .
+Example:
+.sp
+.B " $ dfu-util --device 0x1457:0x5119"
+.sp
+If you only have one standards-compliant DFU device attached to your PC,
+this is optional. However, as soon as you have multiple DFU devices,
+dfu-util will detect this and abort, asking you to specify which device
+it shall use.
+.TP
+.BR "\-p, \-\-path" " BUS-PORT. ... .PORT"
+Specify the path to the DFU device.
+.TP
+.BR "\-c, \-\-cfg" " CONFIG-NR"
+Specify the configuration of the DFU device.
+.TP
+.BR "\-i, \-\-intf" " INTF-NR"
+Specify the DFU interface number.
+.TP
+.BR "\-a, \-\-alt" " ALT"
+Specify the altsetting of the DFU interface by name or by number.
+.TP
+.B "\-t, \-\-transfer-size"
+Specify the number of bytes per USB transfer. If you don't supply this
+option, the maximum possible size for your combination of host OS and
+USB device is chosen (for optimal performance).
+.TP
+.BR "\-U, \-\-upload" " FILE"
+Read firmware from device into
+.BR FILE .
+.sp
+.B Note:
+Upload support is currently broken.
+.TP
+.BR "\-D, \-\-download" " FILE"
+Write firmware from
+.B FILE
+into device.
+.TP
+.B "\-R, \-\-reset"
+Issue USB reset signalling once we're finished.
+.TP
+.B "\-h, \-\-help"
+Show a help text and exit.
+.TP
+.B "\-V, \-\-version"
+Show version information and exit.
+.SH EXAMPLES
+Here are some examples for the usage of dfu-util in the OpenMoko project
+(working with the Neo1973 hardware):
+.PP
+Flashing the rootfs:
+.br
+.B " $ dfu-util -a rootfs -R -D /path/to/openmoko-devel-image.jffs2"
+.PP
+Flashing the kernel:
+.br
+.B " $ dfu-util -a kernel -R -D /path/to/uImage"
+.PP
+Flashing the bootloader:
+.br
+.B " $ dfu-util -a u-boot -R -D /path/to/u-boot.bin"
+.PP
+Copying a kernel into RAM:
+.br
+.B " $ dfu-util -a 0 -R -D /path/to/uImage"
+.sp
+Once this has finished, the kernel will be available at the default load
+address of 0x32000000 in Neo1973 RAM.
+.sp
+.B Note:
+You cannot transfer more than 2MB of data into RAM using this method.
+.SH BUGS
+Please see
+.B http://wiki.openmoko.org/wiki/Dfu-util
+for some limitations and bugs in the current dfu-util code.
+.PP
+Please report any further bugs at
+.B http://bugzilla.openmoko.org
+or on the openmoko-kernel mailing list at
+.BR [EMAIL PROTECTED] .
+.SH LICENCE
+.B dfu-util
+is covered by the GNU General Public License (GPL), version 2 or later.
+.SH AUTHORS
+Weston Schmidt <[EMAIL PROTECTED]>
+.br
+Harald Welte <[EMAIL PROTECTED]>
+.PP
+This manual page was written by Uwe Hermann <[EMAIL PROTECTED]>.
+It is licensed under the terms of the GNU GPL (version 2 or later).
--- End Message ---
--- Begin Message ---
Author: tick
Date: 2008-03-04 05:23:44 +0100 (Tue, 04 Mar 2008)
New Revision: 4161
Modified:
developers/tick/Test_env_script_GTA02A5/setupenv
Log:
update images source
Modified: developers/tick/Test_env_script_GTA02A5/setupenv
===================================================================
--- developers/tick/Test_env_script_GTA02A5/setupenv 2008-03-04 04:10:10 UTC
(rev 4160)
+++ developers/tick/Test_env_script_GTA02A5/setupenv 2008-03-04 04:23:44 UTC
(rev 4161)
@@ -3,35 +3,35 @@
IMAGE_DIR="images.storage"
NEEDDOWNLOAD=1;
ASSASSINTESTENV=1;
+INTERNALFLAG=1
-get_date() {
- YEAR=`date +%Y`
- MONTH=`date +%m`
- DAY=`date +%d`
+if ( ping -c 2 barbie.tw.openmoko.com 2>&1 > /dev/null ) && ((
${INTERNALFLAG}==1 ));then
+ echo "Get Images from Barbie..."
+ unset UBOOT
+
KERNEL=http://barbie/~build/internal-daily-build/neo1973/deploy/glibc/images/neo1973/uImage-neo1973-latest.bin
+
ROOTFS=http://barbie/~build/internal-daily-build/neo1973/deploy/glibc/images/neo1973/openmoko-freerunner-image-fic-gta02.jffs2
+else
+ echo "Get Images from Buildhost...."
+
UBOOT=http://buildhost.openmoko.org/daily/neo1973/deploy/glibc/images/neo1973/uboot-gta02v5-latest.bin
+
KERNEL=http://buildhost.openmoko.org/daily/neo1973/deploy/glibc/images/neo1973/uImage-neo1973-latest.bin
+
ROOTFS=http://buildhost.openmoko.org/daily/neo1973/deploy/glibc/images/neo1973/openmoko-devel-image-fic-gta01.jffs2
+fi
+
+config_ssh()
+{
+
+ TARGET=~/.ssh/config
+ if (( `grep "Host neo" ${TARGET} | wc -l` > 0 ));then
+ return
+ fi
+ echo "" >> ${TARGET}
+ echo "Host neo" >> ${TARGET}
+ echo " HostName 192.168.0.202" >> ${TARGET}
+ echo " User root" >> ${TARGET}
+ echo " StrictHostKeyChecking no" >> ${TARGET}
+ echo " UserKnownHostsFile /dev/null" >> ${TARGET}
return
}
-get_days_of_month() {
- if (( $MONTH == 1 )) || (( $MONTH == 3 )) || (( $MONTH == 5 )) ||((
$MONTH == 7 )) || (( $MONTH == 8 )) || (( $MONTH == 10 )) || (( $MONTH == 0
)); then
- DAY=31
- elif (( $MONTH == 2 ));then
- DAY=28 # forget about 2/29 here :-P
- else
- DAY=30
- fi
- return
-}
-get_date_sub1 () {
- let DAY=$DAY-1
- if (( $DAY == 0 ));then
- let MONTH=$MONTH-1
- get_days_of_month
- fi
- if (( $MONTH == 0 ));then
- MONTH=12;
- let YEAR=$YEAR-1
- fi
-}
-
setup_env()
{
echo "Use it without any warranty but with best wishes!!"
@@ -80,18 +80,11 @@
if (( ${NEEDDOWNLOAD} > 0 ));then
pushd ${IMAGE_DIR}
rm -rf *
-
UBOOT=http://buildhost.openmoko.org/daily/neo1973/deploy/glibc/images/neo1973/uboot-gta02v5-latest.bin
- wget ${UBOOT}
-
KERNEL=http://buildhost.openmoko.org/daily/neo1973/deploy/glibc/images/neo1973/uImage-neo1973-latest.bin
+ if [ ${UBOOT} ];then
+ wget ${UBOOT}
+ fi
wget ${KERNEL}
- get_date
-
ROOTFS=http://buildhost.openmoko.org/daily/neo1973/deploy/glibc/images/neo1973/OpenMoko-openmoko-devel-image-glibc-ipk-P1-Snapshot-${YEAR}${MONTH}${DAY}-fic-gta02.rootfs.jffs2
- echo Try to get ${ROOTFS}
- while ! ( wget ${ROOTFS} );do
- get_date_sub1
-
ROOTFS=http://buildhost.openmoko.org/daily/neo1973/deploy/glibc/images/neo1973/OpenMoko-openmoko-devel-image-glibc-ipk-P1-Snapshot-${YEAR}${MONTH}${DAY}-fic-gta02.rootfs.jffs2
- echo Try to get ${ROOTFS}
- done
+ wget ${ROOTFS}
popd
fi
@@ -120,11 +113,13 @@
pushd ${IMAGE_DIR}
sleep 1
- sudo ../dfu-util -d ${ID} -a kernel -R -D ./uImage-neo1973-latest.bin
+ sudo ../dfu-util -d ${ID} -a kernel -R -D ./`basename ${KERNEL}`
sleep 3
- sudo ../dfu-util -d ${ID} -a rootfs -R -D
./OpenMoko-openmoko-devel-image-glibc-ipk-P1-Snapshot-*-fic-gta02.rootfs.jffs2
- sleep 5
- sudo ../dfu-util -d ${ID} -a u-boot -R -D ./uboot-gta02v5-latest.bin
+ sudo ../dfu-util -d ${ID} -a rootfs -R -D ./`basename ${ROOTFS}`
+ if [ ${UBOOT} ];then
+ sleep 5
+ sudo ../dfu-util -d ${ID} -a u-boot -R -D ./`basename ${UBOOT}`
+ fi
sleep 15
popd
@@ -140,10 +135,14 @@
echo Ok please wait for system booting....
sleep 60
sudo ./setneo
-rm -rf ~/.ssh/known_hosts
sleep 100
if (( ${ASSASSINTESTENV}== 1));then
+ if ! [ -e ~/.ssh/config ]; then
+ config_ssh
+ elif (( `cat ~/.ssh/config | grep "neo" | wc -l`== 0 ));then
+ config_ssh
+ fi
scp gta02.conf resolv.conf setup_at_neo_assassin.script [EMAIL
PROTECTED]:~/
ssh [EMAIL PROTECTED] "chmod 755
./setup_at_neo_assassin.script;./setup_at_neo_assassin.script"
fi
--- End Message ---
--- Begin Message ---
Author: erin_yueh
Date: 2008-03-04 07:57:19 +0100 (Tue, 04 Mar 2008)
New Revision: 4162
Modified:
trunk/src/target/gsm/include/gsmd/usock.h
trunk/src/target/gsm/include/libgsmd/phonebook.h
trunk/src/target/gsm/src/gsmd/gsmd.c
Log:
gsmd: revert to r4158 (Erin Yueh)
Modified: trunk/src/target/gsm/include/gsmd/usock.h
===================================================================
--- trunk/src/target/gsm/include/gsmd/usock.h 2008-03-04 04:23:44 UTC (rev
4161)
+++ trunk/src/target/gsm/include/gsmd/usock.h 2008-03-04 06:57:19 UTC (rev
4162)
@@ -638,7 +638,7 @@
/* Refer to GSM 07.07 subclause 8.14 */
/* FIXME: the nlength and tlength depend on SIM, use +CPBR=? to get */
#define GSMD_PB_NUMB_MAXLEN 44
-#define GSMD_PB_TEXT_MAXLEN (14*4)
+#define GSMD_PB_TEXT_MAXLEN 14
struct gsmd_phonebook {
int8_t index;
char numb[GSMD_PB_NUMB_MAXLEN+1];
Modified: trunk/src/target/gsm/include/libgsmd/phonebook.h
===================================================================
--- trunk/src/target/gsm/include/libgsmd/phonebook.h 2008-03-04 04:23:44 UTC
(rev 4161)
+++ trunk/src/target/gsm/include/libgsmd/phonebook.h 2008-03-04 06:57:19 UTC
(rev 4162)
@@ -35,7 +35,7 @@
/* Refer to GSM 07.07 subclause 8.14 */
/* FIXME: the nlength and tlength depend on SIM, use +CPBR=? to get */
#define LGSM_PB_NUMB_MAXLEN 44
-#define LGSM_PB_TEXT_MAXLEN (14*4)
+#define LGSM_PB_TEXT_MAXLEN 14
struct lgsm_phonebook {
int index;
char numb[LGSM_PB_NUMB_MAXLEN+1];
Modified: trunk/src/target/gsm/src/gsmd/gsmd.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/gsmd.c 2008-03-04 04:23:44 UTC (rev
4161)
+++ trunk/src/target/gsm/src/gsmd/gsmd.c 2008-03-04 06:57:19 UTC (rev
4162)
@@ -193,7 +193,6 @@
atcmd_submit(gsmd, atcmd_fill("AT+CIMI", 7+1,
&gsmd_get_imsi_cb, gsmd, 0, NULL));
- rc |= gsmd_simplecmd(gsmd, "AT+CSCS=\"UCS2\"");
sms_cb_init(gsmd);
--- End Message ---
--- Begin Message ---
Author: graeme
Date: 2008-03-04 11:34:16 +0100 (Tue, 04 Mar 2008)
New Revision: 4163
Added:
trunk/src/target/audio/
Removed:
trunk/src/target/OM-2007.2/misc/alsa-state-files/
Log:
Move alsa states to a more generic path
Copied: trunk/src/target/audio (from rev 4162,
trunk/src/target/OM-2007.2/misc/alsa-state-files)
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-03-04 11:48:00 +0100 (Tue, 04 Mar 2008)
New Revision: 4164
Modified:
trunk/src/target/u-boot/patches/gta02-bootmenu.patch
trunk/src/target/u-boot/patches/nor-bootmenu.patch
trunk/src/target/u-boot/patches/uboot-gta02.patch
Log:
This ports wake-up reason handling forward from GTA01. In particular, it makes
sure that we don't power up unless the POWER button is held down for a while.
The user interaction of all this still needs a bit of fine-tuning.
uboot-gta02.patch:
- board/neo1973/gta02/gta02.c (board_late_init): enabled wake-up reason
handling and updated it for the PCF50633
gta02-bootmenu.patch: updated context for above change
nor-bootmenu.patch:
- updated context
- board/neo1973/gta02/gta02.c (board_late_init): examine wakeup reason also on
NOR boot
Modified: trunk/src/target/u-boot/patches/gta02-bootmenu.patch
===================================================================
--- trunk/src/target/u-boot/patches/gta02-bootmenu.patch 2008-03-04
10:34:16 UTC (rev 4163)
+++ trunk/src/target/u-boot/patches/gta02-bootmenu.patch 2008-03-04
10:48:00 UTC (rev 4164)
@@ -2,35 +2,7 @@
===================================================================
--- u-boot.orig/board/neo1973/gta02/gta02.c
+++ u-boot/board/neo1973/gta02/gta02.c
-@@ -241,10 +241,10 @@
- gpio->GPJDAT |= 0x000000001; /* GTA02v1_GPIO_3D_RESET */
- #endif
-
--#if 0
- /* if there's no other reason, must be regular reset */
- neo1973_wakeup_cause = NEO1973_WAKEUP_RESET;
-
-+#if 0
- if (!booted_from_nand)
- goto woken_by_reset;
-
-@@ -274,6 +274,7 @@
- }
-
- woken_by_reset:
-+#endif
-
- while (neo1973_wakeup_cause == NEO1973_WAKEUP_RESET ||
- neo1973_on_key_pressed()) {
-@@ -294,7 +295,6 @@
- jbt6k74_init();
- jbt6k74_enter_state(JBT_STATE_NORMAL);
- jbt6k74_display_onoff(1);
--#endif
-
- #if 0
- {
-@@ -303,12 +303,12 @@
+@@ -306,12 +306,12 @@ continue_boot:
if (!(gpio->GPFDAT & (1 << 5)))
gpio->GPBDAT &= ~(1 << 2);
}
@@ -45,7 +17,7 @@
return 0;
}
-@@ -403,13 +403,11 @@
+@@ -408,13 +408,11 @@ int neo1973_on_key_pressed(void)
& PCF50633_OOCSTAT_ONKEY);
}
Modified: trunk/src/target/u-boot/patches/nor-bootmenu.patch
===================================================================
--- trunk/src/target/u-boot/patches/nor-bootmenu.patch 2008-03-04 10:34:16 UTC
(rev 4163)
+++ trunk/src/target/u-boot/patches/nor-bootmenu.patch 2008-03-04 10:48:00 UTC
(rev 4164)
@@ -21,10 +21,19 @@
+ extern unsigned char booted_from_nor;
+
+ S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
- unsigned char tmp;
+ uint8_t int1, int2;
char buf[32];
int menu_vote = 0; /* <= 0: no, > 0: yes */
-@@ -307,7 +309,7 @@ continue_boot:
+@@ -246,7 +248,7 @@ int board_late_init(void)
+ /* if there's no other reason, must be regular reset */
+ neo1973_wakeup_cause = NEO1973_WAKEUP_RESET;
+
+- if (!booted_from_nand)
++ if (!booted_from_nand && !booted_from_nor)
+ goto woken_by_reset;
+
+ /* obtain wake-up reason, save INT1 in environment */
+@@ -308,7 +310,7 @@ continue_boot:
}
#endif
Modified: trunk/src/target/u-boot/patches/uboot-gta02.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-gta02.patch 2008-03-04 10:34:16 UTC
(rev 4163)
+++ trunk/src/target/u-boot/patches/uboot-gta02.patch 2008-03-04 10:48:00 UTC
(rev 4164)
@@ -94,7 +94,7 @@
===================================================================
--- /dev/null
+++ u-boot/board/neo1973/gta02/gta02.c
-@@ -0,0 +1,452 @@
+@@ -0,0 +1,455 @@
+/*
+ * (C) 2006-2007 by OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -307,7 +307,7 @@
+{
+ S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
+ extern unsigned char booted_from_nand;
-+ unsigned char tmp;
++ uint8_t int1, int2;
+ char buf[32];
+ int menu_vote = 0; /* <= 0: no, > 0: yes */
+ int seconds = 0;
@@ -315,6 +315,10 @@
+ /* Initialize the Power Management Unit with a safe register set */
+ pcf50633_init();
+
++ /* obtain wake-up reason */
++ int1 = pcf50633_reg_read(PCF50633_REG_INT1);
++ int2 = pcf50633_reg_read(PCF50633_REG_INT2);
++
+ /* switch on one of the power led's */
+ neo1973_led(GTA02_LED_PWR_ORANGE, 1);
+
@@ -336,29 +340,29 @@
+ gpio->GPJDAT |= (1 << 5); /* GTA02_GPIO_3D_RESET */
+#endif
+
-+#if 0
+ /* if there's no other reason, must be regular reset */
+ neo1973_wakeup_cause = NEO1973_WAKEUP_RESET;
+
+ if (!booted_from_nand)
+ goto woken_by_reset;
+
-+ /* obtain wake-up reason, save INT1 in environment */
-+ tmp = pcf50606_reg_read(PCF50606_REG_INT1);
-+ sprintf(buf, "0x%02x", tmp);
-+ setenv("pcf50606_int1", buf);
++ /* save wake-up reason in environment */
++ sprintf(buf, "0x%02x", int1);
++ setenv("pcf50633_int1", buf);
++ sprintf(buf, "0x%02x", int2);
++ setenv("pcf50633_int2", buf);
+
-+ if (tmp & PCF50606_INT1_ALARM) {
++ if (int1 & PCF50633_INT1_ALARM) {
+ /* we've been woken up by RTC alarm, boot */
+ neo1973_wakeup_cause = NEO1973_WAKEUP_ALARM;
+ goto continue_boot;
+ }
-+ if (tmp & PCF50606_INT1_EXTONR) {
++ if (int1 & PCF50633_INT1_USBINS) {
+ /* we've been woken up by charger insert */
+ neo1973_wakeup_cause = NEO1973_WAKEUP_CHARGER;
+ }
+
-+ if (tmp & PCF50606_INT1_ONKEYF) {
++ if (int2 & PCF50633_INT2_ONKEYF) {
+ /* we've been woken up by a falling edge of the onkey */
+ neo1973_wakeup_cause = NEO1973_WAKEUP_POWER_KEY;
+ }
@@ -389,7 +393,6 @@
+ jbt6k74_init();
+ jbt6k74_enter_state(JBT_STATE_NORMAL);
+ jbt6k74_display_onoff(1);
-+#endif
+
+ /* switch on the backlight */
+ neo1973_backlight(1);
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
