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. r2266 - in trunk/oe/packages: . matchbox-panel-2
([EMAIL PROTECTED])
2. r2267 - in trunk/oe: conf/distro/include
packages/openmoko-base packages/openmoko-base/openmoko-session
packages/tasks ([EMAIL PROTECTED])
3. r2268 - trunk/src/target/OM-2007/applications/openmoko-today
([EMAIL PROTECTED])
4. r2269 - trunk/src/host/qemu-neo1973/hw ([EMAIL PROTECTED])
5. r2270 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: stefan
Date: 2007-06-15 12:22:26 +0200 (Fri, 15 Jun 2007)
New Revision: 2266
Added:
trunk/oe/packages/matchbox-panel-2/
trunk/oe/packages/matchbox-panel-2/matchbox-panel-2_svn.bb
Log:
* matchbox-panel-2 recipe from OE upstream. Reflects the dependency for
libstartup-notification needed for the startup applet.
Added: trunk/oe/packages/matchbox-panel-2/matchbox-panel-2_svn.bb
===================================================================
--- trunk/oe/packages/matchbox-panel-2/matchbox-panel-2_svn.bb 2007-06-15
09:05:16 UTC (rev 2265)
+++ trunk/oe/packages/matchbox-panel-2/matchbox-panel-2_svn.bb 2007-06-15
10:22:26 UTC (rev 2266)
@@ -0,0 +1,27 @@
+DESCRIPTION = "matchbox-panel-2 is a lightweight dock (system tray)
application based on Gtk+"
+LICENSE = "GPL"
+SECTION = "x11/panels"
+DEPENDS = "gtk+ apmd startup-notification"
+
+PV = "0.1+svn${SRCDATE}"
+PR = "r6"
+
+SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
+S = "${WORKDIR}/${PN}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-startup-notification --disable-libnotify"
+
+# matchbox-<anything>-2 aims to replace their -1 counterpart, but at this
point in time it's unfinished and unusable, so make it parallel installable
+do_install_append() {
+ mv ${D}${bindir}/matchbox-panel ${D}${bindir}/matchbox-panel-2
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
+PACKAGES += "${PN}-applets"
+FILES_${PN}-applets = "${libdir}/matchbox-panel/lib*.so* ${datadir}/*"
+
--- End Message ---
--- Begin Message ---
Author: stefan
Date: 2007-06-15 12:24:01 +0200 (Fri, 15 Jun 2007)
New Revision: 2267
Modified:
trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
trunk/oe/conf/distro/include/sane-srcdates.inc
trunk/oe/packages/openmoko-base/openmoko-session/session
trunk/oe/packages/openmoko-base/openmoko-session_svn.bb
trunk/oe/packages/tasks/task-openmoko.bb
Log:
* Introduce the yesterday merged startup applet. This is the version we pushed
upstream. Once it is proven stable openmoko-panel-startup will be removed.
Modified: trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
===================================================================
--- trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
2007-06-15 10:22:26 UTC (rev 2266)
+++ trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
2007-06-15 10:24:01 UTC (rev 2267)
@@ -83,4 +83,4 @@
SRCDATE_openmoko-panel-gps = "now"
SRCDATE_openmoko-panel-bt = "now"
SRCDATE_openmoko-panel-usb = "now"
-SRCDATE_openmoko-panel-startup = "now"
+#SRCDATE_openmoko-panel-startup = "now"
Modified: trunk/oe/conf/distro/include/sane-srcdates.inc
===================================================================
--- trunk/oe/conf/distro/include/sane-srcdates.inc 2007-06-15 10:22:26 UTC
(rev 2266)
+++ trunk/oe/conf/distro/include/sane-srcdates.inc 2007-06-15 10:24:01 UTC
(rev 2267)
@@ -29,7 +29,7 @@
SRCDATE_matchbox-desktop-2 ?= "20070528"
SRCDATE_matchbox-keyboard ?= "20060612"
SRCDATE_matchbox-panel ?= "20060612"
-SRCDATE_matchbox-panel-2 ?= "20070415"
+SRCDATE_matchbox-panel-2 ?= "20070615"
SRCDATE_matchbox-panel-manager ?= "20060612"
SRCDATE_matchbox-stroke ?= "20060612"
SRCDATE_matchbox-themes-extra ?= "20060612"
Modified: trunk/oe/packages/openmoko-base/openmoko-session/session
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-session/session 2007-06-15
10:22:26 UTC (rev 2266)
+++ trunk/oe/packages/openmoko-base/openmoko-session/session 2007-06-15
10:24:01 UTC (rev 2267)
@@ -2,8 +2,8 @@
SHOWCURSOR="no"
-matchbox-panel \
- --start-applets=openmoko-panel-mainmenu,systray,openmoko-panel-startup \
+matchbox-panel-2 \
+ --start-applets=openmoko-panel-mainmenu,systray,startup \
--end-applets=openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock
&
# start old-style panel plugin to get a keyboard
Modified: trunk/oe/packages/openmoko-base/openmoko-session_svn.bb
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-session_svn.bb 2007-06-15
10:22:26 UTC (rev 2266)
+++ trunk/oe/packages/openmoko-base/openmoko-session_svn.bb 2007-06-15
10:24:01 UTC (rev 2267)
@@ -2,7 +2,7 @@
SECTION = "openmoko/base"
RDEPENDS = "matchbox-panel-2 matchbox-wm gconf"
PV = "0.1+svn${SRCDATE}"
-PR = "r4"
+PR = "r5"
inherit openmoko-base
Modified: trunk/oe/packages/tasks/task-openmoko.bb
===================================================================
--- trunk/oe/packages/tasks/task-openmoko.bb 2007-06-15 10:22:26 UTC (rev
2266)
+++ trunk/oe/packages/tasks/task-openmoko.bb 2007-06-15 10:24:01 UTC (rev
2267)
@@ -105,7 +105,7 @@
openmoko-panel-clock \
openmoko-panel-usb \
openmoko-panel-gps \
- openmoko-panel-startup \
+# openmoko-panel-startup \
"
#
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-15 17:54:26 +0200 (Fri, 15 Jun 2007)
New Revision: 2268
Modified:
trunk/src/target/OM-2007/applications/openmoko-today/openmoko-today.pro
Log:
openmoko-today: catch up .pro file with dependency to startup-notification
Modified:
trunk/src/target/OM-2007/applications/openmoko-today/openmoko-today.pro
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/openmoko-today.pro
2007-06-15 10:24:01 UTC (rev 2267)
+++ trunk/src/target/OM-2007/applications/openmoko-today/openmoko-today.pro
2007-06-15 15:54:26 UTC (rev 2268)
@@ -14,7 +14,7 @@
src/xutil.c
MOKOCONFIG = mokoui
-PKGCONFIG += libebook-1.2 libecal-1.2
+PKGCONFIG += libebook-1.2 libecal-1.2 startup-notification-1.0
DEFINES += RSSREADER_LOCALE_DIR=\\\"/tmp/\\\"
include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
--- End Message ---
--- Begin Message ---
Author: andrew
Date: 2007-06-15 19:06:20 +0200 (Fri, 15 Jun 2007)
New Revision: 2269
Modified:
trunk/src/host/qemu-neo1973/hw/pcf5060x.c
Log:
Invert PCF50606 NIRQ output. This should fix
http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=607
Modified: trunk/src/host/qemu-neo1973/hw/pcf5060x.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/pcf5060x.c 2007-06-15 15:54:26 UTC (rev
2268)
+++ trunk/src/host/qemu-neo1973/hw/pcf5060x.c 2007-06-15 17:06:20 UTC (rev
2269)
@@ -62,6 +62,14 @@
QEMUTimer *onkeylow;
};
+static inline void pcf_update(struct pcf_s *s)
+{
+ qemu_set_irq(s->irq,
+ !((s->intr[0] & ~s->intm[0]) ||
+ (s->intr[1] & ~s->intm[1]) ||
+ (s->intr[2] & ~s->intm[2])));
+}
+
void pcf_reset(i2c_slave *i2c)
{
struct pcf_s *s = (struct pcf_s *) i2c;
@@ -123,16 +131,9 @@
s->gpoc[3] = 0x00;
s->gpoc[4] = 0x00;
s->gpo = 0x3c;
+ pcf_update(s);
}
-static inline void pcf_update(struct pcf_s *s)
-{
- qemu_set_irq(s->irq,
- (s->intr[0] & ~s->intm[0]) ||
- (s->intr[1] & ~s->intm[1]) ||
- (s->intr[2] & ~s->intm[2]));
-}
-
#define BATVOLT 88 /* Percentage */
#define BATT_MVOLTS_MIN 2800 /* Millivolts */
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-06-16 09:19:19 +0200 (Sat, 16 Jun 2007)
New Revision: 2270
Modified:
trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
Log:
* implement pcf50606 RTC driver
* use PCF50606 RTC rather than S3C2410 RTC, in accordance with hardware/kernel
Modified: trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
2007-06-15 17:06:20 UTC (rev 2269)
+++ trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
2007-06-16 07:19:19 UTC (rev 2270)
@@ -8,7 +8,7 @@
===================================================================
--- u-boot.orig/Makefile
+++ u-boot/Makefile
-@@ -2009,6 +2009,14 @@
+@@ -2032,6 +2032,14 @@
sbc2410x_config: unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
@@ -60,7 +60,7 @@
===================================================================
--- /dev/null
+++ u-boot/drivers/pcf50606.c
-@@ -0,0 +1,112 @@
+@@ -0,0 +1,161 @@
+
+#include <common.h>
+
@@ -172,6 +172,55 @@
+ }
+}
+
++#if defined(CONFIG_RTC_PCF50606) && (CONFIG_COMMANDS & CFG_CMD_DATE)
++
++#include <rtc.h>
++
++static unsigned bcd2bin (uchar n)
++{
++ return ((((n >> 4) & 0x0F) * 10) + (n & 0x0F));
++}
++
++static unsigned char bin2bcd (unsigned int n)
++{
++ return (((n / 10) << 4) | (n % 10));
++}
++
++
++void rtc_get(struct rtc_time *tmp)
++{
++ tmp->tm_sec = bcd2bin(pcf50606_reg_read(PCF50606_REG_RTCSC));
++ tmp->tm_min = bcd2bin(pcf50606_reg_read(PCF50606_REG_RTCMN));
++ tmp->tm_hour = bcd2bin(pcf50606_reg_read(PCF50606_REG_RTCHR));
++ tmp->tm_wday = bcd2bin(pcf50606_reg_read(PCF50606_REG_RTCWD));
++ tmp->tm_mday = bcd2bin(pcf50606_reg_read(PCF50606_REG_RTCDT));
++ tmp->tm_mon = bcd2bin(pcf50606_reg_read(PCF50606_REG_RTCMT));
++ tmp->tm_year = bcd2bin(pcf50606_reg_read(PCF50606_REG_RTCYR));
++ if (tmp->tm_year < 70)
++ tmp->tm_year += 2000;
++ else
++ tmp->tm_year += 1900;
++ tmp->tm_yday = 0;
++ tmp->tm_isdst = 0;
++}
++
++void rtc_set(struct rtc_time *tmp)
++{
++ pcf50606_reg_write(PCF50606_REG_RTCSC, bin2bcd(tmp->tm_sec));
++ pcf50606_reg_write(PCF50606_REG_RTCMN, bin2bcd(tmp->tm_min));
++ pcf50606_reg_write(PCF50606_REG_RTCHR, bin2bcd(tmp->tm_hour));
++ pcf50606_reg_write(PCF50606_REG_RTCWD, bin2bcd(tmp->tm_wday));
++ pcf50606_reg_write(PCF50606_REG_RTCDT, bin2bcd(tmp->tm_mday));
++ pcf50606_reg_write(PCF50606_REG_RTCMN, bin2bcd(tmp->tm_mon));
++ pcf50606_reg_write(PCF50606_REG_RTCYR, bin2bcd(tmp->tm_year % 100));
++}
++
++void rtc_reset(void)
++{
++ /* FIXME */
++}
++#endif /* CONFIG_RTC_PCF50606 && CFG_CMD_DATE */
++
+#endif /* CONFIG DRIVER_PCF50606 */
Index: u-boot/include/pcf50606.h
===================================================================
@@ -1943,7 +1992,7 @@
===================================================================
--- /dev/null
+++ u-boot/include/configs/neo1973_gta01.h
-@@ -0,0 +1,265 @@
+@@ -0,0 +1,261 @@
+/*
+ * (C) Copyright 2006 OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -2014,11 +2063,6 @@
+ */
+#define CONFIG_SERIAL1 1 /* we use SERIAL 1 on GTA01 */
+
-+/************************************************************
-+ * RTC
-+ ************************************************************/
-+#define CONFIG_RTC_S3C24X0 1
-+
+/* allow to overwrite serial and ethaddr */
+#define CONFIG_ENV_OVERWRITE
+
@@ -2207,6 +2251,7 @@
+#define CONFIG_S3C2410_NAND_HWECC 1
+
+#define CONFIG_DRIVER_PCF50606 1
++#define CONFIG_RTC_PCF50606 1
+
+#endif /* __CONFIG_H */
Index: u-boot/board/neo1973/common/neo1973.h
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
