[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-115-g2912e6a
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-115-g2912e6a
|
From: Julien B a. A. <ar...@us...> - 2012-03-08 18:24:06
|
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 2912e6a0dbd65dfe203822d57adaebc599536fc1 (commit)
via 55fd0a8cb93efcc9f2a6875ca294e81a89541fc6 (commit)
from 0b7beaafe992a2f71437bf540a503762b8cd5871 (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 2912e6a0dbd65dfe203822d57adaebc599536fc1
Author: Julien Boibessot <jul...@ar...>
Date: Thu Mar 8 19:22:54 2012 +0100
[BUILDROOT] Moves imx-test package as a BR patch (2)
commit 55fd0a8cb93efcc9f2a6875ca294e81a89541fc6
Author: Julien Boibessot <jul...@ar...>
Date: Thu Mar 8 19:22:18 2012 +0100
[BUILDROOT] Moves imx-test package as a BR patch
-----------------------------------------------------------------------
Summary of changes:
.../package/armadeus/freescale-tools/imx-test.mk | 43 ------
.../imx-test/imx-test-01_fixes.patch | 50 -------
.../imx-test-02-mxc_vpu_test_v4l2_fixes.patch | 16 --
.../2011.05/176-imx-test-add_package.patch | 148 ++++++++++++++++++++
patches/buildroot/2011.05/cleanup_buildroot.sh | 1 +
.../2012.02/176-imx-test-add_package.patch | 148 ++++++++++++++++++++
patches/buildroot/2012.02/cleanup_buildroot.sh | 1 +
7 files changed, 298 insertions(+), 109 deletions(-)
delete mode 100644 buildroot/package/armadeus/freescale-tools/imx-test.mk
delete mode 100644 buildroot/package/armadeus/freescale-tools/imx-test/imx-test-01_fixes.patch
delete mode 100644 buildroot/package/armadeus/freescale-tools/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
create mode 100644 patches/buildroot/2011.05/176-imx-test-add_package.patch
create mode 100644 patches/buildroot/2012.02/176-imx-test-add_package.patch
diff --git a/buildroot/package/armadeus/freescale-tools/imx-test.mk b/buildroot/package/armadeus/freescale-tools/imx-test.mk
deleted file mode 100644
index d200c20..0000000
--- a/buildroot/package/armadeus/freescale-tools/imx-test.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#############################################################
-#
-# imx-test (test tools from Freescale BSP)
-#
-#############################################################
-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
-BUILD_CFLAGS = -DCONFIG_ARCH_MX2
-else
-BUILD_PLATFORM = IMX51
-BUILD_CFLAGS = -DCONFIG_ARCH_MX5
-endif
-
-define IMX_TEST_BUILD_CMDS
- $(MAKE) CC="$(TARGET_CC)" \
- VERBOSE="" \
- LINUXPATH=$(LINUX26_DIR) \
- CROSS_COMPILE="$(HOST_DIR)/usr/bin/arm-linux-" \
- PLATFORM=$(BUILD_PLATFORM) \
- DIRS="mxc_sahara_test mxc_scc2 mxc_spi_test mxc_vpu_test mxc_uart_test mxc_usb_test" \
- CFLAGS="$(BUILD_CFLAGS) -I$(LINUX26_DIR)/drivers/mxc/security/sahara2/include" \
- -C $(@D)
-endef
-
-define IMX_TEST_INSTALL_TARGET_CMDS
- $(MAKE) LINUXPATH=$(LINUX26_DIR) INSTALL_MOD_PATH=$(TARGET_DIR) install -C $(@D)/module_test
- $(MAKE) DESTDIR=$(TARGET_DIR)/unit_tests PLATFORM=IMX51 install -C $(@D)
-endef
-
-define IMX_TEST_UNINSTALL_TARGET_CMDS
- rm -rf $(TARGET_DIR)/unit_tests
-endef
-
-define IMX_TEST_CLEAN_CMDS
- -$(MAKE) -C $(@D) clean
-endef
-
-$(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
deleted file mode 100644
index a31cba3..0000000
--- a/buildroot/package/armadeus/freescale-tools/imx-test/imx-test-01_fixes.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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;
diff --git a/buildroot/package/armadeus/freescale-tools/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch b/buildroot/package/armadeus/freescale-tools/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
deleted file mode 100644
index dd8f76d..0000000
--- a/buildroot/package/armadeus/freescale-tools/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-linux/videodev.h include doesn't exist anymore on V4L2 only (=recent kernels).
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-diff -urN -X linux-2.6.38.8/Documentation/dontdiff imx-test-10.11.01/test/mxc_vpu_test/vpu_test.h imx-test-10.11.01.mod/test/mxc_vpu_test/vpu_test.h
---- imx-test-10.11.01/test/mxc_vpu_test/vpu_test.h 2010-11-02 21:53:40.000000000 +0100
-+++ imx-test-10.11.01.mod/test/mxc_vpu_test/vpu_test.h 2011-10-24 23:26:23.000000000 +0200
-@@ -16,7 +16,7 @@
- #ifndef _DEC_H
- #define _DEC_H
-
--#include <linux/videodev.h>
-+#include <linux/videodev2.h>
- #include <pthread.h>
- #include <errno.h>
- #include <stdint.h>
diff --git a/patches/buildroot/2011.05/176-imx-test-add_package.patch b/patches/buildroot/2011.05/176-imx-test-add_package.patch
new file mode 100644
index 0000000..5ea7140
--- /dev/null
+++ b/patches/buildroot/2011.05/176-imx-test-add_package.patch
@@ -0,0 +1,148 @@
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/imx-test/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/imx-test/Config.in 2012-03-08 18:04:57.000000000 +0100
+@@ -0,0 +1,5 @@
++config BR2_PACKAGE_IMX_TEST
++ bool "imx-test"
++ select BR2_PACKAGE_IMX_LIB
++ help
++ Freescale specific test utilities for i.MX processors family.
+Index: buildroot/package/imx-test/imx-test.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/imx-test/imx-test.mk 2012-03-08 18:10:12.000000000 +0100
+@@ -0,0 +1,43 @@
++#############################################################
++#
++# imx-test (test tools from Freescale BSP)
++#
++#############################################################
++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
++BUILD_CFLAGS = -DCONFIG_ARCH_MX2
++else
++BUILD_PLATFORM = IMX51
++BUILD_CFLAGS = -DCONFIG_ARCH_MX5
++endif
++
++define IMX_TEST_BUILD_CMDS
++ $(MAKE) CC="$(TARGET_CC)" \
++ VERBOSE="" \
++ LINUXPATH=$(LINUX26_DIR) \
++ CROSS_COMPILE="$(HOST_DIR)/usr/bin/arm-linux-" \
++ PLATFORM=$(BUILD_PLATFORM) \
++ DIRS="mxc_sahara_test mxc_scc2 mxc_spi_test mxc_vpu_test mxc_uart_test mxc_usb_test" \
++ CFLAGS="$(BUILD_CFLAGS) -I$(LINUX26_DIR)/drivers/mxc/security/sahara2/include" \
++ -C $(@D)
++endef
++
++define IMX_TEST_INSTALL_TARGET_CMDS
++ $(MAKE) LINUXPATH=$(LINUX26_DIR) INSTALL_MOD_PATH=$(TARGET_DIR) install -C $(@D)/module_test
++ $(MAKE) DESTDIR=$(TARGET_DIR)/unit_tests PLATFORM=IMX51 install -C $(@D)
++endef
++
++define IMX_TEST_UNINSTALL_TARGET_CMDS
++ rm -rf $(TARGET_DIR)/unit_tests
++endef
++
++define IMX_TEST_CLEAN_CMDS
++ -$(MAKE) -C $(@D) clean
++endef
++
++$(eval $(call GENTARGETS,package/armadeus/freescale-tools,imx-test))
+Index: buildroot/package/imx-test/imx-test-01_fixes.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/imx-test/imx-test-01_fixes.patch 2012-03-08 18:15:45.000000000 +0100
+@@ -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;
+Index: buildroot/package/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch 2012-03-08 18:18:33.000000000 +0100
+@@ -0,0 +1,16 @@
++linux/videodev.h include doesn't exist anymore on V4L2 only (=recent kernels).
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++diff -urN -X linux-2.6.38.8/Documentation/dontdiff imx-test-10.11.01/test/mxc_vpu_test/vpu_test.h imx-test-10.11.01.mod/test/mxc_vpu_test/vpu_test.h
++--- imx-test-10.11.01/test/mxc_vpu_test/vpu_test.h 2010-11-02 21:53:40.000000000 +0100
+++++ imx-test-10.11.01.mod/test/mxc_vpu_test/vpu_test.h 2011-10-24 23:26:23.000000000 +0200
++@@ -16,7 +16,7 @@
++ #ifndef _DEC_H
++ #define _DEC_H
++
++-#include <linux/videodev.h>
+++#include <linux/videodev2.h>
++ #include <pthread.h>
++ #include <errno.h>
++ #include <stdint.h>
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2012-03-08 18:19:14.000000000 +0100
++++ buildroot/package/Config.in 2012-03-08 18:22:31.000000000 +0100
+@@ -206,6 +206,7 @@
+ endif
+ source "package/hwdata/Config.in"
+ source "package/i2c-tools/Config.in"
++source "package/imx-test/Config.in"
+ source "package/input-event-daemon/Config.in"
+ source "package/input-tools/Config.in"
+ source "package/iostat/Config.in"
diff --git a/patches/buildroot/2011.05/cleanup_buildroot.sh b/patches/buildroot/2011.05/cleanup_buildroot.sh
index d65d274..9c97a15 100755
--- a/patches/buildroot/2011.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2011.05/cleanup_buildroot.sh
@@ -64,3 +64,4 @@ rm -rf buildroot/package/libcanfestival
rm -rf buildroot/package/python
rm -rf buildroot/package/gsmmux
rm -rf buildroot/package/imx-lib/
+rm -rf buildroot/package/imx-test/
diff --git a/patches/buildroot/2012.02/176-imx-test-add_package.patch b/patches/buildroot/2012.02/176-imx-test-add_package.patch
new file mode 100644
index 0000000..7c61840
--- /dev/null
+++ b/patches/buildroot/2012.02/176-imx-test-add_package.patch
@@ -0,0 +1,148 @@
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/imx-test/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/imx-test/Config.in 2012-03-08 18:04:57.000000000 +0100
+@@ -0,0 +1,5 @@
++config BR2_PACKAGE_IMX_TEST
++ bool "imx-test"
++ select BR2_PACKAGE_IMX_LIB
++ help
++ Freescale specific test utilities for i.MX processors family.
+Index: buildroot/package/imx-test/imx-test.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/imx-test/imx-test.mk 2012-03-08 18:31:29.000000000 +0100
+@@ -0,0 +1,43 @@
++#############################################################
++#
++# imx-test (test tools from Freescale BSP)
++#
++#############################################################
++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
++BUILD_CFLAGS = -DCONFIG_ARCH_MX2
++else
++BUILD_PLATFORM = IMX51
++BUILD_CFLAGS = -DCONFIG_ARCH_MX5
++endif
++
++define IMX_TEST_BUILD_CMDS
++ $(MAKE) CC="$(TARGET_CC)" \
++ VERBOSE="" \
++ LINUXPATH=$(LINUX26_DIR) \
++ CROSS_COMPILE="$(HOST_DIR)/usr/bin/arm-linux-" \
++ PLATFORM=$(BUILD_PLATFORM) \
++ DIRS="mxc_sahara_test mxc_scc2 mxc_spi_test mxc_vpu_test mxc_uart_test mxc_usb_test" \
++ CFLAGS="$(BUILD_CFLAGS) -I$(LINUX26_DIR)/drivers/mxc/security/sahara2/include" \
++ -C $(@D)
++endef
++
++define IMX_TEST_INSTALL_TARGET_CMDS
++ $(MAKE) LINUXPATH=$(LINUX26_DIR) INSTALL_MOD_PATH=$(TARGET_DIR) install -C $(@D)/module_test
++ $(MAKE) DESTDIR=$(TARGET_DIR)/unit_tests PLATFORM=IMX51 install -C $(@D)
++endef
++
++define IMX_TEST_UNINSTALL_TARGET_CMDS
++ rm -rf $(TARGET_DIR)/unit_tests
++endef
++
++define IMX_TEST_CLEAN_CMDS
++ -$(MAKE) -C $(@D) clean
++endef
++
++$(eval $(call GENTARGETS))
+Index: buildroot/package/imx-test/imx-test-01_fixes.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/imx-test/imx-test-01_fixes.patch 2012-03-08 18:15:45.000000000 +0100
+@@ -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;
+Index: buildroot/package/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch 2012-03-08 18:18:33.000000000 +0100
+@@ -0,0 +1,16 @@
++linux/videodev.h include doesn't exist anymore on V4L2 only (=recent kernels).
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++diff -urN -X linux-2.6.38.8/Documentation/dontdiff imx-test-10.11.01/test/mxc_vpu_test/vpu_test.h imx-test-10.11.01.mod/test/mxc_vpu_test/vpu_test.h
++--- imx-test-10.11.01/test/mxc_vpu_test/vpu_test.h 2010-11-02 21:53:40.000000000 +0100
+++++ imx-test-10.11.01.mod/test/mxc_vpu_test/vpu_test.h 2011-10-24 23:26:23.000000000 +0200
++@@ -16,7 +16,7 @@
++ #ifndef _DEC_H
++ #define _DEC_H
++
++-#include <linux/videodev.h>
+++#include <linux/videodev2.h>
++ #include <pthread.h>
++ #include <errno.h>
++ #include <stdint.h>
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2012-03-08 18:19:14.000000000 +0100
++++ buildroot/package/Config.in 2012-03-08 18:22:31.000000000 +0100
+@@ -206,6 +206,7 @@
+ endif
+ source "package/hwdata/Config.in"
+ source "package/i2c-tools/Config.in"
++source "package/imx-test/Config.in"
+ source "package/input-event-daemon/Config.in"
+ source "package/input-tools/Config.in"
+ source "package/iostat/Config.in"
diff --git a/patches/buildroot/2012.02/cleanup_buildroot.sh b/patches/buildroot/2012.02/cleanup_buildroot.sh
index 3f58e0a..86375d2 100755
--- a/patches/buildroot/2012.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2012.02/cleanup_buildroot.sh
@@ -63,3 +63,4 @@ rm -rf buildroot/package/libcanfestival
rm -rf buildroot/package/python
rm -rf buildroot/package/gsmmux
rm -rf buildroot/package/imx-lib/
+rm -rf buildroot/package/imx-test/
hooks/post-receive
--
armadeus
|
