Send commitlog mailing list submissions to
commitlog@lists.openmoko.org
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. r4077 - developers/werner/ahrt ([EMAIL PROTECTED])
2. r4078 - trunk/src/host/norwp ([EMAIL PROTECTED])
3. r4079 - trunk/src/host/qemu-neo1973/hw ([EMAIL PROTECTED])
4. r4080 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
5. r4081 - trunk/src/host/devirginator ([EMAIL PROTECTED])
6. r4082 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: werner
Date: 2008-02-16 13:28:22 +0100 (Sat, 16 Feb 2008)
New Revision: 4077
Added:
developers/werner/ahrt/try
Log:
Test driver for measurements (without any post-processing)
Added: developers/werner/ahrt/try
===================================================================
--- developers/werner/ahrt/try 2008-02-16 12:27:13 UTC (rev 4076)
+++ developers/werner/ahrt/try 2008-02-16 12:28:22 UTC (rev 4077)
@@ -0,0 +1,9 @@
+. layout/werner
+
+cmd=bat_meter
+. lang/$bat_mlang/setup "BAT Test"
+. lang/$bat_mlang/mamps 1
+
+cmd=usb_meter
+. lang/$usb_mlang/setup "USB Test"
+. lang/$usb_mlang/mamps 1
Property changes on: developers/werner/ahrt/try
___________________________________________________________________
Name: svn:executable
+ *
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-02-16 14:02:16 +0100 (Sat, 16 Feb 2008)
New Revision: 4078
Modified:
trunk/src/host/norwp/Makefile
Log:
Be nice and set default PREFIX to /usr, not / ...
Modified: trunk/src/host/norwp/Makefile
===================================================================
--- trunk/src/host/norwp/Makefile 2008-02-16 12:28:22 UTC (rev 4077)
+++ trunk/src/host/norwp/Makefile 2008-02-16 13:02:16 UTC (rev 4078)
@@ -1,6 +1,8 @@
CFLAGS=-Wall -I/usr/local/include
LDFLAGS=-L/usr/local/lib -lftdi
+PREFIX=/usr
+
.PHONY: all install uninstall clean spotless
all: norwp
--- End Message ---
--- Begin Message ---
Author: andrew
Date: 2008-02-16 15:59:19 +0100 (Sat, 16 Feb 2008)
New Revision: 4079
Modified:
trunk/src/host/qemu-neo1973/hw/s3c24xx_mmci.c
Log:
SDICMDCON's WithData bit is only valid for SDIO.
Modified: trunk/src/host/qemu-neo1973/hw/s3c24xx_mmci.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/s3c24xx_mmci.c 2008-02-16 13:02:16 UTC
(rev 4078)
+++ trunk/src/host/qemu-neo1973/hw/s3c24xx_mmci.c 2008-02-16 14:59:19 UTC
(rev 4079)
@@ -180,7 +180,11 @@
} else if (((s->dcontrol >> 12) & 3) == 3) /* DatMode */
if (s->dcontrol & (1 << 20)) /* RACMD */
s->data = 1;
- s->data &= s->ccontrol >> 11; /* WithData */
+ /* HACK: This bit only matters for SDIO but we don't have a good
+ * way to tell if the card is an SDIO, so only check if this is
+ * CMD53, the only SDIO command potentially using the DAT lines. */
+ if (request.cmd == 53)
+ s->data &= s->ccontrol >> 11; /* WithData */
return;
timeout:
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-02-16 16:18:08 +0100 (Sat, 16 Feb 2008)
New Revision: 4080
Modified:
branches/src/target/kernel/2.6.24.x/patches/s3c_mci.patch
Log:
This should fix
http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=1223
Read-side patch by Andrzej Zaborowski.
s3c_mci.patch
- drivers/mmc/host/s3cmci.c (do_pio_read): cast pio_ptr to u32 when storing a
long
- drivers/mmc/host/s3cmci.c (do_pio_write): cast pio_ptr to u32 when fetching a
long
Modified: branches/src/target/kernel/2.6.24.x/patches/s3c_mci.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/s3c_mci.patch 2008-02-16
14:59:19 UTC (rev 4079)
+++ branches/src/target/kernel/2.6.24.x/patches/s3c_mci.patch 2008-02-16
15:18:08 UTC (rev 4080)
@@ -12,10 +12,10 @@
Acked-by: Thomas Kleffel <[EMAIL PROTECTED]>
Signed-off-by: Harald Welte <[EMAIL PROTECTED]>
-Index: linux-2.6/include/asm-arm/arch-s3c2410/regs-sdi.h
+Index: linux-2.6.24/include/asm-arm/arch-s3c2410/regs-sdi.h
===================================================================
---- linux-2.6.orig/include/asm-arm/arch-s3c2410/regs-sdi.h
-+++ linux-2.6/include/asm-arm/arch-s3c2410/regs-sdi.h
+--- linux-2.6.24.orig/include/asm-arm/arch-s3c2410/regs-sdi.h
++++ linux-2.6.24/include/asm-arm/arch-s3c2410/regs-sdi.h
@@ -28,9 +28,17 @@
#define S3C2410_SDIDCNT (0x30)
#define S3C2410_SDIDSTA (0x34)
@@ -85,10 +85,10 @@
#define S3C2410_SDIFSTA_RFLAST (1<<9)
#define S3C2410_SDIFSTA_RFFULL (1<<8)
#define S3C2410_SDIFSTA_RFHALF (1<<7)
-Index: linux-2.6/drivers/mmc/host/s3cmci.c
+Index: linux-2.6.24/drivers/mmc/host/s3cmci.c
===================================================================
--- /dev/null
-+++ linux-2.6/drivers/mmc/host/s3cmci.c
++++ linux-2.6.24/drivers/mmc/host/s3cmci.c
@@ -0,0 +1,1411 @@
+/*
+ * linux/drivers/mmc/s3cmci.h - Samsung S3C MCI driver
@@ -348,7 +348,7 @@
+
+ /* and a major chunk of data in the middle */
+ for (; fifo >= 4; fifo -=4) {
-+ *(host->pio_ptr) = readl(from_ptr);
++ *(u32 *) host->pio_ptr = readl(from_ptr);
+ host->pio_ptr+= 4;
+ }
+
@@ -412,7 +412,7 @@
+
+ /* and a major chunk of data in the middle */
+ for (; fifo >= 4; fifo -=4) {
-+ writel(*(host->pio_ptr), to_ptr);
++ writel(*(u32 *) host->pio_ptr, to_ptr);
+ host->pio_ptr += 4;
+ }
+
@@ -1501,10 +1501,10 @@
+MODULE_DESCRIPTION("Samsung S3C MMC/SD Card Interface driver");
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Thomas Kleffel <[EMAIL PROTECTED]>");
-Index: linux-2.6/drivers/mmc/host/s3cmci.h
+Index: linux-2.6.24/drivers/mmc/host/s3cmci.h
===================================================================
--- /dev/null
-+++ linux-2.6/drivers/mmc/host/s3cmci.h
++++ linux-2.6.24/drivers/mmc/host/s3cmci.h
@@ -0,0 +1,69 @@
+/*
+ * linux/drivers/mmc/s3cmci.h - Samsung S3C MCI driver
@@ -1575,10 +1575,10 @@
+ unsigned int ccnt, dcnt;
+ struct tasklet_struct pio_tasklet;
+};
-Index: linux-2.6/drivers/mmc/host/Kconfig
+Index: linux-2.6.24/drivers/mmc/host/Kconfig
===================================================================
---- linux-2.6.orig/drivers/mmc/host/Kconfig
-+++ linux-2.6/drivers/mmc/host/Kconfig
+--- linux-2.6.24.orig/drivers/mmc/host/Kconfig
++++ linux-2.6.24/drivers/mmc/host/Kconfig
@@ -130,3 +130,14 @@
If unsure, or if your system has no SPI master driver, say N.
@@ -1594,20 +1594,20 @@
+
+ If unsure, say N.
+
-Index: linux-2.6/drivers/mmc/host/Makefile
+Index: linux-2.6.24/drivers/mmc/host/Makefile
===================================================================
---- linux-2.6.orig/drivers/mmc/host/Makefile
-+++ linux-2.6/drivers/mmc/host/Makefile
+--- linux-2.6.24.orig/drivers/mmc/host/Makefile
++++ linux-2.6.24/drivers/mmc/host/Makefile
@@ -17,4 +17,4 @@
obj-$(CONFIG_MMC_AT91) += at91_mci.o
obj-$(CONFIG_MMC_TIFM_SD) += tifm_sd.o
obj-$(CONFIG_MMC_SPI) += mmc_spi.o
-
+obj-$(CONFIG_MMC_S3C) += s3cmci.o
-Index: linux-2.6/include/asm-arm/arch-s3c2410/mci.h
+Index: linux-2.6.24/include/asm-arm/arch-s3c2410/mci.h
===================================================================
--- /dev/null
-+++ linux-2.6/include/asm-arm/arch-s3c2410/mci.h
++++ linux-2.6.24/include/asm-arm/arch-s3c2410/mci.h
@@ -0,0 +1,13 @@
+#ifndef _ARCH_MCI_H
+#define _ARCH_MCI_H
@@ -1622,10 +1622,10 @@
+};
+
+#endif /* _ARCH_NCI_H */
-Index: linux-2.6/arch/arm/mach-s3c2412/s3c2412.c
+Index: linux-2.6.24/arch/arm/mach-s3c2412/s3c2412.c
===================================================================
---- linux-2.6.orig/arch/arm/mach-s3c2412/s3c2412.c
-+++ linux-2.6/arch/arm/mach-s3c2412/s3c2412.c
+--- linux-2.6.24.orig/arch/arm/mach-s3c2412/s3c2412.c
++++ linux-2.6.24/arch/arm/mach-s3c2412/s3c2412.c
@@ -214,5 +214,8 @@
{
printk("S3C2412: Initialising architecture\n");
@@ -1635,10 +1635,10 @@
+
return sysdev_register(&s3c2412_sysdev);
}
-Index: linux-2.6/arch/arm/mach-s3c2440/s3c2440.c
+Index: linux-2.6.24/arch/arm/mach-s3c2440/s3c2440.c
===================================================================
---- linux-2.6.orig/arch/arm/mach-s3c2440/s3c2440.c
-+++ linux-2.6/arch/arm/mach-s3c2440/s3c2440.c
+--- linux-2.6.24.orig/arch/arm/mach-s3c2440/s3c2440.c
++++ linux-2.6.24/arch/arm/mach-s3c2440/s3c2440.c
@@ -46,6 +46,9 @@
s3c_device_wdt.resource[1].start = IRQ_S3C2440_WDT;
s3c_device_wdt.resource[1].end = IRQ_S3C2440_WDT;
@@ -1649,10 +1649,10 @@
/* register our system device for everything else */
return sysdev_register(&s3c2440_sysdev);
-Index: linux-2.6/arch/arm/mach-s3c2442/s3c2442.c
+Index: linux-2.6.24/arch/arm/mach-s3c2442/s3c2442.c
===================================================================
---- linux-2.6.orig/arch/arm/mach-s3c2442/s3c2442.c
-+++ linux-2.6/arch/arm/mach-s3c2442/s3c2442.c
+--- linux-2.6.24.orig/arch/arm/mach-s3c2442/s3c2442.c
++++ linux-2.6.24/arch/arm/mach-s3c2442/s3c2442.c
@@ -21,6 +21,7 @@
#include <asm/plat-s3c24xx/s3c2442.h>
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-02-16 16:36:40 +0100 (Sat, 16 Feb 2008)
New Revision: 4081
Modified:
trunk/src/host/devirginator/Makefile
trunk/src/host/devirginator/environment.in
trunk/src/host/devirginator/openocd.in
trunk/src/host/devirginator/setup.sh
trunk/src/host/devirginator/u-boot.in
Log:
Various changes, mainly for GTA02. Note: needs more testing.
Add support for GTA02:
devirginator/setup.sh: pass openocd.in and u-boot.in through CPP
devirginator/setup.sh: new variables U_PLATFORM and U_BOARD containing upper
case versions of PLATFORM and BOARD
devirginator/setup.sh: pass -D<platform> and -D<platform><board> (in upper
case) to envedit.pl
devirginator/openocd.in: added GTA02 memory map
devirginator/openocd.in: enable backlight only if GTA01
devirginator/u-boot.in: corrected misleading comment regarding backlight status
devirginator/u-boot.in: updated NAND BBT location for GTA02
devirginator/u-boot.in: added distinct smiley handling (frame buffer address)
for GTA01 and GTA02
devirginator/environment.in: added console, root device, and frame buffer
(splash screen) handling for GTA02
devirginator/environment.in (bootcmd): limit kernel load size to 2MB
General improvements:
devirginator/Makefile: added "clean" target
devirginator/environment.in: added the "Factory reset" menu option, which used
to be hard-coded in u-boot
Modified: trunk/src/host/devirginator/Makefile
===================================================================
--- trunk/src/host/devirginator/Makefile 2008-02-16 15:18:08 UTC (rev
4080)
+++ trunk/src/host/devirginator/Makefile 2008-02-16 15:36:40 UTC (rev
4081)
@@ -1,7 +1,7 @@
#
# Makefile - Setup and handling of prerequisites
#
-# Copyright (C) 2006-2007 by OpenMoko, Inc.
+# Copyright (C) 2006-2008 by OpenMoko, Inc.
# Written by Werner Almesberger <[EMAIL PROTECTED]>
# All Rights Reserved
#
@@ -26,7 +26,7 @@
TARDIR=devirginate-$(TARBALL_VERSION)
TARBALL=$(TARDIR).tar.gz
-.PHONY: tarball
+.PHONY: tarball clean
#devirginate: config environment.in openocd.in u-boot.in \
# setup.sh smiley.gz \
@@ -63,3 +63,6 @@
$(TMP_FILES:%=$(TARDIR)/%) || \
{ rm -f $(TARDIR); exit 1; }
rm -f $(TARDIR)
+
+clean:
+ rm -f smiley.ppm smiley.png smiley.gz
Modified: trunk/src/host/devirginator/environment.in
===================================================================
--- trunk/src/host/devirginator/environment.in 2008-02-16 15:18:08 UTC (rev
4080)
+++ trunk/src/host/devirginator/environment.in 2008-02-16 15:36:40 UTC (rev
4081)
@@ -2,17 +2,37 @@
# environment.in - The default environment
#
+#
+# Note: for backwards-compatibility, we don't test whether the symbol "GTA01"
+# is defined, but we only test for "GTA02".
+#
+
+#ifdef GTA02
+
+#define CONSOLE ttySAC2
+#define ROOTDEV /dev/mtdblock6
+#define FRAMEBUFFER 0x8800000
+
+#else # GTA01
+
+#define CONSOLE ttySAC0
+#define ROOTDEV /dev/mtdblock4
+#define FRAMEBUFFER 0x33d00000
+
+#endif
+
+
bootargs_base=
rootfstype=jffs2
- root=/dev/mtdblock4
- console=ttySAC0,115200
+ root=ROOTDEV
+ console=CONSOLE,115200
console=tty0
loglevel=8
regular_boot
bootcmd=
setenv bootargs ${bootargs_base} ${mtdparts};
- nand read.e 0x32000000 kernel;
+ nand read.e 0x32000000 kernel 0x200000;
bootm 0x32000000
bootdelay=1
@@ -21,7 +41,7 @@
splashimage=
nand read.e 0x32000000 splash 0x5000;
- unzip 0x32000000 0x33d00000 0x96000
+ unzip 0x32000000 FRAMEBUFFER 0x96000
stdout=usbtty
stderr=usbtty
@@ -53,3 +73,9 @@
menu_4=
Power off:
neo1973 power-off
+
+menu_5=
+ Factory reset:
+ defaultenv;
+ dynpart;
+ bootd
Modified: trunk/src/host/devirginator/openocd.in
===================================================================
--- trunk/src/host/devirginator/openocd.in 2008-02-16 15:18:08 UTC (rev
4080)
+++ trunk/src/host/devirginator/openocd.in 2008-02-16 15:36:40 UTC (rev
4081)
@@ -5,7 +5,8 @@
#
# Memory map:
#
-# 0x33FFFFFF end of RAM
+# 0x37FFFFFF end of RAM (GTA02)
+# 0x33FFFFFF end of RAM (GTA01)
# 0x33F80000 u-boot
# 0x33D00000 frame buffer
# 0x32300000 interim logo
@@ -21,9 +22,11 @@
wait_halt
sleep 2000
+#ifdef GTA01
# turn on the backlight
mww 0x56000010 0x1
mww 0x56000014 1
+#endif
# load and run the low-level hardware setup
load_binary $LOWLEVEL 0
Modified: trunk/src/host/devirginator/setup.sh
===================================================================
--- trunk/src/host/devirginator/setup.sh 2008-02-16 15:18:08 UTC (rev
4080)
+++ trunk/src/host/devirginator/setup.sh 2008-02-16 15:36:40 UTC (rev
4081)
@@ -2,7 +2,7 @@
#
# setup.sh - Set up the devirginator
#
-# Copyright (C) 2006-2007 by OpenMoko, Inc.
+# Copyright (C) 2006-2008 by OpenMoko, Inc.
# Written by Werner Almesberger <[EMAIL PROTECTED]>
# All Rights Reserved
#
@@ -80,6 +80,12 @@
}
+cppify()
+{
+ sed '/^#[a-z]/{n;};s/#.*$//' | cpp -D$U_PLATFORM -D$U_PLATFORM$U_BOARD
+}
+
+
# --- Configuration defaults --------------------------------------------------
@@ -136,6 +142,9 @@
RELEASE_DIR=${RELEASE_DIR}/${PLATFORM}-${SNAPSHOT}/tmp/deploy/images
fi
+U_PLATFORM="`echo \"$PLATFORM\" | LANG=C tr a-z A-Z`"
+U_BOARD="`echo \"$BOARD\" | LANG=C tr a-z A-Z`"
+
# lowlevel_foo.bin
if [ -z "$LOWLEVEL" ]; then
@@ -236,11 +245,11 @@
# --- Stage 1: OpenOCD script -------------------------------------------------
-{
+cppify <openocd.in | {
while read l; do
eval "echo $l"
done
-} <openocd.in >tmp/script.ocd
+} >tmp/script.ocd
add_file tmp/script.ocd
@@ -263,7 +272,7 @@
# --- Stage 1: u-boot script --------------------------------------------------
-perl ./scriptify.pl u-boot.in >tmp/u-boot.out
+cppify <u-boot.in | perl ./scriptify.pl >tmp/u-boot.out
add_file tmp/u-boot.out
@@ -353,11 +362,13 @@
$DFU_UTIL $USB_ID -a kernel -D $UIMAGE
$DFU_UTIL $USB_ID -a rootfs -D $ROOTFS
$DFU_UTIL $USB_ID -a splash -D tmp/splash.gz
+ rm -f tmp/env.old tmp/env.new
$DFU_UTIL $USB_ID -a u-boot_env -U tmp/env.old
./openocdcmd.pl $OPENOCD_HOST $OPENOCD_PORT \
"reset halt" wait_halt resume exit
sleep 5
- ./envedit.pl -i tmp/env.old -o tmp/env.new -f tmp/environment
+ ./envedit.pl -i tmp/env.old -o tmp/env.new \
+ -D$U_PLATFORM -D$U_PLATFORM$U_BOARD -f tmp/environment
$DFU_UTIL $USB_ID -a u-boot_env -D tmp/env.new
./openocdcmd.pl $OPENOCD_HOST $OPENOCD_PORT "reset run" exit
fi
Modified: trunk/src/host/devirginator/u-boot.in
===================================================================
--- trunk/src/host/devirginator/u-boot.in 2008-02-16 15:18:08 UTC (rev
4080)
+++ trunk/src/host/devirginator/u-boot.in 2008-02-16 15:36:40 UTC (rev
4081)
@@ -6,7 +6,7 @@
# interactive testing one may wish to do.
#
-# switch on the backlight, so one can see that we're alive
+# toggle the backlight, so one can see that we're alive
neo1973 backlight off
@@ -16,7 +16,12 @@
# remove any pre-existing bad block table and create a new one
+#ifndef GTA02
setenv scrub_true nand scrub 0x3ff0000 0x10000
+#else
+setenv scrub_true nand scrub 0x7f80000 0x80000
+#endif
+
setenv scrub_ echo Not scrubbing
run scrub_${scrub}
@@ -45,7 +50,13 @@
setenv bootcmd
setenv bootdelay 604800
+
+#ifndef GTA02
setenv splashimage nand read.e 0x32000000 splash 0x1000\; unzip 0x32000000
0x33d00000 0x96000
+#else
+setenv splashimage nand read.e 0x32000000 splash 0x1000\; unzip 0x32000000
0x8800000 0x96000
+#endif
+
setenv usbtty cdc_acm
saveenv
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2008-02-17 11:50:35 +0100 (Sun, 17 Feb 2008)
New Revision: 4082
Modified:
branches/src/target/kernel/2.6.24.x/patches/s3c_mci.patch
Log:
s3cmci unaligned write fix (Mike Wester)
Modified: branches/src/target/kernel/2.6.24.x/patches/s3c_mci.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/s3c_mci.patch 2008-02-16
15:36:40 UTC (rev 4081)
+++ branches/src/target/kernel/2.6.24.x/patches/s3c_mci.patch 2008-02-17
10:50:35 UTC (rev 4082)
@@ -343,7 +343,7 @@
+ host->pio_count += fifo;
+
+ /* we might have an unaligned start of data */
-+ while ((unsigned long)host->pio_ptr & 0x03)
++ while (((unsigned long)host->pio_ptr & 0x03) && fifo--)
+ *(host->pio_ptr++) = readb(host->base +
host->sdidata_b);
+
+ /* and a major chunk of data in the middle */
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
