[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-247-g6472633
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-247-g6472633
|
From: Julien B a. A. <ar...@us...> - 2011-01-19 10:56:00
|
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 64726330eb8457081a04495cb12476bd59b60b57 (commit)
via c8438d823e5a13a8df818e7e3bdd4c21eeef7032 (commit)
from 06ff4006b3c8d322916940c1b2927b68c98ea5ff (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 64726330eb8457081a04495cb12476bd59b60b57
Merge: c8438d823e5a13a8df818e7e3bdd4c21eeef7032 06ff4006b3c8d322916940c1b2927b68c98ea5ff
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jan 19 11:55:03 2011 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit c8438d823e5a13a8df818e7e3bdd4c21eeef7032
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jan 19 11:54:44 2011 +0100
[XENOMAI] Updates architecture detection in Makefile
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/072-xenomai-package.patch | 4 +-
.../buildroot/2010.11/072-xenomai-package.patch | 51 ++++++++++----------
2 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/patches/buildroot/072-xenomai-package.patch b/patches/buildroot/072-xenomai-package.patch
index 330c0d2..e7dcafc 100644
--- a/patches/buildroot/072-xenomai-package.patch
+++ b/patches/buildroot/072-xenomai-package.patch
@@ -71,10 +71,10 @@ Index: buildroot/package/xenomai/xenomai.mk
+XENOMAI_BINARY:=xeno-load
+XENOMAI_TARGET_BINARY:=usr/xenomai/bin/$(XENOMAI_BINARY)
+
-+ifeq ($(BR2_TARGET_ARMADEUS_APF27),y)
++ifeq ($(BR2_CPU_NAME),"imx27")
+ CPU_TYPE:=mx2
+else
-+ifeq ($(BR2_TARGET_ARMADEUS_APF9328),y)
++ifeq ($(BR2_CPU_NAME),"imxl")
+ CPU_TYPE:=imx
+endif
+endif
diff --git a/patches/buildroot/2010.11/072-xenomai-package.patch b/patches/buildroot/2010.11/072-xenomai-package.patch
index d782bed..d39eb4e 100644
--- a/patches/buildroot/2010.11/072-xenomai-package.patch
+++ b/patches/buildroot/2010.11/072-xenomai-package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-10-19 09:22:13.000000000 +0200
-+++ buildroot/package/Config.in 2010-10-19 09:23:59.000000000 +0200
-@@ -204,6 +204,7 @@
+--- 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
+@@ -208,6 +208,7 @@
source "package/usbmount/Config.in"
source "package/usbutils/Config.in"
source "package/wipe/Config.in"
@@ -16,10 +16,10 @@ Index: buildroot/package/Config.in
Index: buildroot/linux/linux.mk
===================================================================
---- buildroot.orig/linux/linux.mk 2010-10-19 09:22:36.000000000 +0200
-+++ buildroot/linux/linux.mk 2010-10-19 09:24:54.000000000 +0200
-@@ -115,6 +115,9 @@
- $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile
+--- 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
+@@ -117,6 +117,9 @@
+ $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX26_DIR)/Makefile
(cd $(LINUX26_DIR)/drivers; ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ armadeus)
endif
+ifeq ($(BR2_PACKAGE_XENOMAI),y)
@@ -31,11 +31,10 @@ 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 2010-10-19 09:26:41.000000000 +0200
-@@ -0,0 +1,7 @@
++++ buildroot/package/xenomai/Config.in 2011-01-19 10:01:03.000000000 +0100
+@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XENOMAI
+ bool "Xenomai"
-+ depends on BR2_LINUX_2_6_29 || BR2_LINUX_2_6_27
+ help
+ Real-Time Framework for Linux
+
@@ -43,8 +42,8 @@ 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 2010-10-19 09:26:41.000000000 +0200
-@@ -0,0 +1,99 @@
++++ buildroot/package/xenomai/xenomai.mk 2011-01-19 11:03:40.000000000 +0100
+@@ -0,0 +1,101 @@
+#############################################################
+#
+# xenomai :
@@ -60,7 +59,9 @@ Index: buildroot/package/xenomai/xenomai.mk
+#
+#############################################################
+
-+KERN_DIR:=$(PROJECT_BUILD_DIR)/linux-$(shell echo $(BR2_LINUX26_VERSION))
++KERNEL_VERSION=$(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
++KERNEL_DIR:=$(BUILD_DIR)/linux-$(KERNEL_VERSION)
++
+XENOMAI_ARCH:=$(shell echo $(BR2_ARCH))
+
+XENOMAI_VERSION:=2.4.8
@@ -71,10 +72,10 @@ Index: buildroot/package/xenomai/xenomai.mk
+XENOMAI_BINARY:=xeno-load
+XENOMAI_TARGET_BINARY:=usr/xenomai/bin/$(XENOMAI_BINARY)
+
-+ifeq ($(BR2_TARGET_ARMADEUS_APF27),y)
++ifeq ($(BR2_CPU_NAME),"imx27")
+ CPU_TYPE:=mx2
+else
-+ifeq ($(BR2_TARGET_ARMADEUS_APF9328),y)
++ifeq ($(BR2_CPU_NAME),"imxl")
+ CPU_TYPE:=imx
+endif
+endif
@@ -88,21 +89,21 @@ Index: buildroot/package/xenomai/xenomai.mk
+ $(XENOMAI_CAT) $(DL_DIR)/$(XENOMAI_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ touch $@
+
-+$(KERN_DIR)/.patched.xenomai: $(XENOMAI_DIR)/.unpacked
-+ toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
++$(KERNEL_DIR)/.patched.xenomai: $(XENOMAI_DIR)/.unpacked
++ toolchain/patch-kernel.sh $(KERNEL_DIR) package/xenomai \
+ \*-before-adeos-\*.patch
+ $(XENOMAI_DIR)/scripts/prepare-kernel.sh \
-+ --linux=$(LINUX26_DIR) \
++ --linux=$(KERNEL_DIR) \
+ --arch=$(BR2_ARCH) \
+ --default
-+ cat package/xenomai/xeno-kernel.config >> $(LINUX26_DIR)/.config
-+ toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
++ cat package/xenomai/xeno-kernel.config >> $(KERNEL_DIR)/.config
++ toolchain/patch-kernel.sh $(KERNEL_DIR) package/xenomai \
+ \*-after-adeos-\*.patch
+ touch $@
+
-+xenomai-patch-kernel: $(KERN_DIR)/.patched.xenomai
++xenomai-patch-kernel: $(KERNEL_DIR)/.patched.xenomai
+
-+$(XENOMAI_DIR)/.configured: $(KERN_DIR)/.patched.xenomai
++$(XENOMAI_DIR)/.configured: $(KERNEL_DIR)/.patched.xenomai
+ (cd $(XENOMAI_DIR); rm -rf config.cache; \
+ $(TARGET_CONFIGURE_OPTS) \
+ $(TARGET_CONFIGURE_ARGS) \
@@ -147,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 2010-10-19 09:26:41.000000000 +0200
++++ buildroot/package/xenomai/xeno-kernel.config 2011-01-18 22:37:08.000000000 +0100
@@ -0,0 +1,59 @@
+CONFIG_XENOMAI=y
+CONFIG_XENO_OPT_NUCLEUS=y
@@ -212,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 2010-10-19 09:26:41.000000000 +0200
++++ buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch 2011-01-18 22:37:08.000000000 +0100
@@ -0,0 +1,10 @@
+--- a/arch/arm/mach-imx/include/mach/imxfb.h
++++ b/arch/arm/mach-imx/include/mach/imxfb.h
@@ -227,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 2010-10-19 09:26:41.000000000 +0200
++++ buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch 2011-01-18 22:37:08.000000000 +0100
@@ -0,0 +1,23 @@
+Corrects Freeze problem with MX2 when Adeos is active and
+application/driver uses interruption on GPIO
hooks/post-receive
--
armadeus
|
