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. r3164 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
2. r3165 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
3. r3166 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
4. r3167 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
5. r3168 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
6. r3169 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
7. r3170 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
--- Begin Message ---
Author: laforge
Date: 2007-10-15 08:07:34 +0200 (Mon, 15 Oct 2007)
New Revision: 3164
Added:
trunk/src/target/u-boot/patches/uboot-neo1973_defaultconsole_usbtty.patch
Modified:
trunk/src/target/u-boot/patches/series
Log:
add a patch to make usbtty the default u-boot console
Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series 2007-10-15 05:54:20 UTC (rev
3163)
+++ trunk/src/target/u-boot/patches/series 2007-10-15 06:07:34 UTC (rev
3164)
@@ -79,3 +79,4 @@
usbtty-irq-racecondition-fix.patch
neo1973-gsmver.patch
uboot-nand_write_yaffs.patch
+uboot-neo1973_defaultconsole_usbtty.patch
Added: trunk/src/target/u-boot/patches/uboot-neo1973_defaultconsole_usbtty.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-neo1973_defaultconsole_usbtty.patch
2007-10-15 05:54:20 UTC (rev 3163)
+++ trunk/src/target/u-boot/patches/uboot-neo1973_defaultconsole_usbtty.patch
2007-10-15 06:07:34 UTC (rev 3164)
@@ -0,0 +1,33 @@
+This patch ensures that even if no environment partition is present on a
Neo1973
+device, the USB serial emulation will be the default console, not the serial
port.
+
+This enables people with no debug board to always access the u-boot console,
even
+if their environment partition is gone.
+
+The only remaining case of bootloader lock-out is now when the environment
+contains stdin/stdout/stderr=serial settings.
+
+Index: u-boot/include/configs/neo1973_gta01.h
+===================================================================
+--- u-boot.orig/include/configs/neo1973_gta01.h
++++ u-boot/include/configs/neo1973_gta01.h
+@@ -182,6 +182,7 @@
+
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ "usbtty=cdc_acm\0" \
++ "stderr=usbtty\0stdout=usbtty\0stdin=usbtty\0" \
+ "bootargs_base=rootfstype=jffs2 root=/dev/mtdblock4
console=ttySAC0,115200 console=tty0 loglevel=8\0" \
+ ""
+
+Index: u-boot/include/configs/neo1973_gta02.h
+===================================================================
+--- u-boot.orig/include/configs/neo1973_gta02.h
++++ u-boot/include/configs/neo1973_gta02.h
+@@ -190,6 +190,7 @@
+
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ "usbtty=cdc_acm\0" \
++ "stderr=usbtty\0stdout=usbtty\0stdin=usbtty\0" \
+ "bootargs_base=rootfstype=jffs2 root=/dev/mtdblock4
console=ttySAC2,115200 console=tty0 loglevel=8\0" \
+ ""
+
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-10-15 08:53:06 +0200 (Mon, 15 Oct 2007)
New Revision: 3165
Modified:
trunk/src/target/u-boot/patches/uboot-s3c2440.patch
trunk/src/target/u-boot/patches/uboot-s3c2442.patch
trunk/src/target/u-boot/patches/uboot-s3c2443.patch
Log:
typos are evil. consistently calling things CONFOG instead of CONFIG doesn't
really help. s/CONFOG/CONFIG/g
Modified: trunk/src/target/u-boot/patches/uboot-s3c2440.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2440.patch 2007-10-15 06:07:34 UTC
(rev 3164)
+++ trunk/src/target/u-boot/patches/uboot-s3c2440.patch 2007-10-15 06:53:06 UTC
(rev 3165)
@@ -549,7 +549,7 @@
{
S3C24X0_CLOCK_POWER * const clk_power = S3C24X0_GetBase_CLOCK_POWER();
-+#if defined(CONFOG_S3C2400) || defined(CONFIG_S3C2410)
++#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410)
return((clk_power->CLKDIVN & 0x2) ? get_FCLK()/2 : get_FCLK());
+#elif defined(CONFIG_S3C2440)
+ switch (clk_power->CLKDIVN & 0x6) {
Modified: trunk/src/target/u-boot/patches/uboot-s3c2442.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2442.patch 2007-10-15 06:07:34 UTC
(rev 3164)
+++ trunk/src/target/u-boot/patches/uboot-s3c2442.patch 2007-10-15 06:53:06 UTC
(rev 3165)
@@ -323,7 +323,7 @@
return ( 2 * m * (CONFIG_SYS_CLK_FREQ / (p << s )) );
@@ -95,7 +95,7 @@
- #if defined(CONFOG_S3C2400) || defined(CONFIG_S3C2410)
+ #if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410)
return((clk_power->CLKDIVN & 0x2) ? get_FCLK()/2 : get_FCLK());
-#elif defined(CONFIG_S3C2440)
+#elif defined(CONFIG_S3C2440) || defined(CONFIG_S3C2442)
@@ -398,7 +398,7 @@
-#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) ||
defined(CONFIG_S3C2440)
+#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) ||
defined(CONFIG_S3C2440) || \
-+ defined(CONFOG_S3C2442)
++ defined(CONFIG_S3C2442)
/* turn off the watchdog */
# if defined(CONFIG_S3C2400)
Modified: trunk/src/target/u-boot/patches/uboot-s3c2443.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2443.patch 2007-10-15 06:07:34 UTC
(rev 3164)
+++ trunk/src/target/u-boot/patches/uboot-s3c2443.patch 2007-10-15 06:53:06 UTC
(rev 3165)
@@ -15,8 +15,8 @@
#endif
#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) ||
defined(CONFIG_S3C2440) || \
-- defined(CONFOG_S3C2442)
-+ defined(CONFOG_S3C2442) || defined(CONFIG_S3C2443)
+- defined(CONFIG_S3C2442)
++ defined(CONFIG_S3C2442) || defined(CONFIG_S3C2443)
/* turn off the watchdog */
# if defined(CONFIG_S3C2400)
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-10-15 09:03:50 +0200 (Mon, 15 Oct 2007)
New Revision: 3166
Modified:
trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
trunk/src/target/u-boot/patches/uboot-gta02.patch
Log:
remove bash'isms from split_by_variant.sh scripts (Marius Nuennerich) (Closes:
#811)
Modified: trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
2007-10-15 06:53:06 UTC (rev 3165)
+++ trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
2007-10-15 07:03:50 UTC (rev 3166)
@@ -1959,7 +1959,7 @@
+CFGTMP=${obj}board/neo1973/gta01/config.tmp
+
+mkdir -p ${obj}include
-+if [ "$1" == "" ]
++if [ "$1" = "" ]
+then
+ echo "$0:: No parameters - using GTA01Bv3 config"
+ echo "#define CONFIG_ARCH_GTA01B_v3" > $CFGINC
Modified: trunk/src/target/u-boot/patches/uboot-gta02.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-gta02.patch 2007-10-15 06:53:06 UTC
(rev 3165)
+++ trunk/src/target/u-boot/patches/uboot-gta02.patch 2007-10-15 07:03:50 UTC
(rev 3166)
@@ -892,7 +892,7 @@
+CFGTMP=${obj}board/neo1973/gta02/config.tmp
+
+mkdir -p ${obj}include
-+if [ "$1" == "" ]
++if [ "$1" = "" ]
+then
+ echo "$0:: No parameters - using GTA02Bv1 config"
+ echo "#define CONFIG_ARCH_GTA02_v1" > $CFGINC
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-10-15 10:48:09 +0200 (Mon, 15 Oct 2007)
New Revision: 3167
Added:
trunk/src/target/kernel/patches/asoc-neo1973_wm8753-power.patch
Log:
This patch fixes the current leak caused by not shutting down the audio
amplifier during suspend/resume and after power-down. See bug
http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=781
Added: trunk/src/target/kernel/patches/asoc-neo1973_wm8753-power.patch
===================================================================
--- trunk/src/target/kernel/patches/asoc-neo1973_wm8753-power.patch
2007-10-15 07:03:50 UTC (rev 3166)
+++ trunk/src/target/kernel/patches/asoc-neo1973_wm8753-power.patch
2007-10-15 08:48:09 UTC (rev 3167)
@@ -0,0 +1,50 @@
+Index: linux-2.6.22.5-moko/sound/soc/s3c24xx/neo1973_wm8753.c
+===================================================================
+--- linux-2.6.22.5-moko.orig/sound/soc/s3c24xx/neo1973_wm8753.c
++++ linux-2.6.22.5-moko/sound/soc/s3c24xx/neo1973_wm8753.c
+@@ -615,6 +615,35 @@
+ return i2c_probe(adap, &addr_data, lm4857_amp_probe);
+ }
+
++static u8 lm4857_state;
++
++static int lm4857_suspend(struct i2c_client *dev, pm_message_t state)
++{
++ dev_dbg(&dev->dev, "lm4857_suspend\n");
++ lm4857_state = lm4857_regs[LM4857_CTRL] & 0xf;
++ if (lm4857_state) {
++ lm4857_regs[LM4857_CTRL] &= 0xf0;
++ lm4857_write_regs();
++ }
++ return 0;
++}
++
++static int lm4857_resume(struct i2c_client *dev)
++{
++ if (lm4857_state) {
++ lm4857_regs[LM4857_CTRL] |= (lm4857_state & 0x0f);
++ lm4857_write_regs();
++ }
++ return 0;
++}
++
++static void lm4857_shutdown(struct i2c_client *dev)
++{
++ dev_dbg(&dev->dev, "lm4857_shutdown\n");
++ lm4857_regs[LM4857_CTRL] &= 0xf0;
++ lm4857_write_regs();
++}
++
+ /* corgi i2c codec control layer */
+ static struct i2c_driver lm4857_i2c_driver = {
+ .driver = {
+@@ -622,6 +651,9 @@
+ .owner = THIS_MODULE,
+ },
+ .id = I2C_DRIVERID_LM4857,
++ .suspend = lm4857_suspend,
++ .resume = lm4857_resume,
++ .shutdown = lm4857_shutdown,
+ .attach_adapter = lm4857_i2c_attach,
+ .detach_client = lm4857_i2c_detach,
+ .command = NULL,
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-10-15 10:54:10 +0200 (Mon, 15 Oct 2007)
New Revision: 3168
Modified:
trunk/src/target/kernel/patches/series
Log:
add the asoc amplifier power down fix to the series
Modified: trunk/src/target/kernel/patches/series
===================================================================
--- trunk/src/target/kernel/patches/series 2007-10-15 08:48:09 UTC (rev
3167)
+++ trunk/src/target/kernel/patches/series 2007-10-15 08:54:10 UTC (rev
3168)
@@ -1,6 +1,7 @@
alsa-2.6.23-rc1-commit.diff
asoc-platform-hw_init-pcm_emulation-fix.patch
asoc-kconfig-fix.patch
+asoc-neo1973_wm8753-power.patch
missing_defs.patch
openmoko-logo.patch
yaffs2-20070905.patch
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-10-15 11:07:35 +0200 (Mon, 15 Oct 2007)
New Revision: 3169
Added:
trunk/src/target/kernel/patches/arm-atag-kexec.patch
Modified:
trunk/src/target/kernel/patches/series
Log:
Add patch to fix kexec() on ARM machines that need the ATAG structure to be
passed from the bootloader in order to properly boot. (Closes:
http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=930)
Added: trunk/src/target/kernel/patches/arm-atag-kexec.patch
===================================================================
--- trunk/src/target/kernel/patches/arm-atag-kexec.patch 2007-10-15
08:54:10 UTC (rev 3168)
+++ trunk/src/target/kernel/patches/arm-atag-kexec.patch 2007-10-15
09:07:35 UTC (rev 3169)
@@ -0,0 +1,145 @@
+This patch resolves a kexec boot failure that can occur because
+no ATAGs are passed in to the kexec'd kernel. Currently the
+newly-kexec'd kernel may fail if it requires specific ATAGs, or
+it may fail because the fixed memory location at which it expects
+to find the ATAGs may contain random data instead of ATAGs.
+
+The patch ensures that any ATAGs passed to the current kernel
+at boot time are copied to a static buffer, and are copied back
+when kexec copies the new kernel into place. Thus the new
+kernel sees the same ATAGs from kexec and the boot loader.
+
+The boot parameters are copied without regard to type, content,
+or length -- this patch's scope is limited soley to saving and
+restoring a fixed-size block of memory containing the kernel's
+boot parameters. Additional functionality to examine, alter, or
+replace the ATAGs (using kexec, for example) can be implemented
+by manipulating the static buffer containing the preserved ATAGs.
+
+Note: the size of the buffer (1.5KB) is selected to comfortably
+hold one of each ATAG type, including a maximum-length command
+line and the maximum number of ATAG_MEM structures currently
+supported by the kernel. Should an ATAG list exceed that limit,
+the list will be silently truncated to that limit (to do other-
+wise at that point in the boot process would make a simple
+problem exceedingly complicated).
+
+Kernel version 2.6.22.5
+
+Signed-off-by: Mike Westerhof <mwester at dls.net>
+---
+
+diff -uprN linux-2.6.22.5.orig/arch/arm/kernel/relocate_kernel.S
linux-2.6.22.5/arch/arm/kernel/relocate_kernel.S
+--- linux-2.6.22.5.orig/arch/arm/kernel/relocate_kernel.S 2007-08-22
18:23:54.000000000 -0500
++++ linux-2.6.22.5/arch/arm/kernel/relocate_kernel.S 2007-08-27
20:31:32.000000000 -0500
+@@ -7,6 +7,23 @@
+ .globl relocate_new_kernel
+ relocate_new_kernel:
+
++ /* Move boot params back to where the kernel expects them */
++
++ ldr r0,kexec_boot_params_address
++ teq r0,#0
++ beq 8f
++
++ ldr r1,kexec_boot_params_copy
++ mov r6,#KEXEC_BOOT_PARAMS_SIZE/4
++7:
++ ldr r5,[r1],#4
++ str r5,[r0],#4
++ subs r6,r6,#1
++ bne 7b
++
++8:
++ /* Boot params moved, now go on with the kernel */
++
+ ldr r0,kexec_indirection_page
+ ldr r1,kexec_start_address
+
+@@ -50,7 +67,7 @@ relocate_new_kernel:
+ mov lr,r1
+ mov r0,#0
+ ldr r1,kexec_mach_type
+- mov r2,#0
++ ldr r2,kexec_boot_params_address
+ mov pc,lr
+
+ .globl kexec_start_address
+@@ -65,6 +82,16 @@ kexec_indirection_page:
+ kexec_mach_type:
+ .long 0x0
+
++ /* phy addr where new kernel will expect to find boot params */
++ .globl kexec_boot_params_address
++kexec_boot_params_address:
++ .long 0x0
++
++ /* phy addr where old kernel put a copy of orig boot params */
++ .globl kexec_boot_params_copy
++kexec_boot_params_copy:
++ .long 0x0
++
+ relocate_new_kernel_end:
+
+ .globl relocate_new_kernel_size
+diff -uprN linux-2.6.22.5.orig/arch/arm/kernel/setup.c
linux-2.6.22.5/arch/arm/kernel/setup.c
+--- linux-2.6.22.5.orig/arch/arm/kernel/setup.c 2007-08-22
18:23:54.000000000 -0500
++++ linux-2.6.22.5/arch/arm/kernel/setup.c 2007-08-27 20:31:32.000000000
-0500
+@@ -23,6 +23,7 @@
+ #include <linux/cpu.h>
+ #include <linux/interrupt.h>
+ #include <linux/smp.h>
++#include <linux/kexec.h>
+
+ #include <asm/cpu.h>
+ #include <asm/elf.h>
+@@ -767,6 +768,23 @@ static int __init customize_machine(void
+ }
+ arch_initcall(customize_machine);
+
++#ifdef CONFIG_KEXEC
++
++/* Physical addr of where the boot params should be for this machine */
++extern unsigned long kexec_boot_params_address;
++
++/* Physical addr of the buffer into which the boot params are copied */
++extern unsigned long kexec_boot_params_copy;
++
++/* Pointer to the boot params buffer, for manipulation and display */
++unsigned long kexec_boot_params;
++EXPORT_SYMBOL(kexec_boot_params);
++
++/* The buffer itself - make sure it is sized correctly */
++static unsigned long kexec_boot_params_buf[(KEXEC_BOOT_PARAMS_SIZE + 3) / 4];
++
++#endif
++
+ void __init setup_arch(char **cmdline_p)
+ {
+ struct tag *tags = (struct tag *)&init_tags;
+@@ -783,6 +801,13 @@ void __init setup_arch(char **cmdline_p)
+ if (mdesc->boot_params)
+ tags = phys_to_virt(mdesc->boot_params);
+
++#ifdef CONFIG_KEXEC
++ kexec_boot_params_address = mdesc->boot_params;
++ kexec_boot_params_copy = virt_to_phys(kexec_boot_params_buf);
++ kexec_boot_params = (unsigned long)kexec_boot_params_buf;
++ if (mdesc->boot_params)
++ memcpy((void *)kexec_boot_params, tags, KEXEC_BOOT_PARAMS_SIZE);
++#endif
+ /*
+ * If we have the old style parameters, convert them to
+ * a tag list.
+diff -uprN linux-2.6.22.5.orig/include/asm-arm/kexec.h
linux-2.6.22.5/include/asm-arm/kexec.h
+--- linux-2.6.22.5.orig/include/asm-arm/kexec.h 2007-08-22
18:23:54.000000000 -0500
++++ linux-2.6.22.5/include/asm-arm/kexec.h 2007-08-27 20:31:32.000000000
-0500
+@@ -14,6 +14,8 @@
+
+ #define KEXEC_ARCH KEXEC_ARCH_ARM
+
++#define KEXEC_BOOT_PARAMS_SIZE 1536
++
+ #ifndef __ASSEMBLY__
+
+ struct kimage;
Modified: trunk/src/target/kernel/patches/series
===================================================================
--- trunk/src/target/kernel/patches/series 2007-10-15 08:54:10 UTC (rev
3168)
+++ trunk/src/target/kernel/patches/series 2007-10-15 09:07:35 UTC (rev
3169)
@@ -1,3 +1,4 @@
+arm-atag-kexec.patch
alsa-2.6.23-rc1-commit.diff
asoc-platform-hw_init-pcm_emulation-fix.patch
asoc-kconfig-fix.patch
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-10-15 11:54:48 +0200 (Mon, 15 Oct 2007)
New Revision: 3170
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/Makefile.am
Log:
* configure.ac:
* src/Makefile.am:
Prevent CFLAGS from being obliterated
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-15 09:07:35 UTC (rev 3169)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-15 09:54:48 UTC (rev 3170)
@@ -1,3 +1,10 @@
+2007-10-15 Thomas Wood <[EMAIL PROTECTED]>
+
+ * configure.ac:
+ * src/Makefile.am:
+
+ Prevent CFLAGS from being obliterated
+
2007-10-12 Thomas Wood <[EMAIL PROTECTED]>
* src/moko-dialer-textview.c: (moko_dialer_textview_delete): Make sure
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac
2007-10-15 09:07:35 UTC (rev 3169)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac
2007-10-15 09:54:48 UTC (rev 3170)
@@ -29,11 +29,9 @@
AC_DEFINE(HAVE_ECONTACT_PHOTO_TYPE, 1, [Defined if EContactPhotoType
exists])
fi
+AC_SUBST(DIALER_CFLAGS)
+AC_SUBST(DIALER_LIBS)
-LIBS="$DIALER_LIBS -lm -ldl"
-
-CFLAGS="$DIALER_CFLAGS"
-
dnl ==============================================
dnl DBUS
dnl ==============================================
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/Makefile.am
2007-10-15 09:07:35 UTC (rev 3169)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/Makefile.am
2007-10-15 09:54:48 UTC (rev 3170)
@@ -1,7 +1,3 @@
-AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
- -DPKGDATADIR=\"$(pkgdatadir)\"
-AM_CFLAGS = -Wall @CFLAGS@
-
bin_PROGRAMS = openmoko-dialer
openmoko_dialer_SOURCES = \
@@ -31,8 +27,11 @@
moko-sound.c \
moko-sound.h
+openmoko_dialer_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
+ -DPKGDATADIR=\"$(pkgdatadir)\"
+openmoko_dialer_CFLAGS = -Wall @DIALER_CFLAGS@
-openmoko_dialer_LDADD = @LIBS@
+openmoko_dialer_LDADD = @DIALER_LIBS@
moko-dialer-glue.h: moko-dialer-dbus.xml
$(LIBTOOL) --mode=execute $(DBUS_GLIB_BIN)/dbus-binding-tool
--prefix=moko_dialer --mode=glib-server --output=$@ $<
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
