[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-404-ge0e5362
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-404-ge0e5362
|
From: Julien B a. A. <ar...@us...> - 2010-06-04 08:16:50
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via e0e5362e9f57354f2d0d8841507a5fc5ea279e42 (commit)
via 71465e31afe511137cd5721f26fc9721b457007a (commit)
from 3a8b9125f4f5b48d855ee4c7a62acad408131aae (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e0e5362e9f57354f2d0d8841507a5fc5ea279e42
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 4 10:16:08 2010 +0200
[BUILDROOT] strace: needs patches when compiled with EABI
commit 71465e31afe511137cd5721f26fc9721b457007a
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 3 22:25:36 2010 +0200
Indentation/cleanup
-----------------------------------------------------------------------
Summary of changes:
.../111-strace-add_some_patches_for_arm.patch | 60 ++++++++++++++++++++
target/linux/modules/gpio/core.c | 11 ++--
target/linux/modules/gpio/core.h | 11 ++--
3 files changed, 71 insertions(+), 11 deletions(-)
create mode 100644 patches/buildroot/111-strace-add_some_patches_for_arm.patch
diff --git a/patches/buildroot/111-strace-add_some_patches_for_arm.patch b/patches/buildroot/111-strace-add_some_patches_for_arm.patch
new file mode 100644
index 0000000..6048f2f
--- /dev/null
+++ b/patches/buildroot/111-strace-add_some_patches_for_arm.patch
@@ -0,0 +1,60 @@
+Patches needed to compile strace on ARM (EABI).
+
+Already included in recent BR.
+
+Index: buildroot/package/strace/strace-arm-eabi-fix.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/strace/strace-arm-eabi-fix.patch 2010-06-04 09:25:00.000000000 +0200
+@@ -0,0 +1,27 @@
++From f5da8d0c38ea0eb660cb17de7aa62cda6899eb75 Mon Sep 17 00:00:00 2001
++From: ldv <ldv>
++Date: Thu, 1 Jan 2009 23:20:38 +0000
++Subject: [PATCH] 2008-11-13 Kirill A. Shutemov <ki...@sh...>
++
++ * linux/arm/syscallent.h: Fix build on ARM EABI which does not
++ provide syscalls socketcall and ipc.
++
++diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h
++index 5ccef2f..edc3641 100644
++--- a/linux/arm/syscallent.h
+++++ b/linux/arm/syscallent.h
++@@ -431,6 +431,7 @@
++ { 5, 0, printargs, "SYS_398" }, /* 398 */
++ { 5, 0, printargs, "SYS_399" }, /* 399 */
++
+++#ifndef __ARM_EABI__
++ #if SYS_socket_subcall != 400
++ #error fix me
++ #endif
++@@ -481,3 +482,4 @@
++ { 4, TI, sys_shmdt, "shmdt" }, /* 440 */
++ { 4, TI, sys_shmget, "shmget" }, /* 441 */
++ { 4, TI, sys_shmctl, "shmctl" }, /* 442 */
+++#endif
++--
++1.6.1.3
+Index: buildroot/package/strace/strace-arm-no-cachectl.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/strace/strace-arm-no-cachectl.patch 2010-06-04 09:25:19.000000000 +0200
+@@ -0,0 +1,19 @@
++ARM defines SYS_cacheflush, but doesn't have <asm/cachectl.h>
++---
++ system.c | 2 ++
++ 1 file changed, 2 insertions(+)
++
++--- a/system.c
+++++ b/system.c
++@@ -70,9 +70,11 @@
++ #include <linux/capability.h>
++ #endif
++
+++#ifndef ARM
++ #ifdef SYS_cacheflush
++ #include <asm/cachectl.h>
++ #endif
+++#endif
++
++ #ifdef HAVE_LINUX_USTNAME_H
++ #include <linux/utsname.h>
diff --git a/target/linux/modules/gpio/core.c b/target/linux/modules/gpio/core.c
index 6296a0a..418789e 100755
--- a/target/linux/modules/gpio/core.c
+++ b/target/linux/modules/gpio/core.c
@@ -1,7 +1,7 @@
/*
* Armadeus i.MXL/27 GPIO management driver
*
- * Copyright (C) 2006-2008 Julien Boibessot <jul...@ar...>
+ * Copyright (C) 2006-2010 Julien Boibessot <jul...@ar...>
* Nicolas Colombain <nic...@ar...>
* Armadeus Project / Armadeus Systems
*
@@ -412,7 +412,6 @@ static void set_port_pullup(unsigned int aPort, unsigned int aPullMask)
__raw_writel(aPullMask & 0xffffffff, VA_GPIO_BASE + MXC_PUEN(aPort));
}
-
static void set_port_dir(unsigned int aPort, unsigned int aDirMask)
{
__raw_writel(aDirMask & 0xffffffff, VA_GPIO_BASE + MXC_DDIR(aPort));
@@ -814,11 +813,12 @@ static unsigned int armadeus_gpio_dev_poll(struct file *filp, poll_table *wait)
spin_lock_irq(&gpio->lock);
poll_wait(filp, &gpio->change_wq, wait);
- if (gpio->changed)
- {
- mask |= (POLLIN | POLLRDNORM);
+ if (gpio->changed) {
+ mask |= (POLLIN | POLLRDNORM);
}
+
spin_unlock_irq(&gpio->lock);
+
return mask;
}
@@ -906,7 +906,6 @@ static int armadeus_gpio_proc_read(char *buffer, char **start, off_t offset,
*eof = 1;
up(&gpio_sema);
- /* Return the length */
return len;
}
diff --git a/target/linux/modules/gpio/core.h b/target/linux/modules/gpio/core.h
index 7262961..d452f46 100755
--- a/target/linux/modules/gpio/core.h
+++ b/target/linux/modules/gpio/core.h
@@ -1,7 +1,7 @@
/*
* Armadeus i.MXL GPIO management driver
*
- * Copyright (C) 2006-2008 Julien Boibessot <jul...@ar...>
+ * Copyright (C) 2006-2010 Julien Boibessot <jul...@ar...>
* Nicolas Colombain <nic...@ar...>
* Armadeus Project / Armadeus Systems
*
@@ -28,18 +28,19 @@
/* IOCTL */
-#define GPIORDDIRECTION _IOR(PP_IOCTL, 0xF0, int)/* Read/write bitmask that determine*/
-#define GPIOWRDIRECTION _IOW(PP_IOCTL, 0xF1, int)/*in/out pins (1 output, 0 input) */
+/* direction: 1 output, 0 input */
+#define GPIORDDIRECTION _IOR(PP_IOCTL, 0xF0, int)
+#define GPIOWRDIRECTION _IOW(PP_IOCTL, 0xF1, int)
#define GPIORDDATA _IOR(PP_IOCTL, 0xF2, int)
#define GPIOWRDATA _IOW(PP_IOCTL, 0xF3, int)
-
+/* mode: 1 GPIO, 0 device function */
#define GPIORDMODE _IOR(PP_IOCTL, 0xF4, int)
#define GPIOWRMODE _IOW(PP_IOCTL, 0xF5, int)
#define GPIORDPULLUP _IOR(PP_IOCTL, 0xF6, int)
#define GPIOWRPULLUP _IOW(PP_IOCTL, 0xF7, int)
-
+/* 2bits per pin for IRQ mode: 0 none, 1 rising, 2 falling, 3 both */
#define GPIORDIRQMODE_H _IOR(PP_IOCTL, 0xF8, int)
#define GPIORDIRQMODE_L _IOR(PP_IOCTL, 0xF9, int)
#define GPIOWRIRQMODE_H _IOW(PP_IOCTL, 0xFA, int)
hooks/post-receive
--
armadeus
|
