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. r2835 - trunk/oe/packages/uboot ([EMAIL PROTECTED])
2. r2836 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
3. r2837 - in
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2: .
images po src ([EMAIL PROTECTED])
4. r2838 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: laforge
Date: 2007-08-27 14:32:02 +0200 (Mon, 27 Aug 2007)
New Revision: 2835
Modified:
trunk/oe/packages/uboot/uboot-gta01_svn.bb
Log:
* build from latest u-boot mainline head and our current patch repository trunk
* build u-boot for gta02v2
Modified: trunk/oe/packages/uboot/uboot-gta01_svn.bb
===================================================================
--- trunk/oe/packages/uboot/uboot-gta01_svn.bb 2007-08-27 12:25:11 UTC (rev
2834)
+++ trunk/oe/packages/uboot/uboot-gta01_svn.bb 2007-08-27 12:32:02 UTC (rev
2835)
@@ -9,14 +9,14 @@
PROVIDES = "virtual/bootloader"
S = "${WORKDIR}/git"
-SRC_URI =
"http://buildhost.openmoko.org/sources/git_www.denx.de.git.u-boot.git._8993e54b6f397973794f3d6f47d3b3c0c98dd4f6.tar.gz
\
-
svn://svn.openmoko.org/branches/u-boot/pre-20070822;module=patches;proto=http \
+SRC_URI = "git://www.denx.de/git/u-boot.git/;protocol=git \
+
svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http \
file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
"
EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
TARGET_LDFLAGS = ""
-UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 smdk2440 hxd8 qt2410 gta02v1"
+UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 smdk2440 hxd8 qt2410 gta02v1
gta02v2"
do_quilt() {
mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-08-28 03:36:21 +0200 (Tue, 28 Aug 2007)
New Revision: 2836
Modified:
trunk/src/target/u-boot/patches/uboot-gta02.patch
Log:
fix cosmetic issue leading to compilation problems
Modified: trunk/src/target/u-boot/patches/uboot-gta02.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-gta02.patch 2007-08-27 12:32:02 UTC
(rev 2835)
+++ trunk/src/target/u-boot/patches/uboot-gta02.patch 2007-08-28 01:36:21 UTC
(rev 2836)
@@ -1326,7 +1326,7 @@
+#define B7_SCAN 0x1 /* 9bit */
#elif defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3) || \
- defined(CONFIG_ARCH_GTA01B_v4)
-+ defined(CONFIG_ARCH_GTA01B_v4) || defined(CONFIG_ARCH_GTA02_v1) || \
++ defined(CONFIG_ARCH_GTA01B_v4) || defined(CONFIG_ARCH_GTA02_v1)
#define B6_SCAN 0x2 /* 10bit */
+#define B7_SCAN 0x2 /* 10bit */
#endif
--- End Message ---
--- Begin Message ---
Author: abraxa
Date: 2007-08-28 10:46:55 +0200 (Tue, 28 Aug 2007)
New Revision: 2837
Added:
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-balance-left.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-balance-right.png
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/po/
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/po/LINGUAS
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/po/POTFILES.in
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/configure.ac
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/Makefile.am
Log:
Fixed some build issues
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/Makefile.am
2007-08-28 01:36:21 UTC (rev 2836)
+++ trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/Makefile.am
2007-08-28 08:46:55 UTC (rev 2837)
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src images intl
-# po
+SUBDIRS = images src po
+#intl
EXTRA_DIST = openmoko-mediaplayer.desktop openmoko-mediaplayer.png
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/configure.ac
2007-08-28 01:36:21 UTC (rev 2836)
+++ trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/configure.ac
2007-08-28 08:46:55 UTC (rev 2837)
@@ -1,5 +1,5 @@
AC_PREREQ(2.53)
-AC_INIT(openmoko-mediaplayer, 0.0.1, http://openmoko.org)
+AC_INIT(openmoko-mediaplayer2, 0.0.1, http://openmoko.org)
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR(src/main.c)
AM_CONFIG_HEADER(config.h)
@@ -10,16 +10,14 @@
AC_PROG_CXX
AC_STDC_HEADERS
AC_PROG_LIBTOOL
+AC_PROG_INSTALL
-AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION([0.12.1])
+GETTEXT_PACKAGE=openmoko-mediaplayer2
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
+AC_SUBST(GETTEXT_PACKAGE)
+AM_GLIB_GNU_GETTEXT
-CFLAGS="-I${prefix}/include $CFLAGS"
-AC_SUBST(CFLAGS)
-CPPFLAGS="-I${prefix}/include $CPPFLAGS"
-AC_SUBST(CPPFLAGS)
-
# Check for GTK/GLib/GThread/Pango, dbus, OpenMoko libs, gstreamer, expat,
uriparser and XSPF
PKG_CHECK_MODULES(GTK, [glib-2.0 >= 2.4.0 gtk+-2.0 >= 2.4.0 gthread-2.0
pango],,
@@ -28,26 +26,26 @@
PKG_CHECK_MODULES(DBUS, [dbus-glib-1 >= 0.23.4],,
AC_MSG_ERROR([*** Cannot find dbus-glib-1 ***]))
-#PKG_CHECK_MODULES(OPENMOKO, [openmoko-libs >= 0.0.1],,
-# AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.1 not installed
***]))
+# We just check for libmokoui2 for now (down below)
+#PKG_CHECK_MODULES(OPENMOKO, [openmoko-libs >= 0.1.0],,
+# AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.1.0 not installed
***]))
PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10 >= 0.10],,
AC_MSG_ERROR([*** Cannot find gstreamer ***]))
-LIBS="-lexpat -L${prefix}/lib $LIBS"
-AC_CHECK_LIB(expat, XML_Parse, [], [echo "Error: libexpat not found"; exit -1])
+LIBS="-lexpat $LIBS"
+AC_CHECK_LIB(expat, XML_Parse, , [echo "Error: libexpat not found"; exit -1])
LIBS="-luriparser $LIBS"
-AC_CHECK_LIB(uriparser, uriParseUriW, [], [echo "Error: liburiparser not
found"; exit -1])
+AC_CHECK_LIB(uriparser, uriParseUriW, , [echo "Error: liburiparser not found";
exit -1])
LIBS="-lspiff $LIBS"
-AC_CHECK_LIB(spiff, spiff_parse, [], [echo "Error: XSPF library (libspiff) not
found"; exit -1])
+AC_CHECK_LIB(spiff, spiff_parse, , [echo "Error: XSPF library (libspiff) not
found"; exit -1])
LIBS="-lmokoui2 $LIBS"
-AC_CHECK_LIB(mokoui2, moko_stock_register, [], [echo "Error: libmokoui2 not
found"; exit -1])
+AC_CHECK_LIB(mokoui2, moko_stock_register, , [echo "Error: libmokoui2 not
found"; exit -1])
-
LIBS="$GTK_LIBS $OPENMOKO_LIBS $GSTREAMER_LIBS $LIBS"
CFLAGS="$OPENMOKO_CFLAGS $GSTREAMER_CFLAGS $CFLAGS"
@@ -62,6 +60,5 @@
src/Makefile
images/Makefile
po/Makefile.in
- intl/Makefile
])
AC_OUTPUT
Added:
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-balance-left.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-balance-left.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-balance-right.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-balance-right.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/po/LINGUAS
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/po/LINGUAS
2007-08-28 01:36:21 UTC (rev 2836)
+++ trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/po/LINGUAS
2007-08-28 08:46:55 UTC (rev 2837)
@@ -0,0 +1 @@
+# No languages available at this point
Added:
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/po/POTFILES.in
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/po/POTFILES.in
2007-08-28 01:36:21 UTC (rev 2836)
+++
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/po/POTFILES.in
2007-08-28 08:46:55 UTC (rev 2837)
@@ -0,0 +1,11 @@
+# List of source files containing translatable strings.
+
+src/editor_page.c
+src/files_page.c
+src/guitools.c
+src/main.c
+src/main_page.c
+src/persistent.c
+src/playback.c
+src/playlist_page.c
+src/playlist.c
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/Makefile.am
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/Makefile.am
2007-08-28 01:36:21 UTC (rev 2836)
+++
trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/Makefile.am
2007-08-28 08:46:55 UTC (rev 2837)
@@ -11,7 +11,7 @@
$(DBUS_CFLAGS) \
$(OPENMOKO_CFLAGS) \
$(OMP_DEFINES) \
- -I${top_srcdir}/intl -Wall -pedantic -std=c99
+ -I../intl -I${top_srcdir}/intl -Wall -pedantic -std=c99
openmoko_mediaplayer_CPPFLAGS = \
-Wall -pedantic
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-08-28 10:47:37 +0200 (Tue, 28 Aug 2007)
New Revision: 2838
Modified:
trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
trunk/src/target/u-boot/patches/uboot-gta02.patch
trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch
Log:
* implement gps and gsm power switching for GTA02
* move udc_disconnect() call into usb driver, not gta01 core patch (which is
applied before usb driver)
Modified: trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
2007-08-28 08:46:55 UTC (rev 2837)
+++ trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
2007-08-28 08:47:37 UTC (rev 2838)
@@ -504,7 +504,7 @@
===================================================================
--- /dev/null
+++ u-boot/board/neo1973/common/cmd_neo1973.c
-@@ -0,0 +1,99 @@
+@@ -0,0 +1,115 @@
+/*
+ * (C) Copyright 2006 by OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -579,6 +579,20 @@
+ neo1973_vibrator(1);
+ else
+ neo1973_vibrator(0);
++ } else if (!strcmp(argv[1], "gsm")) {
++ if (argc < 3)
++ goto out_help;
++ if (!strcmp(argv[2], "on"))
++ neo1973_gsm(1);
++ else
++ neo1973_gsm(0);
++ } else if (!strcmp(argv[1], "gps")) {
++ if (argc < 3)
++ goto out_help;
++ if (!strcmp(argv[2], "on"))
++ neo1973_gps(1);
++ else
++ neo1973_gps(0);
+ } else {
+out_help:
+ printf("Usage:\n%s\n", cmdtp->usage);
@@ -602,6 +616,8 @@
+ "neo1973 charger off - disable charging\n"
+ "neo1973 backlight (on|off) - switch backlight on or off\n"
+ "neo1973 vibrator (on|off) - switch vibrator on or off\n"
++ "neo1973 gsm (on|off) - switch GSM Modem on or off\n"
++ "neo1973 gps (on|off) - switch GPS system on or off\n"
+);
+#endif /* CONFIG_CMD_BDI */
Index: u-boot/board/neo1973/common/jbt6k74.c
@@ -1335,7 +1351,7 @@
===================================================================
--- /dev/null
+++ u-boot/board/neo1973/gta01/gta01.c
-@@ -0,0 +1,422 @@
+@@ -0,0 +1,431 @@
+/*
+ * (C) 2006 by OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -1666,7 +1682,6 @@
+void neo1973_poweroff(void)
+{
+ serial_printf("poweroff\n");
-+ udc_disconnect();
+ pcf50606_reg_write(PCF50606_REG_OOCC1, PCF50606_OOCC1_GOSTDBY);
+ /* don't return to caller */
+ while (1) ;
@@ -1702,6 +1717,16 @@
+#endif
+}
+
++void neo1973_gsm(int on)
++{
++ printf("not implemented yet!\n");
++}
++
++void neo1973_gps(int on)
++{
++ printf("not implemented yet!\n");
++}
++
+int neo1973_911_key_pressed(void)
+{
+ S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
@@ -2250,7 +2275,7 @@
===================================================================
--- /dev/null
+++ u-boot/board/neo1973/common/neo1973.h
-@@ -0,0 +1,32 @@
+@@ -0,0 +1,34 @@
+#ifndef _NEO1973_H
+#define _NEO1973_H
+
@@ -2276,6 +2301,8 @@
+void neo1973_poweroff(void);
+void neo1973_backlight(int on);
+void neo1973_vibrator(int on);
++void neo1973_gsm(int on);
++void neo1973_gps(int on);
+
+int neo1973_911_key_pressed(void);
+
Modified: trunk/src/target/u-boot/patches/uboot-gta02.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-gta02.patch 2007-08-28 08:46:55 UTC
(rev 2837)
+++ trunk/src/target/u-boot/patches/uboot-gta02.patch 2007-08-28 08:47:37 UTC
(rev 2838)
@@ -91,7 +91,7 @@
===================================================================
--- /dev/null
+++ u-boot/board/neo1973/gta02/gta02.c
-@@ -0,0 +1,370 @@
+@@ -0,0 +1,387 @@
+/*
+ * (C) 2006-2007 by OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -421,6 +421,23 @@
+#endif
+}
+
++void neo1973_gsm(int on)
++{
++ /* GPIO2 of PMU */
++ if (on)
++ pcf50633_reg_write(PCF50633_REG_GPIO2CFG, 0x07);
++ else
++ pcf50633_reg_write(PCF50633_REG_GPIO2CFG, 0x00);
++}
++
++void neo1973_gps(int on)
++{
++ if (on)
++ pcf50633_reg_write(PCF50633_REG_LDO5ENA, 0x01);
++ else
++ pcf50633_reg_write(PCF50633_REG_LDO5ENA, 0x00);
++}
++
+int neo1973_new_second(void)
+{
+ return pcf50633_reg_read(PCF50633_REG_INT1) & PCF50633_INT1_SECOND;
Modified: trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch 2007-08-28
08:46:55 UTC (rev 2837)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch 2007-08-28
08:47:37 UTC (rev 2838)
@@ -1166,14 +1166,14 @@
===================================================================
--- u-boot.orig/board/neo1973/common/cmd_neo1973.c
+++ u-boot/board/neo1973/common/cmd_neo1973.c
-@@ -72,6 +72,18 @@
- neo1973_vibrator(1);
+@@ -86,6 +86,18 @@
+ neo1973_gps(1);
else
- neo1973_vibrator(0);
+ neo1973_gps(0);
+ } else if (!strcmp(argv[1], "udc")) {
+ if (argc < 3)
+ goto out_help;
-+ if (!strcmp(argv[2], "udc")) {
++ if (!strcmp(argv[2], "pullup")) {
+ if (argc < 4)
+ goto out_help;
+ if (!strcmp(argv[3], "on"))
@@ -1185,11 +1185,11 @@
} else {
out_help:
printf("Usage:\n%s\n", cmdtp->usage);
-@@ -95,5 +107,6 @@
- "neo1973 charger off - disable charging\n"
- "neo1973 backlight (on|off) - switch backlight on or off\n"
+@@ -111,5 +123,6 @@
"neo1973 vibrator (on|off) - switch vibrator on or off\n"
-+ "neo1973 udc pullup (on|off) - switch pull-up on or off\n"
+ "neo1973 gsm (on|off) - switch GSM Modem on or off\n"
+ "neo1973 gps (on|off) - switch GPS system on or off\n"
++ "neo1973 udc pullup (on|off) - switch USB device controller pull-up on
or off\n"
);
#endif /* CONFIG_CMD_BDI */
Index: u-boot/board/neo1973/gta01/Makefile
@@ -1248,3 +1248,15 @@
+void udc_ctrl(enum usbd_event event, int param);
+#endif
#endif
+Index: u-boot/board/neo1973/gta01/gta01.c
+===================================================================
+--- u-boot.orig/board/neo1973/gta01/gta01.c
++++ u-boot/board/neo1973/gta01/gta01.c
+@@ -333,6 +333,7 @@
+ void neo1973_poweroff(void)
+ {
+ serial_printf("poweroff\n");
++ udc_disconnect();
+ pcf50606_reg_write(PCF50606_REG_OOCC1, PCF50606_OOCC1_GOSTDBY);
+ /* don't return to caller */
+ while (1) ;
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
