[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-239-g0e5cda9
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2011-06-24 12:13:55
|
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 0e5cda998ed6ee39869f9cc69448f6dd85ae4dd6 (commit)
from 6289ef7615fbd629ea9c909d06ac0e99d68eebae (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 0e5cda998ed6ee39869f9cc69448f6dd85ae4dd6
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 24 14:13:07 2011 +0200
[BUILDROOT] Moves uClibc-0.9.29-fix-spin_locks.patch in 072-xenomai-package.patch as this patch is required by xenomai
-----------------------------------------------------------------------
Summary of changes:
.../uClibc/uClibc-0.9.29-fix-spin_locks.patch | 20 ---------
.../buildroot/2010.11/072-xenomai-package.patch | 43 +++++++++++++++----
2 files changed, 34 insertions(+), 29 deletions(-)
delete mode 100644 buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch
diff --git a/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch b/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch
deleted file mode 100644
index 92b5f87..0000000
--- a/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Spinlocks are still not yet implemented in uClibc for ARM targets.
-However, Xenomai-2.4.3 use this flags to enable or not spinlocking.
-If _POSIX_SPIN_LOCKS is set, Xenomai will fail to compile. So comment it.
-
-diff -purN uClibc-0.9.29.ori/libc/sysdeps/linux/common/bits/posix_opt.h uClibc-0.9.29/libc/sysdeps/linux/common/bits/posix_opt.h
---- uClibc-0.9.29.ori/libc/sysdeps/linux/common/bits/posix_opt.h 2008-04-26 15:25:03.000000000 +0200
-+++ uClibc-0.9.29/libc/sysdeps/linux/common/bits/posix_opt.h 2008-04-26 15:39:38.000000000 +0200
-@@ -124,8 +124,11 @@
- /* We support the Timeouts option. */
- #define _POSIX_TIMEOUTS 200112L
-
-+/* Armadeus patch for Xenomai-2.4.3: Spinlocks are still not yet implemented
-+ * in uClibc for ARM targets.
-+ */
- /* We support spinlocks. */
--#define _POSIX_SPIN_LOCKS 200112L
-+/* #define _POSIX_SPIN_LOCKS 200112L */
-
- /* The `spawn' function family is supported. */
- #define _POSIX_SPAWN 200112L
diff --git a/patches/buildroot/2010.11/072-xenomai-package.patch b/patches/buildroot/2010.11/072-xenomai-package.patch
index f32236c..80941a4 100644
--- a/patches/buildroot/2010.11/072-xenomai-package.patch
+++ b/patches/buildroot/2010.11/072-xenomai-package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-01-18 22:37:08.000000000 +0100
-+++ buildroot/package/Config.in 2011-01-19 11:40:16.000000000 +0100
+--- buildroot.orig/package/Config.in 2011-06-24 13:50:40.000000000 +0200
++++ buildroot/package/Config.in 2011-06-24 14:02:24.000000000 +0200
@@ -208,6 +208,7 @@
source "package/usbmount/Config.in"
source "package/usbutils/Config.in"
@@ -16,8 +16,8 @@ Index: buildroot/package/Config.in
Index: buildroot/linux/linux.mk
===================================================================
---- buildroot.orig/linux/linux.mk 2011-01-18 22:37:08.000000000 +0100
-+++ buildroot/linux/linux.mk 2011-01-18 22:37:08.000000000 +0100
+--- buildroot.orig/linux/linux.mk 2011-06-24 13:50:40.000000000 +0200
++++ buildroot/linux/linux.mk 2011-06-24 14:02:21.000000000 +0200
@@ -117,6 +117,9 @@
$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX26_DIR)/Makefile
(ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ $(LINUX26_DIR)/drivers/armadeus)
@@ -31,7 +31,7 @@ Index: buildroot/linux/linux.mk
Index: buildroot/package/xenomai/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/Config.in 2011-01-19 10:01:03.000000000 +0100
++++ buildroot/package/xenomai/Config.in 2011-06-24 13:50:40.000000000 +0200
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XENOMAI
+ bool "Xenomai"
@@ -42,7 +42,7 @@ Index: buildroot/package/xenomai/Config.in
Index: buildroot/package/xenomai/xenomai.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/xenomai.mk 2011-01-19 11:03:40.000000000 +0100
++++ buildroot/package/xenomai/xenomai.mk 2011-06-24 13:50:40.000000000 +0200
@@ -0,0 +1,101 @@
+#############################################################
+#
@@ -148,7 +148,7 @@ Index: buildroot/package/xenomai/xenomai.mk
Index: buildroot/package/xenomai/xeno-kernel.config
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/xeno-kernel.config 2011-01-18 22:37:08.000000000 +0100
++++ buildroot/package/xenomai/xeno-kernel.config 2011-06-24 13:50:40.000000000 +0200
@@ -0,0 +1,59 @@
+CONFIG_XENOMAI=y
+CONFIG_XENO_OPT_NUCLEUS=y
@@ -213,7 +213,7 @@ Index: buildroot/package/xenomai/xeno-kernel.config
Index: buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch 2011-01-18 22:37:08.000000000 +0100
++++ buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch 2011-06-24 13:50:40.000000000 +0200
@@ -0,0 +1,10 @@
+--- a/arch/arm/mach-imx/include/mach/imxfb.h
++++ b/arch/arm/mach-imx/include/mach/imxfb.h
@@ -228,7 +228,7 @@ Index: buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.pat
Index: buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch 2011-01-18 22:37:08.000000000 +0100
++++ buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch 2011-06-24 13:50:40.000000000 +0200
@@ -0,0 +1,23 @@
+Corrects Freeze problem with MX2 when Adeos is active and
+application/driver uses interruption on GPIO
@@ -253,3 +253,28 @@ Index: buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_wit
+
+ gpio_irq_no = port[i].virtual_irq_start;
+
+Index: buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch 2011-06-24 14:06:22.000000000 +0200
+@@ -0,0 +1,20 @@
++Spinlocks are still not yet implemented in uClibc for ARM targets.
++However, Xenomai-2.4.3 use this flags to enable or not spinlocking.
++If _POSIX_SPIN_LOCKS is set, Xenomai will fail to compile. So comment it.
++
++diff -purN uClibc-0.9.29.ori/libc/sysdeps/linux/common/bits/posix_opt.h uClibc-0.9.29/libc/sysdeps/linux/common/bits/posix_opt.h
++--- uClibc-0.9.29.ori/libc/sysdeps/linux/common/bits/posix_opt.h 2008-04-26 15:25:03.000000000 +0200
+++++ uClibc-0.9.29/libc/sysdeps/linux/common/bits/posix_opt.h 2008-04-26 15:39:38.000000000 +0200
++@@ -124,8 +124,11 @@
++ /* We support the Timeouts option. */
++ #define _POSIX_TIMEOUTS 200112L
++
+++/* Armadeus patch for Xenomai-2.4.3: Spinlocks are still not yet implemented
+++ * in uClibc for ARM targets.
+++ */
++ /* We support spinlocks. */
++-#define _POSIX_SPIN_LOCKS 200112L
+++/* #define _POSIX_SPIN_LOCKS 200112L */
++
++ /* The `spawn' function family is supported. */
++ #define _POSIX_SPAWN 200112L
hooks/post-receive
--
armadeus
|