[Armadeus-commitlog] armadeus branch, master, updated. latestrelease-23-g01a3c9f

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  01a3c9f74b66865cf6f68f39f050f659fa877783 (commit)
      from  d195a5b3f15db60c73f474c2129da6e31f98e9b0 (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 01a3c9f74b66865cf6f68f39f050f659fa877783
Author: gwenhael <gwe...@us...>
Date:   Sun Jul 19 10:29:27 2009 +0200

    [BUILDROOT] xenomai:  Makefile cleaned, xenomai version upgraded, and apf27 support added

-----------------------------------------------------------------------

Summary of changes:
 .../00-adeos-compatibility_with_armadeus.patch     |   20 ++++----
 .../01-adeos-1.12-00-imx_compatibility.patch       |   24 ----------
 .../02-xenomai-imx_gpio_set_value_inline.patch     |   17 -------
 buildroot/package/xenomai/Config.in                |    3 +-
 buildroot/package/xenomai/xenomai.mk               |   47 +++++++++-----------
 5 files changed, 33 insertions(+), 78 deletions(-)
 delete mode 100644 buildroot/package/xenomai/01-adeos-1.12-00-imx_compatibility.patch
 delete mode 100644 buildroot/package/xenomai/02-xenomai-imx_gpio_set_value_inline.patch

diff --git a/buildroot/package/xenomai/00-adeos-compatibility_with_armadeus.patch b/buildroot/package/xenomai/00-adeos-compatibility_with_armadeus.patch
index ffc2a44..36a0420 100644
--- a/buildroot/package/xenomai/00-adeos-compatibility_with_armadeus.patch
+++ b/buildroot/package/xenomai/00-adeos-compatibility_with_armadeus.patch
@@ -1,10 +1,10 @@
---- a/arch/arm/mach-imx/include/mach/imx-regs.h
-+++ b/arch/arm/mach-imx/include/mach/imx-regs.h
-@@ -411,7 +411,6 @@
- #define PCR_BPIX_8      (3<<25)
- #define PCR_BPIX_12     (4<<25)
- #define PCR_BPIX_16     (4<<25)
--#define PCR_BPIX_MASK   (7<<25)
- #define PCR_PIXPOL      (1<<24)
- #define PCR_FLMPOL      (1<<23)
- #define PCR_LPPOL       (1<<22)
+--- a/arch/arm/mach-imx/include/mach/imxfb.h
++++ b/arch/arm/mach-imx/include/mach/imxfb.h
+@@ -14,7 +14,6 @@
+ #define PCR_BPIX_8	(3 << 25)
+ #define PCR_BPIX_12	(4 << 25)
+ #define PCR_BPIX_16	(4 << 25)
+-#define PCR_BPIX_MASK	(7 << 25)
+ #define PCR_PIXPOL	(1 << 24)
+ #define PCR_FLMPOL	(1 << 23)
+ #define PCR_LPPOL	(1 << 22)
diff --git a/buildroot/package/xenomai/01-adeos-1.12-00-imx_compatibility.patch b/buildroot/package/xenomai/01-adeos-1.12-00-imx_compatibility.patch
deleted file mode 100644
index 83b597b..0000000
--- a/buildroot/package/xenomai/01-adeos-1.12-00-imx_compatibility.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru a/arch/arm/mach-imx/irq.c b/arch/arm/mach-imx/irq.c
---- a/arch/arm/mach-imx/irq.c    2009-02-17 11:32:52.000000000 +0100
-+++ b/arch/arm/mach-imx/irq.c       2009-02-23 14:12:43.000000000 +0100
-@@ -35,7 +35,7 @@
- #include <asm/io.h>
- 
- #include <asm/mach/irq.h>
--#include <asm/arch/imx-regs.h>
-+#include <mach/imx-regs.h>
- 
- 
- /* Used for IMX INTERRUPT priority: Still Experimental */ 
-diff -ru a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c
---- a/arch/arm/mach-imx/time.c	2009-02-25 17:03:34.000000000 +0100
-+++ b/arch/arm/mach-imx/time.c	2009-02-25 16:36:16.000000000 +0100
-@@ -294,6 +294,8 @@
- #ifdef CONFIG_IPIPE
- void __ipipe_mach_acktimer(void)
- {
-+	uint32_t tstat;
-+	tstat = IMX_TSTAT(TIMER_BASE);
- 	IMX_TSTAT(TIMER_BASE) = 0;
- }
- 
diff --git a/buildroot/package/xenomai/02-xenomai-imx_gpio_set_value_inline.patch b/buildroot/package/xenomai/02-xenomai-imx_gpio_set_value_inline.patch
deleted file mode 100644
index f8f46c7..0000000
--- a/buildroot/package/xenomai/02-xenomai-imx_gpio_set_value_inline.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/arch/arm/mach-imx/include/mach/gpio.h	2009-04-03 15:28:59.000000000 +0200
-+++ b/arch/arm/mach-imx/include/mach/gpio.h	2009-04-03 15:29:11.000000000 +0200
-@@ -28,14 +28,10 @@
- 
- static inline void imx_gpio_set_value_inline(unsigned gpio, int value)
- {
--	unsigned long flags;
--
--	raw_local_irq_save(flags);
- 	if(value)
- 		DR(gpio >> GPIO_PORT_SHIFT) |= (1 << (gpio & GPIO_PIN_MASK));
- 	else
- 		DR(gpio >> GPIO_PORT_SHIFT) &= ~(1 << (gpio & GPIO_PIN_MASK));
--	raw_local_irq_restore(flags);
- }
- 
- static inline void imx_gpio_set_value(unsigned gpio, int value)
diff --git a/buildroot/package/xenomai/Config.in b/buildroot/package/xenomai/Config.in
index 8cacc76..7fb8584 100644
--- a/buildroot/package/xenomai/Config.in
+++ b/buildroot/package/xenomai/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_XENOMAI
         bool "Xenomai"
-        help
+	depends on BR2_LINUX_2_6_29 || BR2_LINUX_2_6_27 
+	help
 		Real-Time Framework for Linux
 
 		http://xenomai.org
diff --git a/buildroot/package/xenomai/xenomai.mk b/buildroot/package/xenomai/xenomai.mk
index cbc6385..5f88662 100644
--- a/buildroot/package/xenomai/xenomai.mk
+++ b/buildroot/package/xenomai/xenomai.mk
@@ -14,46 +14,40 @@
 #############################################################
 
 KERN_DIR:=$(PROJECT_BUILD_DIR)/linux-$(shell echo $(BR2_LINUX26_VERSION))
-XENOMAI_VERSION:=2.4.7
+XENOMAI_ARCH:=$(shell echo $(BR2_ARCH))
+
+XENOMAI_VERSION:=2.4.8
 XENOMAI_SOURCE:=xenomai-$(XENOMAI_VERSION).tar.bz2
 XENOMAI_SITE:=http://download.gna.org/xenomai/stable
 XENOMAI_DIR:=$(BUILD_DIR)/xenomai-$(XENOMAI_VERSION)
 XENOMAI_CAT:=bzcat
 XENOMAI_BINARY:=xeno-load
-XENOMAI_TARGET_BINARY:=usr/xenomai/bin/xeno-load
-
-ADEOS_VERSION:=1.12-00
-ADEOS_SOURCE:=adeos-ipipe-$(shell echo $(BR2_KERNEL_THIS_VERSION))-arm-$(ADEOS_VERSION).patch
-ADEOS_SITE:=http://download.gna.org/adeos/patches/v2.6/arm/older/
+XENOMAI_TARGET_BINARY:=usr/xenomai/bin/$(XENOMAI_BINARY)
 
+ifeq ($(BR2_TARGET_ARMADEUS_APF27),y)
+	CPU_TYPE:=mx2
+else
+ifeq ($(BR2_TARGET_ARMADEUS_APF9328),y)
+	CPU_TYPE:=imx
+endif
+endif 
 
 $(DL_DIR)/$(XENOMAI_SOURCE):
 	$(WGET) -P $(DL_DIR) $(XENOMAI_SITE)/$(XENOMAI_SOURCE)
 
-$(DL_DIR)/$(ADEOS_SOURCE):	
-	$(WGET) -P $(DL_DIR) $(ADEOS_SITE)$(ADEOS_SOURCE)
-
-xenomai-source: $(DL_DIR)/$(ADEOS_SOURCE)
-
-$(KERN_DIR)/.patched.adeos: $(DL_DIR)/$(ADEOS_SOURCE)
-	toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
-		00-adeos-compatibility_with_armadeus.patch
-	toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) \
-		$(ADEOS_SOURCE)
-	toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
-		01-adeos-$(ADEOS_VERSION)-imx_compatibility.patch
-	toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
-		02-xenomai-imx_gpio_set_value_inline.patch
-	touch $@
+xenomai-source: $(DL_DIR)/$(XENOMAI_SOURCE)
 
 $(XENOMAI_DIR)/.unpacked: $(DL_DIR)/$(XENOMAI_SOURCE)
 	$(XENOMAI_CAT) $(DL_DIR)/$(XENOMAI_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	touch $@
 
-$(KERN_DIR)/.patched.xenomai: $(KERN_DIR)/.patched.adeos $(XENOMAI_DIR)/.unpacked
+$(KERN_DIR)/.patched.xenomai: $(XENOMAI_DIR)/.unpacked
+	 toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
+		\*-adeos-\*.patch				
 	$(XENOMAI_DIR)/scripts/prepare-kernel.sh \
 		--linux=$(LINUX26_DIR) \
-		--arch=$(BR2_ARCH)
+		--arch=$(BR2_ARCH) \
+		--default
 	cat package/xenomai/xeno-kernel.config >> $(LINUX26_DIR)/.config
 	touch $@
 
@@ -64,9 +58,10 @@ $(XENOMAI_DIR)/.configured: $(KERN_DIR)/.patched.xenomai
                 $(TARGET_CONFIGURE_OPTS) \
 		                $(TARGET_CONFIGURE_ARGS) \
                 CCFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
-			./configure \
-			--enable-arm-mach=imx \
-			--host=arm-linux \
+			./configure                		\
+			--enable-$(XENOMAI_ARCH)-mach=$(CPU_TYPE) \
+			--enable-$(XENOMAI_ARCH)-eabi=$(if $(BR2_ARM_EABI),yes,no) \
+			--host=$(XENOMAI_ARCH)-linux \
 			--datarootdir=/xenodoc \
 	)
 	touch $@


hooks/post-receive
-- 
armadeus


