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. r1042 - in developers/werner: . splash-jtag
([EMAIL PROTECTED])
2. r1043 - trunk/src/target/OM-2007/applications/openmoko-dialer
([EMAIL PROTECTED])
3. r1044 -
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/data
([EMAIL PROTECTED])
4. r1045 - trunk/src/target/OM-2007/openmoko-libs/libmokoui
([EMAIL PROTECTED])
5. r1046 - in
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery:
data src ([EMAIL PROTECTED])
6. r1047 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
7. r1048 - in
trunk/src/target/OM-2007/applications/openmoko-mainmenu: . src
([EMAIL PROTECTED])
8. r1049 - trunk/oe/packages/openmoko-apps ([EMAIL PROTECTED])
9. r1050 - developers/werner developers/werner/splash
trunk/src/target/u-boot/patches ([EMAIL PROTECTED])
--- Begin Message ---
Author: werner
Date: 2007-02-19 13:00:31 +0100 (Mon, 19 Feb 2007)
New Revision: 1042
Added:
developers/werner/splash-jtag/
developers/werner/splash-jtag/README
developers/werner/splash-jtag/img.pl
Log:
Load a splash screen image into the frame buffer with JTAG.
Added: developers/werner/splash-jtag/README
===================================================================
--- developers/werner/splash-jtag/README 2007-02-18 16:20:24 UTC (rev
1041)
+++ developers/werner/splash-jtag/README 2007-02-19 12:00:31 UTC (rev
1042)
@@ -0,0 +1,22 @@
+Trade show mode
+===============
+
+This README describes how to load the splash screen directly into
+the frame buffer, using JTAG.
+
+Download the image (must be a 640x480 PNG):
+ wget http://wiki.openmoko.org/images/c/c2/System_boot.png
+
+Convert it into RGB 5:6:5 with half-words swapped:
+ ./img.pl >/tmp/out
+
+Fire up openocd, start u-boot, enter the prompt.
+
+Connect to openocd and get control:
+ telnet localhost 4444
+ halt
+
+Finally, load the image:
+ load_binary /tmp/out 0x33d00000
+
+Loading takes about two minutes.
Added: developers/werner/splash-jtag/img.pl
===================================================================
--- developers/werner/splash-jtag/img.pl 2007-02-18 16:20:24 UTC (rev
1041)
+++ developers/werner/splash-jtag/img.pl 2007-02-19 12:00:31 UTC (rev
1042)
@@ -0,0 +1,23 @@
+#!/usr/bin/perl
+system("pngtopnm System_boot.png | ppmtorgb3");
+for ("red", "grn", "blu") {
+ open(FILE,"noname.$_") || die "noname.$_";
+ $f = join("",<FILE>);
+ close FILE;
+ $f =~ s/^P5\s+(\d+)\s+(\d+)\s+(\d+)\s//s;
+ ($w,$h,$p) = ($1,$2,$3);
+ $p{$_} = $f;
+}
+print STDERR "$w x $h ($p)\n";
+for ($i = 0; $i != $w*$h; $i++) {
+ $r = unpack("C",substr($p{"red"},$i,1));
+ $g = unpack("C",substr($p{"grn"},$i,1));
+ $b = unpack("C",substr($p{"blu"},$i,1));
+ $v = ($r >> 3) << 11 | ($g >> 2) << 5 | ($b >> 3);
+ if ($i & 1) {
+ print pack("vv",$v,$t);
+ }
+ else {
+ $t = $v;
+ }
+}
Property changes on: developers/werner/splash-jtag/img.pl
___________________________________________________________________
Name: svn:executable
+ *
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-02-19 21:57:09 +0100 (Mon, 19 Feb 2007)
New Revision: 1043
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/openmoko-dialer.pro
Log:
openmoko-dialer: update .pro file
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/openmoko-dialer.pro
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/openmoko-dialer.pro
2007-02-19 12:00:31 UTC (rev 1042)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/openmoko-dialer.pro
2007-02-19 20:57:09 UTC (rev 1043)
@@ -19,8 +19,8 @@
src/openmoko-dialer-window-history.h \
src/openmoko-dialer-window-incoming.h \
src/openmoko-dialer-window-outgoing.h \
- src/openmoko-dialer-window-talking.h \
- src/pin.h
+ src/openmoko-dialer-window-pin.h \
+ src/openmoko-dialer-window-talking.h
SOURCES += \
src/alsa.c \
@@ -40,8 +40,8 @@
src/openmoko-dialer-window-history.c \
src/openmoko-dialer-window-incoming.c \
src/openmoko-dialer-window-outgoing.c \
- src/openmoko-dialer-window-talking.c \
- src/pin.c
+ src/openmoko-dialer-window-pin.c \
+ src/openmoko-dialer-window-talking.c
MOKOCONFIG = mokoui
PKGCONFIG += libebook-1.2 libgsmd alsa
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-02-20 00:24:57 +0100 (Tue, 20 Feb 2007)
New Revision: 1044
Added:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/data/Battery_00.png
Removed:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/data/Battery_Warning.png
Log:
openmoko-panel-battery: rename warning image to 00
Added:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/data/Battery_00.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/data/Battery_00.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Deleted:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/data/Battery_Warning.png
===================================================================
(Binary files differ)
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-02-20 00:36:47 +0100 (Tue, 20 Feb 2007)
New Revision: 1045
Modified:
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h
Log:
openmoko-libs: revert bogus GtkAlignment -> GtkWidget rename
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h
2007-02-19 23:24:57 UTC (rev 1044)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h
2007-02-19 23:36:47 UTC (rev 1045)
@@ -55,7 +55,7 @@
} MokoPanelAppletPopupType;
typedef struct {
- GtkWidget parent; /* GtkAlignment */
+ GtkAlignment parent;
GtkWidget* icon; /* GtkImage */
GtkWidget* popup[LAST_POPUP_TYPE];
GtkWidget* toplevelwindow; /* GtkWindow */
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-02-20 01:10:28 +0100 (Tue, 20 Feb 2007)
New Revision: 1046
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/data/Makefile.am
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/src/Makefile.am
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c
Log:
openmoko-panel-battery: first version working w/ matchbox-panel-2
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/data/Makefile.am
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/data/Makefile.am
2007-02-19 23:36:47 UTC (rev 1045)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/data/Makefile.am
2007-02-20 00:10:28 UTC (rev 1046)
@@ -2,4 +2,5 @@
# misc. data files
#
resourcedir = $(pkgdatadir)
-resource_DATA_DIST = Battery_01.png Battery_02.png Battery_03.png
Battery_04.png Battery_05.png Battery_Plug.png Battery.png
Battery_Warning.png
+resource_DATA = Battery_00.png Battery_01.png Battery_02.png Battery_03.png
\
+ Battery_04.png Battery_05.png Battery_Plug.png Battery.png
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/src/Makefile.am
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/src/Makefile.am
2007-02-19 23:36:47 UTC (rev 1045)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/src/Makefile.am
2007-02-20 00:10:28 UTC (rev 1046)
@@ -5,7 +5,7 @@
applet_LTLIBRARIES = libopenmoko-panel-battery.la
libopenmoko_panel_battery_la_SOURCES = openmoko-panel-battery.c
-libopenmoko_panel_battery_la_LIBADD = @OPENMOKO_LIBS@
+libopenmoko_panel_battery_la_LIBADD = @OPENMOKO_LIBS@ -lapm
MAINTAINERCLEANFILES = Makefile.in
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c
2007-02-19 23:36:47 UTC (rev 1045)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c
2007-02-20 00:10:28 UTC (rev 1046)
@@ -3,11 +3,12 @@
* Authored by Michael 'Mickey' Lauer <[EMAIL PROTECTED]>
* Copyright (C) 2007 OpenMoko Inc.
*
- * Based on Battery Applet for matchbox-panel-2 by Jorn Baayen <[EMAIL
PROTECTED]>
+ * Based on Battery Applet for matchbox-panel-2 by
+ * Jorn Baayen <[EMAIL PROTECTED]>
* (C) 2006 OpenedHand Ltd.
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser Public License as published by
+ * it under the terms of the GNU Public License as published by
* the Free Software Foundation; version 2 of the license.
*
* This program is distributed in the hope that it will be useful,
@@ -21,18 +22,28 @@
#include <libmokoui/moko-panel-applet.h>
#include <gtk/gtklabel.h>
+
+#include <apm.h>
#include <time.h>
+#define JUICE_PIXMAPS 6
+
+#define DEBUG_THIS_FILE
+
typedef struct {
- GtkLabel *label;
- guint timeout_id;
+ GdkPixbuf* enclosing;
+ GdkPixbuf* plug;
+ GdkPixbuf* juice[JUICE_PIXMAPS];
+ GdkPixbuf* indicator;
+ GtkImage *image;
+ guint timeout_id;
} BatteryApplet;
static void
battery_applet_free (BatteryApplet *applet)
{
- g_source_remove (applet->timeout_id);
- g_slice_free (BatteryApplet, applet);
+ g_source_remove (applet->timeout_id);
+ g_slice_free (BatteryApplet, applet);
}
/* Called every 5 minutes */
@@ -40,9 +51,50 @@
timeout (BatteryApplet *applet)
{
g_debug( "update battery applet" );
- // draw...
- /* Keep going */
- return TRUE;
+
+ apm_info info;
+ // How about g_new0 here?
+ memset (&info, 0, sizeof (apm_info));
+ apm_read (&info);
+
+ /* compose new pixmap and set label */
+
+ guint w = gdk_pixbuf_get_width( applet->indicator );
+ guint h = gdk_pixbuf_get_height( applet->indicator );
+
+ gdk_pixbuf_copy_area( applet->enclosing, 0, 0, w, h, applet->indicator, 0,
0 );
+
+ GdkPixbuf* icon;
+
+ //FIXME Can we actually find out, when the battery is full?
+
+ if ( info.battery_status == BATTERY_STATUS_ABSENT ||
+ info.battery_status == AC_LINE_STATUS_ON )
+ {
+ icon = applet->plug;
+ }
+ else
+ {
+ if (info.battery_percentage < 10)
+ icon = applet->juice[0];
+ else if (info.battery_percentage < 30)
+ icon = applet->juice[1];
+ else if (info.battery_percentage < 50)
+ icon = applet->juice[2];
+ else if (info.battery_percentage < 70)
+ icon = applet->juice[3];
+ else if (info.battery_percentage < 90)
+ icon = applet->juice[4];
+ else
+ icon = applet->juice[5];
+ }
+
+ //FIXME Check whether we actually need to update
+
+ gdk_pixbuf_composite( icon, applet->indicator, 0, 0, w, h, 0, 0, 1, 1,
GDK_INTERP_NEAREST, 255 );
+ gtk_image_set_from_pixbuf( applet->image, applet->indicator );
+
+ return TRUE;
}
G_MODULE_EXPORT GtkWidget* mb_panel_applet_create(const char* id,
GtkOrientation orientation)
@@ -55,16 +107,39 @@
applet = g_slice_new (BatteryApplet);
- applet->label = GTK_LABEL(gtk_label_new (NULL));
- gtk_widget_set_name( applet->label, "MatchboxPanelBattery" );
- g_object_weak_ref( G_OBJECT(applet->label), (GWeakNotify)
battery_applet_free, applet );
+ applet->image = GTK_IMAGE(gtk_image_new());
+ gtk_widget_set_name( GTK_WIDGET(applet->image), "MatchboxPanelBattery" );
+ g_object_weak_ref( G_OBJECT(applet->image), (GWeakNotify)
battery_applet_free, applet );
+ /* preload pixbufs */
+ guint i = 0;
+ applet->juice[i++] = gdk_pixbuf_new_from_file( PKGDATADIR
"/Battery_00.png", NULL );
+ applet->juice[i++] = gdk_pixbuf_new_from_file( PKGDATADIR
"/Battery_01.png", NULL );
+ applet->juice[i++] = gdk_pixbuf_new_from_file( PKGDATADIR
"/Battery_02.png", NULL );
+ applet->juice[i++] = gdk_pixbuf_new_from_file( PKGDATADIR
"/Battery_03.png", NULL );
+ applet->juice[i++] = gdk_pixbuf_new_from_file( PKGDATADIR
"/Battery_04.png", NULL );
+ applet->juice[i++] = gdk_pixbuf_new_from_file( PKGDATADIR
"/Battery_05.png", NULL );
+ applet->enclosing = gdk_pixbuf_new_from_file( PKGDATADIR "/Battery.png",
NULL );
+ applet->plug = gdk_pixbuf_new_from_file( PKGDATADIR "/Battery_Plug.png",
NULL );
+
+ applet->indicator = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8,
+ gdk_pixbuf_get_width( applet->enclosing
),
+ gdk_pixbuf_get_height( applet->enclosing
) );
+
+ gtk_widget_set_size_request( GTK_WIDGET(applet->image),
+ gdk_pixbuf_get_width( applet->indicator ),
+ gdk_pixbuf_get_height( applet->indicator ) );
+
t = time( NULL );
local_time = localtime(&t);
+#ifndef DEBUG_THIS_FILE
applet->timeout_id = g_timeout_add( 60 * 1000 * 5, (GSourceFunc) timeout,
applet);
timeout(applet);
-
- moko_panel_applet_set_widget( GTK_CONTAINER(mokoapplet), applet->label );
+ //FIXME Add source watching for charger insertion event on
/dev/input/event1
+#else
+ applet->timeout_id = g_timeout_add( 1000, (GSourceFunc) timeout, applet);
+#endif
+ moko_panel_applet_set_widget( MOKO_PANEL_APPLET(mokoapplet),
GTK_WIDGET(applet->image) );
gtk_widget_show_all( GTK_WIDGET(mokoapplet) );
return GTK_WIDGET(mokoapplet);
};
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-02-20 01:26:54 +0100 (Tue, 20 Feb 2007)
New Revision: 1047
Modified:
trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch
Log:
add nand pagesize definition
Modified: trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch 2007-02-20
00:10:28 UTC (rev 1046)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch 2007-02-20
00:26:54 UTC (rev 1047)
@@ -5,8 +5,8 @@
Index: u-boot/cpu/arm920t/s3c24x0/Makefile
===================================================================
---- u-boot.orig/cpu/arm920t/s3c24x0/Makefile 2007-02-16 23:23:38.000000000
+0100
-+++ u-boot/cpu/arm920t/s3c24x0/Makefile 2007-02-16 23:24:10.000000000
+0100
+--- u-boot.orig/cpu/arm920t/s3c24x0/Makefile 2007-02-20 01:18:11.000000000
+0100
++++ u-boot/cpu/arm920t/s3c24x0/Makefile 2007-02-20 01:18:51.000000000
+0100
@@ -26,7 +26,7 @@
LIB = $(obj)lib$(SOC).a
@@ -19,7 +19,7 @@
Index: u-boot/cpu/arm920t/s3c24x0/nand.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/cpu/arm920t/s3c24x0/nand.c 2007-02-16 23:25:05.000000000 +0100
++++ u-boot/cpu/arm920t/s3c24x0/nand.c 2007-02-20 01:18:23.000000000 +0100
@@ -0,0 +1,185 @@
+/*
+ * (C) Copyright 2006 OpenMoko, Inc.
@@ -209,8 +209,8 @@
Index: u-boot/cpu/arm920t/s3c24x0/nand_read.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/cpu/arm920t/s3c24x0/nand_read.c 2007-02-16 23:24:10.000000000
+0100
-@@ -0,0 +1,97 @@
++++ u-boot/cpu/arm920t/s3c24x0/nand_read.c 2007-02-20 01:19:20.000000000
+0100
+@@ -0,0 +1,98 @@
+/*
+ * nand_read.c: Simple NAND read functions for booting from NAND
+ *
@@ -252,6 +252,7 @@
+
+#define NAND_SECTOR_SIZE 512
+#define NAND_BLOCK_MASK (NAND_SECTOR_SIZE - 1)
++#define NAND_PAGE_SIZE 0x4000
+
+/* low level nand read function */
+int nand_read_ll(unsigned char *buf, unsigned long start_addr, int size)
@@ -310,8 +311,8 @@
+#endif /* CONFIG_S3C2410_NAND_BOOT */
Index: u-boot/cpu/arm920t/start.S
===================================================================
---- u-boot.orig/cpu/arm920t/start.S 2007-02-16 23:23:38.000000000 +0100
-+++ u-boot/cpu/arm920t/start.S 2007-02-16 23:24:10.000000000 +0100
+--- u-boot.orig/cpu/arm920t/start.S 2007-02-20 01:18:11.000000000 +0100
++++ u-boot/cpu/arm920t/start.S 2007-02-20 01:18:23.000000000 +0100
@@ -5,6 +5,10 @@
* Copyright (c) 2002 Alex Z�pke <[EMAIL PROTECTED]>
* Copyright (c) 2002 Gary Jennejohn <[EMAIL PROTECTED]>
@@ -435,8 +436,8 @@
/* Set up the stack */
Index: u-boot/include/s3c2410.h
===================================================================
---- u-boot.orig/include/s3c2410.h 2007-02-16 23:24:07.000000000 +0100
-+++ u-boot/include/s3c2410.h 2007-02-16 23:24:10.000000000 +0100
+--- u-boot.orig/include/s3c2410.h 2007-02-20 01:18:20.000000000 +0100
++++ u-boot/include/s3c2410.h 2007-02-20 01:18:23.000000000 +0100
@@ -38,12 +38,6 @@
#define S3C2410_ECCSIZE 512
#define S3C2410_ECCBYTES 3
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-02-20 01:33:25 +0100 (Tue, 20 Feb 2007)
New Revision: 1048
Modified:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/configure.ac
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/Makefile.am
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokodesktop.h
Log:
openmoko-mainmenu: make it build. See #184 and please ACT ASAP!
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/configure.ac
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/configure.ac
2007-02-20 00:26:54 UTC (rev 1047)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/configure.ac
2007-02-20 00:33:25 UTC (rev 1048)
@@ -13,9 +13,13 @@
# base deps
PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.1,,
AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.1 not
installed ***]))
-LIBS="$LIBS $GTK_LIBS"
-CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
+PKG_CHECK_MODULES(LIBMB, libmb >= 1.8,,
+ AC_MSG_ERROR([*** You need to install libmatchbox >= 1.8***]))
+
+LIBS="$LIBS $OPENMOKO_LIBS $LIBMB_LIBS"
+CFLAGS="$CFLAGS $OPENMOKO_CFLAGS $LIBMB_CFLAGS"
+
# output stuff
AC_OUTPUT([
Makefile
Modified:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/Makefile.am
2007-02-20 00:26:54 UTC (rev 1047)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/Makefile.am
2007-02-20 00:33:25 UTC (rev 1048)
@@ -1,6 +1,6 @@
AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
-DPKGDATADIR=\"$(pkgdatadir)\"
-AM_CFLAGS = -Wall -std=c99 -pedantic @OPENMOKO_CFLAGS@
+AM_CFLAGS = -Wall -std=c99 @OPENMOKO_CFLAGS@ @LIBMB_CFLAGS@
bin_PROGRAMS = openmoko-mainmenu
@@ -10,5 +10,5 @@
callbacks.c app-history.c
-openmoko_mainmenu_LDADD = @OPENMOKO_LIBS@
+openmoko_mainmenu_LDADD = @OPENMOKO_LIBS@ @LIBMB_LIBS@
Modified:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokodesktop.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokodesktop.h
2007-02-20 00:26:54 UTC (rev 1047)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokodesktop.h
2007-02-20 00:33:25 UTC (rev 1048)
@@ -15,7 +15,7 @@
#include <libmb/mb.h>
-#define VFOLDERDIR "/usr/share/matchbox"
+#define VFOLDERDIR "/usr/local/share/matchbox"
#define DD_DIR "/usr/share/applications/"
/* #define DD_DIR "/tmp/" */
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-02-20 01:35:47 +0100 (Tue, 20 Feb 2007)
New Revision: 1049
Modified:
trunk/oe/packages/openmoko-apps/openmoko-mainmenu_svn.bb
Log:
oe/openmoko-apps: openmoko-mainmenu depends on libmatchbox. See #184
Modified: trunk/oe/packages/openmoko-apps/openmoko-mainmenu_svn.bb
===================================================================
--- trunk/oe/packages/openmoko-apps/openmoko-mainmenu_svn.bb 2007-02-20
00:33:25 UTC (rev 1048)
+++ trunk/oe/packages/openmoko-apps/openmoko-mainmenu_svn.bb 2007-02-20
00:35:47 UTC (rev 1049)
@@ -4,3 +4,4 @@
inherit openmoko
+DEPENDS += "libmatchbox"
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-02-20 06:08:48 +0100 (Tue, 20 Feb 2007)
New Revision: 1050
Added:
developers/werner/splash/
developers/werner/splash/README
developers/werner/splash/splash.sh
developers/werner/splash/splashu.sh
trunk/src/target/u-boot/patches/uboot-s3c2410-splash.patch
Modified:
trunk/src/target/u-boot/patches/series
Log:
Experimental splash screen support.
Added: developers/werner/splash/README
===================================================================
--- developers/werner/splash/README 2007-02-20 00:35:47 UTC (rev 1049)
+++ developers/werner/splash/README 2007-02-20 05:08:48 UTC (rev 1050)
@@ -0,0 +1,49 @@
+Splash screen toolkit
+=====================
+
+This is preliminary and experimental. The second splash screen design isn't
+even official.
+
+- You need u-boot with uboot-s3c2410-splash.patch applied
+
+- You need a reasonably recent version of Netpbm
+
+- Download the official startup screen:
+ wget http://wiki.openmoko.org/images/c/c2/System_boot.png
+
+- Make sure that /usr/src/linux points to a valid Linux kernel source tree
+
+- Generate the first splash screen (in splash.bmp.gz):
+ ./splash.sh
+
+- Generate the update for the second splash screen (in splashu.bmp.gz):
+ ./splashu.sh
+
+- Boot into u-boot, halt the boot process
+
+- With openocd, load the images into memory
+ halt
+ load_binary wherever/splash.bmp.gz 0x32000000
+ load_binary wherever/splashu.bmp.gz 0x32005000
+ resume
+
+- Commit them to NAND flash, from the u-boot prompt
+ nand erase splash
+ nand write.e 0x32000000 splash 0x7000
+
+- Update your environment
+ setenv splashimage nand read.e 0x32000000 splash 7000\; bmp display
0x32000000
+ setenv bootcmd bmp display 0x32005000 185 475\; ${bootcmd}
+ saveenv
+
+- Power down, then up
+
+Note: if changing the images, they may grow larger than assumed here (0x5000
+bytes for the first image, 0x2000 for the second), in which case you have to
+adjust sizes and the address of the second image.
+
+Known bug: if you scribble over the 0x3200xxxx area while in u-boot, the
+second image won't display. However, I like this better than either 1)
+always loading the first image twice, or 2) manually calculating offsets
+into the "splash" partition. (Which is complicated by the possibility of
+having to skip bad blocks.)
Added: developers/werner/splash/splash.sh
===================================================================
--- developers/werner/splash/splash.sh 2007-02-20 00:35:47 UTC (rev 1049)
+++ developers/werner/splash/splash.sh 2007-02-20 05:08:48 UTC (rev 1050)
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# -meanpixel yields slightly better dithering but over-emphasizes the halos
+
+pngtopnm "${1:-System_boot.png}" |
+ pnmquant -fs 256 |
+ ppmtobmp -bpp=8 |
+ gzip -9 >"${2:-splash.bmp.gz}"
Property changes on: developers/werner/splash/splash.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: developers/werner/splash/splashu.sh
===================================================================
--- developers/werner/splash/splashu.sh 2007-02-20 00:35:47 UTC (rev 1049)
+++ developers/werner/splash/splashu.sh 2007-02-20 05:08:48 UTC (rev 1050)
@@ -0,0 +1,15 @@
+#!/bin/sh
+TUX=/usr/src/linux/Documentation/logo.gif
+
+trap "rm -f tux.pnm tux-tmp.alpha tux.alpha" 0
+
+giftopnm "${2:-$TUX}" --alphaout=tux-tmp.alpha |
+ pnmscale -height 120 >tux.pnm
+pnmscale -height 120 tux-tmp.alpha >tux.alpha
+pngtopnm "${1:-System_boot.png}" |
+ pamcomp -align=center -valign=middle -yoff=225 -alpha=tux.alpha \
+ tux.pnm - |
+ pamcut -left 185 -width 110 -bottom 605 -height 130 |
+ pnmquant -fs 256 |
+ ppmtobmp -bpp=8 |
+ gzip -9 >"${3:-splashu.bmp.gz}"
Property changes on: developers/werner/splash/splashu.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series 2007-02-20 00:35:47 UTC (rev
1049)
+++ trunk/src/target/u-boot/patches/series 2007-02-20 05:08:48 UTC (rev
1050)
@@ -34,3 +34,4 @@
# those have to be implemented fully
uboot-dfu.patch
+uboot-s3c2410-splash.patch
Added: trunk/src/target/u-boot/patches/uboot-s3c2410-splash.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410-splash.patch 2007-02-20
00:35:47 UTC (rev 1049)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410-splash.patch 2007-02-20
05:08:48 UTC (rev 1050)
@@ -0,0 +1,137 @@
+Note: most of the changes in here are pretty generic and should go to a
+separate patch. Also, some just increase u-boot's limits, and aren't
+specific to splash images per se. I'll keep them all in here for
+convenience until the code it stable.
+
+drivers/cfb_console.c: include asm/byteorder.h for le32_to_cpu and friends
+ [ shouldn't someone else have found this long ago ? ]
+drivers/cfb_console.c: set SHORTSWAP to swap nibbles
+ [ clean this up when and if HWSWP is confirmed ]
+drivers/cfb_console.c (video_logo): if "splashimage" doesn't contain an
+ address, use its content as a command
+drivers/s3c2410_fb.c (video_hw_init): set HWSWP in LCDCON5
+drivers/s3c2410_fb.c (video_hw_init): use memset instead of open-coded
+ equivalent
+include/configs/neo1973.h: increase heap from 128 kB to 400 kB, for BMP image
+ decompression
+ [ note: increasing it to 512 kB trips over something. note sure what.
+ find out. ]
+include/configs/neo1973.h (CONFIG_COMMANDS): add CFG_CMD_BMP
+include/configs/neo1973.h: raise number of command line arguments from 16 to 64
+include/configs/neo1973.h: enable splash screen and BMP support
+
+- Werner Almesberger <[EMAIL PROTECTED]>
+
+Index: u-boot/drivers/cfb_console.c
+===================================================================
+--- u-boot.orig/drivers/cfb_console.c
++++ u-boot/drivers/cfb_console.c
+@@ -191,6 +191,7 @@ CONFIG_VIDEO_HW_CURSOR: - Uses the
+ #if (CONFIG_COMMANDS & CFG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
+ #include <watchdog.h>
+ #include <bmp_layout.h>
++#include <asm/byteorder.h>
+ #endif /* (CONFIG_COMMANDS & CFG_CMD_BMP) || CONFIG_SPLASH_SCREEN */
+
+
/*****************************************************************************/
+@@ -315,6 +316,11 @@ void console_cursor (int state);
+ #define SHORTSWAP32(x) (x)
+ #endif
+
++#ifdef CONFIG_VIDEO_S3C2410
++#undef SHORTSWAP32
++#define SHORTSWAP32(x) ((((x) & 0xffff) << 16) | (((x) >> 16) &
0xffff))
++#endif
++
+ #if defined(DEBUG) || defined(DEBUG_CFB_CONSOLE)
+ #define PRINTD(x) printf(x)
+ #else
+@@ -1116,7 +1122,13 @@ static void *video_logo (void)
+ ulong addr;
+
+ if ((s = getenv ("splashimage")) != NULL) {
+- addr = simple_strtoul (s, NULL, 16);
++ char *end;
++
++ addr = simple_strtoul (s, &end, 16);
++ if (*end) {
++ run_command(s, 0);
++ return (void *) video_fb_address;
++ }
+
+ if (video_display_bitmap (addr, 0, 0) == 0) {
+ return ((void *) (video_fb_address));
+Index: u-boot/drivers/s3c2410_fb.c
+===================================================================
+--- u-boot.orig/drivers/s3c2410_fb.c
++++ u-boot/drivers/s3c2410_fb.c
+@@ -47,7 +47,6 @@ void *video_hw_init (void)
+ struct ctfb_res_modes *res_mode;
+ struct ctfb_res_modes var_mode;
+ unsigned char videoout;
+- unsigned int *vm;
+
+ /* Search for video chip */
+ printf("Video: ");
+@@ -148,7 +147,7 @@ void *video_hw_init (void)
+ lcd->LCDCON2 = 0x019fc3c1;
+ lcd->LCDCON3 = 0x0039df67;
+ lcd->LCDCON4 = 0x00000007;
+- lcd->LCDCON5 = 0x0001cb08;
++ lcd->LCDCON5 = 0x0001cb09;
+ lcd->LPCSEL = 0x00000000;
+
+ lcd->LCDSADDR1 = LCD_VIDEO_ADDR >> 1;
+@@ -164,10 +163,7 @@ void *video_hw_init (void)
+ }
+
+ /* Clear video memory */
+- i = pGD->memSize/4;
+- vm = (unsigned int *)pGD->frameAdrs;
+- while(i--)
+- *vm++ = 0;
++ memset(pGD->frameAdrs, 0, pGD->memSize);
+
+ /* Enable Display */
+ lcd->LCDCON1 |= 0x01; /* ENVID = 1 */
+Index: u-boot/include/configs/neo1973.h
+===================================================================
+--- u-boot.orig/include/configs/neo1973.h
++++ u-boot/include/configs/neo1973.h
+@@ -54,7 +54,8 @@
+ /*
+ * Size of malloc() pool
+ */
+-#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
++#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 400*1024)
++ /* >> CFG_VIDEO_LOGO_MAX_SIZE */
+ #define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial
data */
+
+ /*
+@@ -90,6 +91,7 @@
+ /* CFG_CMD_IRQ | */ \
+ CFG_CMD_BOOTD | \
+ CFG_CMD_CONSOLE | \
++ CFG_CMD_BMP | \
+ CFG_CMD_ASKENV | \
+ CFG_CMD_RUN | \
+ CFG_CMD_ECHO | \
+@@ -142,7 +144,7 @@
+ #endif
+ #define CFG_CBSIZE 256 /* Console I/O Buffer
Size */
+ #define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer
Size */
+-#define CFG_MAXARGS 16 /* max number of
command args */
++#define CFG_MAXARGS 64 /* max number of
command args */
+ #define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size
*/
+
+ #define CFG_MEMTEST_START 0x30000000 /* memtest works on */
+@@ -253,6 +255,9 @@
+ #define CONFIG_VIDEO_S3C2410
+ #define CONFIG_CFB_CONSOLE
+ #define CONFIG_VIDEO_LOGO
++#define CONFIG_SPLASH_SCREEN
++#define CFG_VIDEO_LOGO_MAX_SIZE (640*480+1024+100) /* 100 = slack */
++#define CONFIG_VIDEO_BMP_GZIP
+ #define CONFIG_VGA_AS_SINGLE_DEVICE
+
+ #define VIDEO_KBD_INIT_FCT 0
--- End Message ---
_______________________________________________
commitlog mailing list
[EMAIL PROTECTED]
http://lists.openmoko.org/mailman/listinfo/commitlog
