[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2560-ga064df4

[Julien B a. A. <ar...@us...>]

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  a064df49eb89f623b1be6de855f6fe741d12645a (commit)
       via  6dde773ddd2de879b2374f3359ff9369c4bd360c (commit)
      from  065139f6816f46d9e6a10d8a213d16fc479d79bb (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 a064df49eb89f623b1be6de855f6fe741d12645a
Merge: 6dde773 065139f
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Oct 21 11:57:32 2011 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 6dde773ddd2de879b2374f3359ff9369c4bd360c
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Oct 21 11:55:35 2011 +0200

    [BUILDROOT] Add some fixes for imx-test

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

Summary of changes:
 .../package/armadeus/freescale-tools/imx-test.mk   |    3 +-
 .../imx-test/imx-test-01_fixes.patch               |   50 ++++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletions(-)
 create mode 100644 buildroot/package/armadeus/freescale-tools/imx-test/imx-test-01_fixes.patch

diff --git a/buildroot/package/armadeus/freescale-tools/imx-test.mk b/buildroot/package/armadeus/freescale-tools/imx-test.mk
index 8ecbff9..ad072ac 100644
--- a/buildroot/package/armadeus/freescale-tools/imx-test.mk
+++ b/buildroot/package/armadeus/freescale-tools/imx-test.mk
@@ -6,6 +6,7 @@
 IMX_TEST_VERSION = 10.11.01
 IMX_TEST_SOURCE = imx-test-$(IMX_TEST_VERSION).tar.gz
 IMX_TEST_SITE = ftp://ftp2.armadeus.com/armadeusw/download/
+IMX_TEST_DEPENDENCIES = imx-lib
 
 ifeq ($(BR2_CPU_NAME),imx27)
 BUILD_PLATFORM = IMX27
@@ -39,4 +40,4 @@ define IMX_TEST_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
-$(eval $(call GENTARGETS,package,imx-test))
+$(eval $(call GENTARGETS,package/armadeus/freescale-tools,imx-test))
diff --git a/buildroot/package/armadeus/freescale-tools/imx-test/imx-test-01_fixes.patch b/buildroot/package/armadeus/freescale-tools/imx-test/imx-test-01_fixes.patch
new file mode 100644
index 0000000..a31cba3
--- /dev/null
+++ b/buildroot/package/armadeus/freescale-tools/imx-test/imx-test-01_fixes.patch
@@ -0,0 +1,50 @@
+Add some fixes for imx-test. Some are temporary.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+diff -urN -X buildroot/output/build/linux-2.6.38.8/Documentation/dontdiff imx-test-10.11.01/module_test/Makefile imx-test-10.11.01.mod//module_test/Makefile
+--- imx-test-10.11.01/module_test/Makefile	2010-11-02 21:53:40.000000000 +0100
++++ imx-test-10.11.01.mod//module_test/Makefile	2011-10-17 19:29:23.000000000 +0200
+@@ -39,7 +39,8 @@
+                            $(SAHARA_TEST_SOURCE)user_wrap.o
+ 
+ 
+-obj-m += $(module_list-y)
++obj-m += $(module_list-m)
++obj-y += $(module_list-y)
+ 
+ EXTRA_CFLAGS := -DLINUX_KERNEL -DIMX_NEEDS_DEPRECATED_SYMBOLS
+ 
+@@ -51,7 +52,7 @@
+ 
+ # Need to remove sahara objects because the test app uses same objects
+ all:
+-	$(MAKE) -C $(LINUXPATH) M=`pwd` KBUILD_OUTPUT=$(KBUILD_OUTPUT) ARCH=arm CROSS_COMPILE=$(CROSS_COMPILE)  modules
++	$(MAKE) -C $(LINUXPATH) SUBDIRS=`pwd` KBUILD_OUTPUT=$(KBUILD_OUTPUT) ARCH=arm CROSS_COMPILE=$(CROSS_COMPILE)  modules
+ 
+ install:
+ 	$(MAKE) -C $(LINUXPATH) INSTALL_MOD_DIR=test M=`pwd` KBUILD_OUTPUT=$(KBUILD_OUTPUT) ARCH=arm CROSS_COMPILE=$(CROSS_COMPILE)  modules_install
+diff -urN -X buildroot/output/build/linux-2.6.38.8/Documentation/dontdiff imx-test-10.11.01/module_test/scc2_test_driver.c imx-test-10.11.01.mod//module_test/scc2_test_driver.c
+--- imx-test-10.11.01/module_test/scc2_test_driver.c	2010-11-02 21:53:40.000000000 +0100
++++ imx-test-10.11.01.mod//module_test/scc2_test_driver.c	2011-10-18 16:20:42.000000000 +0200
+@@ -26,6 +26,7 @@
+ 
+ #include "../include/scc2_test_driver.h"
+ 
++#define SCC2_DEBUG
+ 
+ MODULE_AUTHOR("Freescale Semiconductor");
+ MODULE_DESCRIPTION("Test Device Driver for SCC2 (SMN/SCM) Driver");
+@@ -263,9 +264,9 @@
+ #ifdef SCC2_DEBUG
+         printk("SCC2 TEST: Error in ioctl(): (0x%x) is an invalid "
+                "command (0x%x,0x%x)\n", cmd, SCC2_TEST_GET_CONFIGURATION,
+-               SCC2_TEST_ALLOC_SLOT);
+-        printk("uint64 is %d, alloc is %d\n", sizeof(uint64_t),
+-               sizeof(scc_alloc_slot_access));
++               SCC2_TEST_RELEASE_PART);
++/*        printk("uint64 is %d, alloc is %d\n", sizeof(uint64_t),
++               sizeof(scc_alloc_slot_access));*/
+ #endif
+         error_code = -IOCTL_SCC2_INVALID_CMD;
+         break;


hooks/post-receive
-- 
armadeus