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. r1333 - developers/werner ([EMAIL PROTECTED])
2. r1334 - in
trunk/src/target/OM-2007/applications/openmoko-dialer: data src
([EMAIL PROTECTED])
3. r1335 -
trunk/src/target/OM-2007/applications/openmoko-dialer/src
([EMAIL PROTECTED])
4. r1336 - trunk/src/host/devirginator ([EMAIL PROTECTED])
5. r1337 -
trunk/src/target/OM-2007/applications/openmoko-dialer/data
([EMAIL PROTECTED])
--- Begin Message ---
Author: werner
Date: 2007-03-13 05:21:55 +0100 (Tue, 13 Mar 2007)
New Revision: 1333
Modified:
developers/werner/TODO
Log:
Some updates to keep my readers amused.
Modified: developers/werner/TODO
===================================================================
--- developers/werner/TODO 2007-03-13 02:12:59 UTC (rev 1332)
+++ developers/werner/TODO 2007-03-13 04:21:55 UTC (rev 1333)
@@ -12,9 +12,8 @@
- send customs war story
bugzilla:
- P0
- P1
- #164: improve non-SanDisk microSD support in u-boot
+ - #212
other:
- set up automated build tests on buildhost-old
@@ -52,9 +51,10 @@
- get debug v2 to work
- local: make fs ("lab") boot into Gentoo directly
-review:
-http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=231
-http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=237
+- http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=231
+ switch display backlight GPIO to "output, off" when suspending
+- http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=217
+ Implement NAND OTP area read/write as u-boot commands
- reopen #179 for console without menu
- we need to check for an invalid block marker in the first _and_
@@ -66,12 +66,14 @@
+can't optimize. but when it knows what the caller does, whoopee !
<LaF0rge> if the power button gets pressed often accidentially (when in off
+mode), then we read the flash again and again and again
+
block 0/OTP:
- "sacred"
- BT MAC
- host key
- as little code as possible
+- push openocd wait_idle+timeout upstream
* force non-SPI: nope
* power cycle (SD_ON, not data): nyet
@@ -79,3 +81,13 @@
* exact speed: nichts
* manual bit-banging:
* pessimistic speed: so-so (kingston, toshiba)
+
+- devirginator: use partition names
+
+<LaF0rge> werner: so we should add a 'boot from SD' to the menu
+<LaF0rge> werner: all we need is rootfs=/dev/mmcblk0p1 rootdelay=5
+/uImage
+
+- devirginator: fail if environment is too messed up
+- add not fail-safe keyword
+- find and fix OpenOCD "already halted" error
--- End Message ---
--- Begin Message ---
Author: tony_guan
Date: 2007-03-13 06:58:15 +0100 (Tue, 13 Mar 2007)
New Revision: 1334
Added:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/exit.png
trunk/src/target/OM-2007/applications/openmoko-dialer/data/incoming_0.png
trunk/src/target/OM-2007/applications/openmoko-dialer/data/incoming_1.png
trunk/src/target/OM-2007/applications/openmoko-dialer/data/incoming_2.png
trunk/src/target/OM-2007/applications/openmoko-dialer/data/incoming_3.png
trunk/src/target/OM-2007/applications/openmoko-dialer/data/outgoing_0.png
trunk/src/target/OM-2007/applications/openmoko-dialer/data/outgoing_1.png
trunk/src/target/OM-2007/applications/openmoko-dialer/data/outgoing_2.png
trunk/src/target/OM-2007/applications/openmoko-dialer/data/outgoing_3.png
trunk/src/target/OM-2007/applications/openmoko-dialer/data/talking_0.png
trunk/src/target/OM-2007/applications/openmoko-dialer/data/talking_1.png
trunk/src/target/OM-2007/applications/openmoko-dialer/data/talking_2.png
trunk/src/target/OM-2007/applications/openmoko-dialer/data/talking_3.png
Removed:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/10086.png
trunk/src/target/OM-2007/applications/openmoko-dialer/data/chaowei.png
trunk/src/target/OM-2007/applications/openmoko-dialer/data/ken.png
trunk/src/target/OM-2007/applications/openmoko-dialer/data/sally.png
trunk/src/target/OM-2007/applications/openmoko-dialer/data/status0.png
trunk/src/target/OM-2007/applications/openmoko-dialer/data/status1.png
trunk/src/target/OM-2007/applications/openmoko-dialer/data/status2.png
trunk/src/target/OM-2007/applications/openmoko-dialer/data/steven.png
trunk/src/target/OM-2007/applications/openmoko-dialer/data/tony.png
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-declares.h
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
Log:
dynamic status displaying support.
Deleted: trunk/src/target/OM-2007/applications/openmoko-dialer/data/10086.png
===================================================================
(Binary files differ)
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
2007-03-13 04:21:55 UTC (rev 1333)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
2007-03-13 05:58:15 UTC (rev 1334)
@@ -1,13 +1,4 @@
-EXTRA_DIST = tony.png\
- steven.png\
- ken.png\
- sally.png\
- 10086.png\
- chaowei.png\
- unkown.png\
- status0.png\
- status1.png\
- status2.png\
+EXTRA_DIST =unkown.png\
dialed.png\
missed.png\
received.png\
@@ -16,35 +7,35 @@
phone.png\
delete.png\
dtmf.png\
- talking.png\
sms.png\
all.png\
history.png\
delete_01.png\
- incall.png\
- connecting.png\
answer.png\
cancel.png\
hangup.png\
redial.png\
- failure.png
-
+ failure.png\
+ incoming_0.png\
+ incoming_1.png\
+ incoming_2.png\
+ incoming_3.png\
+ outgoing_0.png\
+ outgoing_1.png\
+ outgoing_2.png\
+ outgoing_3.png\
+ talking_0.png\
+ talking_1.png\
+ talking_2.png\
+ talking_3.png\
+ exit.png
+
resourcedir = $(pkgdatadir)
-resource_DATA = tony.png\
- steven.png\
- ken.png\
- sally.png\
- 10086.png\
- chaowei.png\
- unkown.png\
- status0.png\
- status1.png\
- status2.png\
+resource_DATA =unkown.png\
dialed.png\
missed.png\
received.png\
- received.png\
speaker.png\
email.png\
phone.png\
@@ -55,10 +46,21 @@
all.png\
history.png\
delete_01.png\
- incall.png\
- connecting.png\
answer.png\
cancel.png\
hangup.png\
redial.png\
- failure.png
+ failure.png\
+ incoming_0.png\
+ incoming_1.png\
+ incoming_2.png\
+ incoming_3.png\
+ outgoing_0.png\
+ outgoing_1.png\
+ outgoing_2.png\
+ outgoing_3.png\
+ talking_0.png\
+ talking_1.png\
+ talking_2.png\
+ talking_3.png\
+ exit.png
Deleted: trunk/src/target/OM-2007/applications/openmoko-dialer/data/chaowei.png
===================================================================
(Binary files differ)
Added: trunk/src/target/OM-2007/applications/openmoko-dialer/data/exit.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/exit.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/target/OM-2007/applications/openmoko-dialer/data/incoming_0.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/incoming_0.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/target/OM-2007/applications/openmoko-dialer/data/incoming_1.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/incoming_1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/target/OM-2007/applications/openmoko-dialer/data/incoming_2.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/incoming_2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/target/OM-2007/applications/openmoko-dialer/data/incoming_3.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/incoming_3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/src/target/OM-2007/applications/openmoko-dialer/data/ken.png
===================================================================
(Binary files differ)
Added: trunk/src/target/OM-2007/applications/openmoko-dialer/data/outgoing_0.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/outgoing_0.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/target/OM-2007/applications/openmoko-dialer/data/outgoing_1.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/outgoing_1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/target/OM-2007/applications/openmoko-dialer/data/outgoing_2.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/outgoing_2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/target/OM-2007/applications/openmoko-dialer/data/outgoing_3.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/outgoing_3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/src/target/OM-2007/applications/openmoko-dialer/data/sally.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007/applications/openmoko-dialer/data/status0.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007/applications/openmoko-dialer/data/status1.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007/applications/openmoko-dialer/data/status2.png
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007/applications/openmoko-dialer/data/steven.png
===================================================================
(Binary files differ)
Added: trunk/src/target/OM-2007/applications/openmoko-dialer/data/talking_0.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/talking_0.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/target/OM-2007/applications/openmoko-dialer/data/talking_1.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/talking_1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/target/OM-2007/applications/openmoko-dialer/data/talking_2.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/talking_2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/target/OM-2007/applications/openmoko-dialer/data/talking_3.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/talking_3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/src/target/OM-2007/applications/openmoko-dialer/data/tony.png
===================================================================
(Binary files differ)
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-declares.h
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-declares.h
2007-03-13 04:21:55 UTC (rev 1333)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-declares.h
2007-03-13 05:58:15 UTC (rev 1334)
@@ -25,7 +25,7 @@
//MAXDISPNAMENUM MUST >=1 & <=9!
#define MOKO_DIALER_MIN_SENSATIVE_LEN (1) ///<only when user inputs at
least MINSENSATIVELEN, should we start to search.
-#define MOKO_DIALER_MAX_STATUS_ICONS (3) ///<THE NUMBERS OF THE ICONS
WHEN OUTGOING CALL IS ON
+#define MOKO_DIALER_MAX_STATUS_ICONS (6) ///<THE NUMBERS OF THE ICONS
WHEN OUTGOING CALL IS ON
#define MOKO_DIALER_DEFAULT_PERSON_IMAGE_PATH ("unkown.png") ///<THE
DEFAULT PERSON IMAGE
#define MOKO_DIALER_MAX_TIPS (3)
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c
2007-03-13 04:21:55 UTC (rev 1333)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c
2007-03-13 05:58:15 UTC (rev 1334)
@@ -414,7 +414,7 @@
p_dialer_data);
button =
GTK_WIDGET (moko_finger_tool_box_add_button_without_label (tools));
- image = file_new_image_from_relative_path ("tony.png");
+ image = file_new_image_from_relative_path ("exit.png");
moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON
(button), image);
g_signal_connect (G_OBJECT (button), "clicked",
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c
2007-03-13 04:21:55 UTC (rev 1333)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c
2007-03-13 05:58:15 UTC (rev 1334)
@@ -247,9 +247,10 @@
vbox = gtk_vbox_new (FALSE, 0);
status = moko_dialer_status_new ();
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
"incall.png");
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
"connecting.png");
-// moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
"status2.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "
incoming_0.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "
incoming_1.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "
incoming_2.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "
incoming_3.png");
moko_dialer_status_set_icon_by_index (MOKO_DIALER_STATUS (status), 0);
gtk_box_pack_start (GTK_BOX (vbox), status, FALSE, FALSE, 0);
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c
2007-03-13 04:21:55 UTC (rev 1333)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c
2007-03-13 05:58:15 UTC (rev 1334)
@@ -258,9 +258,10 @@
vbox = gtk_vbox_new (FALSE, 0);
status = moko_dialer_status_new ();
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
"connecting.png");
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
"status1.png");
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
"status2.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
"outgoing_0.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
"outgoing_1.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
"outgoing_2.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
"outgoing_3.png");
moko_dialer_status_set_error_icon(MOKO_DIALER_STATUS
(status),"failure.png");
moko_dialer_status_set_icon_by_index (MOKO_DIALER_STATUS (status), 0);
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
2007-03-13 04:21:55 UTC (rev 1333)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
2007-03-13 05:58:15 UTC (rev 1334)
@@ -305,8 +305,10 @@
content_talk = gtk_vbox_new (FALSE, 0);
status = moko_dialer_status_new ();
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
"talking.png");
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
"connecting.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
"talking_0.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
"talking_1.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
"talking_2.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
"talking_3.png");
moko_dialer_status_set_icon_by_index (MOKO_DIALER_STATUS (status), 0);
--- End Message ---
--- Begin Message ---
Author: tony_guan
Date: 2007-03-13 07:05:35 +0100 (Tue, 13 Mar 2007)
New Revision: 1335
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c
Log:
incoming_0.png
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c
2007-03-13 05:58:15 UTC (rev 1334)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c
2007-03-13 06:05:35 UTC (rev 1335)
@@ -247,10 +247,10 @@
vbox = gtk_vbox_new (FALSE, 0);
status = moko_dialer_status_new ();
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "
incoming_0.png");
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "
incoming_1.png");
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "
incoming_2.png");
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "
incoming_3.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
"incoming_0.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
"incoming_1.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
"incoming_2.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
"incoming_3.png");
moko_dialer_status_set_icon_by_index (MOKO_DIALER_STATUS (status), 0);
gtk_box_pack_start (GTK_BOX (vbox), status, FALSE, FALSE, 0);
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-03-13 07:07:18 +0100 (Tue, 13 Mar 2007)
New Revision: 1336
Modified:
trunk/src/host/devirginator/envedit.pl
trunk/src/host/devirginator/environment.in
trunk/src/host/devirginator/setup.sh
Log:
envedit.pl (readenv): make it an error to load an environment smaller than 6
bytes
setup.sh: use partition names for dfu-util
environment.in: added "Boot from microSD" menu option (untested)
environment.in: added "regular_boot" to bootargs_base
setup.sh: just do a "reset halt" after the DFU upload, no complicated and buggy
experiment with breakpoint
Modified: trunk/src/host/devirginator/envedit.pl
===================================================================
--- trunk/src/host/devirginator/envedit.pl 2007-03-13 06:05:35 UTC (rev
1335)
+++ trunk/src/host/devirginator/envedit.pl 2007-03-13 06:07:18 UTC (rev
1336)
@@ -50,6 +50,11 @@
open(FILE, $file) || die "$file: $!";
$env = join("", <FILE>);
close FILE;
+ if (length $env < 6) { # CRC plus \0\0
+ print STDERR sprintf("Environment is too small (%d bytes < 6)\n",
+ length $env);
+ exit(1);
+ }
if (length $env != $ENV_SIZE) {
print STDERR sprintf("warning: environment is %d bytes, expected %d\n",
length $env, $ENV_SIZE);
Modified: trunk/src/host/devirginator/environment.in
===================================================================
--- trunk/src/host/devirginator/environment.in 2007-03-13 06:05:35 UTC (rev
1335)
+++ trunk/src/host/devirginator/environment.in 2007-03-13 06:07:18 UTC (rev
1336)
@@ -8,6 +8,7 @@
console=ttySAC0,115200
console=tty0
loglevel=8
+ regular_boot
bootcmd=
setenv bootargs ${bootargs_base} ${mtdparts};
@@ -26,25 +27,26 @@
stderr=usbtty
stdin=usbtty
-#menu_1=
-# Boot from microSD:
-# setenv bootargs rootfstype=
-# mmcinit;
-# ext2load mmc 0 0x32000000 uImage;
-# bootm 0x32000000
+menu_1=
+ Boot from microSD:
+ setenv bootargs
+ ${bootargs_base} rootfstype=ext2 rootfs=/dev/mmcblk0p1 rootdelay=5;
+ mmcinit;
+ ext2load mmc 0 0x32000000 uImage;
+ bootm 0x32000000
-menu_1=
+menu_2=
Set console to USB:
setenv stdin usbtty;
setenv stdout usbtty;
setenv stderr usbtty
-menu_2=
+menu_3=
Set console to serial:
setenv stdin serial;
setenv stdout serial;
setenv stderr serial
-menu_3=
+menu_4=
Power off:
neo1973 power-off
Modified: trunk/src/host/devirginator/setup.sh
===================================================================
--- trunk/src/host/devirginator/setup.sh 2007-03-13 06:05:35 UTC (rev
1335)
+++ trunk/src/host/devirginator/setup.sh 2007-03-13 06:07:18 UTC (rev
1336)
@@ -342,15 +342,15 @@
if \$stage2; then
echo === STAGE 2: DFU upload
sleep 5
- $DFU_UTIL -a 3 -D $UIMAGE
- $DFU_UTIL -a 5 -D $ROOTFS
- $DFU_UTIL -a 4 -D tmp/splash.gz
- $DFU_UTIL -a 2 -U tmp/env.old
+ $DFU_UTIL -a kernel -D $UIMAGE
+ $DFU_UTIL -a rootfs -D $ROOTFS
+ $DFU_UTIL -a splash -D tmp/splash.gz
+ $DFU_UTIL -a u-boot_env -U tmp/env.old
./openocdcmd.pl $OPENOCD_HOST $OPENOCD_PORT \
- "bp 0x33f80000 4 hw" reset wait_halt "rbp 0x33f80000" resume exit
+ "reset halt" wait_halt resume exit
sleep 5
./envedit.pl -i tmp/env.old -o tmp/env.new -f tmp/environment
- $DFU_UTIL -a 2 -D tmp/env.new
+ $DFU_UTIL -a u-boot_env -D tmp/env.new
./openocdcmd.pl $OPENOCD_HOST $OPENOCD_PORT "reset run" exit
fi
--- End Message ---
--- Begin Message ---
Author: tony_guan
Date: 2007-03-13 08:34:44 +0100 (Tue, 13 Mar 2007)
New Revision: 1337
Added:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/openmoko-dialer.desktop
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
Log:
desktop file
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
2007-03-13 06:07:18 UTC (rev 1336)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
2007-03-13 07:34:44 UTC (rev 1337)
@@ -1,3 +1,6 @@
+
+resourcedir = $(pkgdatadir)
+
EXTRA_DIST =unkown.png\
dialed.png\
missed.png\
@@ -30,8 +33,6 @@
talking_3.png\
exit.png
-resourcedir = $(pkgdatadir)
-
resource_DATA =unkown.png\
dialed.png\
missed.png\
@@ -64,3 +65,15 @@
talking_2.png\
talking_3.png\
exit.png
+#
+# desktop integration: .desktop file
+#
+desktopdir = $(datadir)/applications
+dist_desktop_DATA = openmoko-dialer.desktop
+
+#
+# desktop integration: application icon
+#
+appicondir = $(datadir)/icons
+dist_appicon_DATA = connecting.png
+
Added:
trunk/src/target/OM-2007/applications/openmoko-dialer/data/openmoko-dialer.desktop
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/data/openmoko-dialer.desktop
2007-03-13 06:07:18 UTC (rev 1336)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/data/openmoko-dialer.desktop
2007-03-13 07:34:44 UTC (rev 1337)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Openmoko-dialer
+Comment=dialer
+Exec=openmoko-dialer
+Icon=connecting.png
+Terminal=false
+Type=Application
+Categories=GTK;Application;PIM;Office
+MimeType=text/x-vcard;
+SingleInstance=false
+StartupNotify=true
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
