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. r2152 - trunk/oe/packages/linux/linux-gta01
([EMAIL PROTECTED])
2. r2153 - in trunk/oe/packages/alsa: . files
([EMAIL PROTECTED])
3. r2154 - trunk/src/target/u-boot/patches ([EMAIL PROTECTED])
4. r2155 - trunk/src/target/u-boot/patches ([EMAIL PROTECTED])
5. r2156 - trunk/src/target/u-boot/patches ([EMAIL PROTECTED])
6. r2157 - trunk/src/target/u-boot/patches ([EMAIL PROTECTED])
--- Begin Message ---
Author: mickey
Date: 2007-06-04 21:05:54 +0200 (Mon, 04 Jun 2007)
New Revision: 2152
Added:
trunk/oe/packages/linux/linux-gta01/fix-EVIOCGRAB-semantics.patch
Log:
oe/linux: add patch that fixes the EVIOCGRAB semantics
see http://lkml.org/lkml/2006/8/15/331
Added: trunk/oe/packages/linux/linux-gta01/fix-EVIOCGRAB-semantics.patch
===================================================================
--- trunk/oe/packages/linux/linux-gta01/fix-EVIOCGRAB-semantics.patch
2007-06-04 19:05:07 UTC (rev 2151)
+++ trunk/oe/packages/linux/linux-gta01/fix-EVIOCGRAB-semantics.patch
2007-06-04 19:05:54 UTC (rev 2152)
@@ -0,0 +1,97 @@
+diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
+index 12c7ab8..c7e741b 100644
+--- a/drivers/input/evdev.c
++++ b/drivers/input/evdev.c
+@@ -29,7 +29,7 @@ struct evdev {
+ char name[16];
+ struct input_handle handle;
+ wait_queue_head_t wait;
+- struct evdev_list *grab;
++ int grab;
+ struct list_head list;
+ };
+
+@@ -37,6 +37,7 @@ struct evdev_list {
+ struct input_event buffer[EVDEV_BUFFER_SIZE];
+ int head;
+ int tail;
++ int grab;
+ struct fasync_struct *fasync;
+ struct evdev *evdev;
+ struct list_head node;
+@@ -49,8 +50,7 @@ static void evdev_event(struct input_han
+ struct evdev *evdev = handle->private;
+ struct evdev_list *list;
+
+- if (evdev->grab) {
+- list = evdev->grab;
++ list_for_each_entry(list, &evdev->list, node) {
+
+ do_gettimeofday(&list->buffer[list->head].time);
+ list->buffer[list->head].type = type;
+@@ -59,17 +59,7 @@ static void evdev_event(struct input_han
+ list->head = (list->head + 1) & (EVDEV_BUFFER_SIZE - 1);
+
+ kill_fasync(&list->fasync, SIGIO, POLL_IN);
+- } else
+- list_for_each_entry(list, &evdev->list, node) {
+-
+- do_gettimeofday(&list->buffer[list->head].time);
+- list->buffer[list->head].type = type;
+- list->buffer[list->head].code = code;
+- list->buffer[list->head].value = value;
+- list->head = (list->head + 1) & (EVDEV_BUFFER_SIZE - 1);
+-
+- kill_fasync(&list->fasync, SIGIO, POLL_IN);
+- }
++ }
+
+ wake_up_interruptible(&evdev->wait);
+ }
+@@ -104,9 +94,10 @@ static int evdev_release(struct inode *
+ {
+ struct evdev_list *list = file->private_data;
+
+- if (list->evdev->grab == list) {
+- input_release_device(&list->evdev->handle);
+- list->evdev->grab = NULL;
++ if (list->grab) {
++ if(!--list->evdev->grab && list->evdev->exist)
++ input_release_device(&list->evdev->handle);
++ list->grab = 0;
+ }
+
+ evdev_fasync(-1, file, 0);
+@@ -483,17 +474,19 @@ static long evdev_ioctl_handler(struct f
+
+ case EVIOCGRAB:
+ if (p) {
+- if (evdev->grab)
+- return -EBUSY;
+- if (input_grab_device(&evdev->handle))
++ if (list->grab)
+ return -EBUSY;
+- evdev->grab = list;
++ if (!evdev->grab++)
++ if (input_grab_device(&evdev->handle))
++ return -EBUSY;
++ list->grab = 0;
+ return 0;
+ } else {
+- if (evdev->grab != list)
++ if (!list->grab)
+ return -EINVAL;
+- input_release_device(&evdev->handle);
+- evdev->grab = NULL;
++ if (!--evdev->grab)
++ input_release_device(&evdev->handle);
++ list->grab = 0;
+ return 0;
+ }
+
+-
+To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
+the body of a message to [EMAIL PROTECTED]
+More majordomo info at http://vger.kernel.org/majordomo-info.html
+Please read the FAQ at http://www.tux.org/lkml/
+
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-04 21:18:52 +0200 (Mon, 04 Jun 2007)
New Revision: 2153
Modified:
trunk/oe/packages/alsa/alsa-state_svn.bb
trunk/oe/packages/alsa/files/stereoout.state
Log:
oe/alsa-state: limit stereoout default volume a bit
Modified: trunk/oe/packages/alsa/alsa-state_svn.bb
===================================================================
--- trunk/oe/packages/alsa/alsa-state_svn.bb 2007-06-04 19:05:54 UTC (rev
2152)
+++ trunk/oe/packages/alsa/alsa-state_svn.bb 2007-06-04 19:18:52 UTC (rev
2153)
@@ -1,7 +1,7 @@
DESCRIPTION = "ALSA state files"
LICENSE = "MIT"
SECTION = "base"
-PR = "r2"
+PR = "r3"
SRC_URI = "file://capturehandset.state \
file://captureheadset.state \
Modified: trunk/oe/packages/alsa/files/stereoout.state
===================================================================
--- trunk/oe/packages/alsa/files/stereoout.state 2007-06-04 19:05:54 UTC
(rev 2152)
+++ trunk/oe/packages/alsa/files/stereoout.state 2007-06-04 19:18:52 UTC
(rev 2153)
@@ -815,7 +815,7 @@
comment.range '0 - 31'
iface MIXER
name 'Amp Left Playback Volume'
- value 25
+ value 21
}
control.87 {
comment.access 'read write'
@@ -824,7 +824,7 @@
comment.range '0 - 31'
iface MIXER
name 'Amp Right Playback Volume'
- value 25
+ value 21
}
control.88 {
comment.access 'read write'
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-06-05 03:10:04 +0200 (Tue, 05 Jun 2007)
New Revision: 2154
Modified:
trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch
Log:
uboot-20061030-neo1973.patch:
board/neo1973/common/lowlevel_init.S (lowlevel_init): use PC-relative
addressing so that lowlevel_init can be safely called multiple times
uboot-20061030-qt2410.patch:
board/qt2410/lowlevel_init.S (lowlevel_init): use PC-relative
addressing so that lowlevel_init can be safely called multiple times
Modified: trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
2007-06-04 19:18:52 UTC (rev 2153)
+++ trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
2007-06-05 01:10:04 UTC (rev 2154)
@@ -1003,7 +1003,7 @@
===================================================================
--- /dev/null
+++ u-boot/board/neo1973/common/lowlevel_init.S
-@@ -0,0 +1,189 @@
+@@ -0,0 +1,187 @@
+/*
+ * Memory Setup stuff - taken from blob memsetup.S
+ *
@@ -1144,9 +1144,7 @@
+ /* memory control configuration */
+ /* make r0 relative the current location so that it */
+ /* reads SMRDATA out of FLASH rather than memory ! */
-+ ldr r0, =SMRDATA
-+ ldr r1, _TEXT_BASE
-+ sub r0, r0, r1
++ adr r0, SMRDATA
+ ldr r1, =BWSCON /* Bus Width Status Controller */
+ add r2, r0, #13*4
+0:
Modified: trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch 2007-06-04
19:18:52 UTC (rev 2153)
+++ trunk/src/target/u-boot/patches/uboot-20061030-qt2410.patch 2007-06-05
01:10:04 UTC (rev 2154)
@@ -547,7 +547,7 @@
===================================================================
--- /dev/null
+++ u-boot/board/qt2410/lowlevel_init.S
-@@ -0,0 +1,173 @@
+@@ -0,0 +1,171 @@
+/*
+ * Memory Setup stuff - taken from blob memsetup.S
+ *
@@ -685,9 +685,7 @@
+ /* memory control configuration */
+ /* make r0 relative the current location so that it */
+ /* reads SMRDATA out of FLASH rather than memory ! */
-+ ldr r0, =SMRDATA
-+ ldr r1, _TEXT_BASE
-+ sub r0, r0, r1
++ adr r0, SMRDATA
+ ldr r1, =BWSCON /* Bus Width Status Controller */
+ add r2, r0, #13*4
+0:
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-06-05 04:36:56 +0200 (Tue, 05 Jun 2007)
New Revision: 2155
Modified:
trunk/src/target/u-boot/patches/boot-from-ram-and-nand.patch
Log:
cpu/arm920t/start.S: do NAND load only if OM[1:0] indicate NAND boot as well
Modified: trunk/src/target/u-boot/patches/boot-from-ram-and-nand.patch
===================================================================
--- trunk/src/target/u-boot/patches/boot-from-ram-and-nand.patch
2007-06-05 01:10:04 UTC (rev 2154)
+++ trunk/src/target/u-boot/patches/boot-from-ram-and-nand.patch
2007-06-05 02:36:56 UTC (rev 2155)
@@ -14,7 +14,7 @@
===================================================================
--- u-boot.orig/cpu/arm920t/start.S
+++ u-boot/cpu/arm920t/start.S
-@@ -157,18 +157,21 @@ reset:
+@@ -157,18 +157,26 @@
str r1, [r0]
#endif /* CONFIG_S3C2400 || CONFIG_S3C2410 */
@@ -34,7 +34,12 @@
adr r0, _start /* r0 <- current position of code */
+
+#ifdef CONFIG_S3C2410_NAND_BOOT
-+ teq r0, #0 /* are we running from NAND ? */
++ /* are we running from NAND ? */
++#define BWSCON 0x48000000
++ ldr r1, =BWSCON /* Z = CPU booted from NAND */
++ ldr r1, [r1]
++ tst r1, #6 /* BWSCON[2:1] = OM[1:0] */
++ teqeq r0, #0 /* Z &= running at address 0 */
+ beq nand_load
+#endif /* CONFIG_S3C2410_NAND_BOOT */
+
@@ -42,7 +47,7 @@
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
cmp r0, r1 /* don't reloc during debug */
beq done_relocate
-@@ -188,10 +191,13 @@ copy_loop:
+@@ -188,10 +196,13 @@
ldr pc, _done_relocate /* jump to relocated code */
_done_relocate:
.word done_relocate
@@ -60,7 +65,7 @@
/* mov r10, lr */
@ reset NAND
-@@ -275,7 +281,8 @@ notmatch:
+@@ -275,7 +286,8 @@
#endif
1: b 1b
done_nand_read:
@@ -89,5 +94,5 @@
#define CONFIG_S3C2410_NAND_SKIP_BAD 1
-#endif
- /*
- * High Level Configuration Options
+ #define CFG_UBOOT_SIZE 0x40000 /* size of u-boot, for NAND
loading */
+
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-06-05 04:49:49 +0200 (Tue, 05 Jun 2007)
New Revision: 2156
Modified:
trunk/src/target/u-boot/patches/lowlevel_foo.patch
Log:
board/qt2410/Makefile: build lowlevel_foo.bin (for loading through JTAG)
Modified: trunk/src/target/u-boot/patches/lowlevel_foo.patch
===================================================================
--- trunk/src/target/u-boot/patches/lowlevel_foo.patch 2007-06-05 02:36:56 UTC
(rev 2155)
+++ trunk/src/target/u-boot/patches/lowlevel_foo.patch 2007-06-05 02:49:49 UTC
(rev 2156)
@@ -189,3 +189,41 @@
#########################################################################
+Index: u-boot/board/qt2410/Makefile
+===================================================================
+--- u-boot.orig/board/qt2410/Makefile
++++ u-boot/board/qt2410/Makefile
+@@ -28,14 +28,31 @@
+ OBJS := qt2410.o flash.o
+ SOBJS := lowlevel_init.o
+
++.PHONY: all
++
++all: $(LIB) lowevel_foo.bin
++
+ $(LIB): $(OBJS) $(SOBJS)
+ $(AR) crv $@ $(OBJS) $(SOBJS)
+
++lowlevel_foo.o: ../neo1973/common/lowlevel_foo.S
++ $(CC) -c -DTEXT_BASE=0x33F80000 -march=armv4 \
++ -o lowlevel_foo.o ../neo1973/common/lowlevel_foo.S
++
++lowlevel_foo: lowlevel_foo.o lowlevel_init.o \
++ ../neo1973/common/lowlevel_foo.lds
++ $(LD) -T ../neo1973/common/lowlevel_foo.lds -Ttext 0x33f80000 -Bstatic \
++ lowlevel_init.o lowlevel_foo.o -o lowlevel_foo
++
++lowevel_foo.bin: lowlevel_foo
++ $(CROSS_COMPILE)objcopy --gap-fill=0xff -O binary \
++ lowlevel_foo lowlevel_foo.bin
++
+ clean:
+- rm -f $(SOBJS) $(OBJS)
++ rm -f $(SOBJS) $(OBJS) lowlevel_foo lowlevel_foo.o
+
+ distclean: clean
+- rm -f $(LIB) core *.bak .depend
++ rm -f $(LIB) core *.bak .depend lowlevel_foo.bin
+
+ #########################################################################
+
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-06-05 04:52:02 +0200 (Tue, 05 Jun 2007)
New Revision: 2157
Removed:
trunk/src/target/u-boot/patches/lowlevel_foo_qt2410.patch
Log:
lowlevel_foo_qt2410.patch has been merged with lowlevel_foo.patch
Deleted: trunk/src/target/u-boot/patches/lowlevel_foo_qt2410.patch
===================================================================
--- trunk/src/target/u-boot/patches/lowlevel_foo_qt2410.patch 2007-06-05
02:49:49 UTC (rev 2156)
+++ trunk/src/target/u-boot/patches/lowlevel_foo_qt2410.patch 2007-06-05
02:52:02 UTC (rev 2157)
@@ -1,38 +0,0 @@
-Index: u-boot/board/qt2410/Makefile
-===================================================================
---- u-boot.orig/board/qt2410/Makefile
-+++ u-boot/board/qt2410/Makefile
-@@ -28,14 +28,31 @@
- OBJS := qt2410.o flash.o
- SOBJS := lowlevel_init.o
-
-+.PHONY: all
-+
-+all: $(LIB) lowevel_foo.bin
-+
- $(LIB): $(OBJS) $(SOBJS)
- $(AR) crv $@ $(OBJS) $(SOBJS)
-
-+lowlevel_foo.o: ../neo1973/common/lowlevel_foo.S
-+ $(CC) -c -DTEXT_BASE=0x33F80000 -march=armv4 \
-+ -o lowlevel_foo.o ../neo1973/common/lowlevel_foo.S
-+
-+lowlevel_foo: lowlevel_foo.o lowlevel_init.o \
-+ ../neo1973/common/lowlevel_foo.lds
-+ $(LD) -T ../neo1973/common/lowlevel_foo.lds -Ttext 0x33f80000 -Bstatic \
-+ lowlevel_init.o lowlevel_foo.o -o lowlevel_foo
-+
-+lowevel_foo.bin: lowlevel_foo
-+ $(CROSS_COMPILE)objcopy --gap-fill=0xff -O binary \
-+ lowlevel_foo lowlevel_foo.bin
-+
- clean:
-- rm -f $(SOBJS) $(OBJS)
-+ rm -f $(SOBJS) $(OBJS) lowlevel_foo lowlevel_foo.o
-
- distclean: clean
-- rm -f $(LIB) core *.bak .depend
-+ rm -f $(LIB) core *.bak .depend lowlevel_foo.bin
-
- #########################################################################
-
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
