[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-278-g4591911
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-278-g4591911
|
From: Julien B a. A. <ar...@us...> - 2013-06-10 16:18:57
|
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 45919116aa39f6807f6b0b92ad8726da5fdafdea (commit)
from af823cc2c9fee17376035b96a00bab6b37df7406 (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 45919116aa39f6807f6b0b92ad8726da5fdafdea
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 10 18:16:38 2013 +0200
[BUILDROOT] 2013.05: port armadeus modifications to imx-lib
-----------------------------------------------------------------------
Summary of changes:
.../2013.05/174-imx-lib-add_package.patch.TOUPDATE | 105 --------------------
.../174-imx-lib-customize_package.patch} | 104 ++++++--------------
2 files changed, 31 insertions(+), 178 deletions(-)
delete mode 100644 patches/buildroot/2013.05/174-imx-lib-add_package.patch.TOUPDATE
copy patches/buildroot/{2012.02/174-imx-lib-add_package.patch => 2013.05/174-imx-lib-customize_package.patch} (54%)
diff --git a/patches/buildroot/2013.05/174-imx-lib-add_package.patch.TOUPDATE b/patches/buildroot/2013.05/174-imx-lib-add_package.patch.TOUPDATE
deleted file mode 100644
index 3acf660..0000000
--- a/patches/buildroot/2013.05/174-imx-lib-add_package.patch.TOUPDATE
+++ /dev/null
@@ -1,105 +0,0 @@
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/imx-lib/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/Config.in 2012-04-05 12:05:39.000000000 +0200
-@@ -0,0 +1,4 @@
-+config BR2_PACKAGE_IMX_LIB
-+ bool "imx-lib"
-+ help
-+ Freescale specific libraries for i.MX processors family.
-Index: buildroot/package/imx-lib/imx-lib.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/imx-lib.mk 2012-04-05 12:41:02.000000000 +0200
-@@ -0,0 +1,56 @@
-+#############################################################
-+#
-+# imx-lib (helpers librairies from Freescale BSP)
-+#
-+#############################################################
-+IMX_LIB_VERSION = 11.09.01
-+IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).tar.gz
-+IMX_LIB_SITE = ftp://ftp2.armadeus.com/armadeusw/download/
-+IMX_LIB_INSTALL_STAGING = YES
-+
-+ifeq ($(BR2_CPU_NAME),imx27)
-+BUILD_PLATFORM = IMX27
-+else
-+BUILD_PLATFORM = IMX51
-+endif
-+
-+IMX_LIB_SUBDIRS += sahara2
-+IMX_LIB_SUBDIRS += vpu
-+IMX_LIB_SUBDIRS += ipu
-+
-+define IMX_LIB_BUILD_CMDS
-+ $(MAKE) CC="$(TARGET_CC)" \
-+ PLATFORM=$(BUILD_PLATFORM) \
-+ DIRS="$(IMX_LIB_SUBDIRS)" \
-+ CFLAGS="-fPIC -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include -I$(LINUX_DIR)/include" \
-+ INCLUDE="-I$(LINUX_DIR)/include" \
-+ -C $(@D)
-+endef
-+
-+define IMX_LIB_INSTALL_STAGING_CMDS
-+ install -D -m 755 $(@D)/vpu/libvpu.so $(STAGING_DIR)/usr/lib
-+ install -D -m 755 $(@D)/vpu/vpu_io.h $(STAGING_DIR)/usr/include
-+ install -D -m 755 $(@D)/vpu/vpu_lib.h $(STAGING_DIR)/usr/include
-+ install -D -m 755 $(@D)/sahara2/libsahara.so $(STAGING_DIR)/usr/lib
-+ install -D -m 755 $(@D)/ipu/mxc_ipu_hl_lib.h $(STAGING_DIR)/usr/include
-+ install -D -m 755 $(@D)/ipu/ipu.h $(STAGING_DIR)/usr/include
-+ install -D -m 755 $(@D)/ipu/libipu.so $(STAGING_DIR)/usr/lib
-+endef
-+
-+define IMX_LIB_INSTALL_TARGET_CMDS
-+ install -D -m 755 $(@D)/vpu/libvpu.so $(TARGET_DIR)/usr/lib
-+ install -D -m 755 $(@D)/sahara2/libsahara.so $(TARGET_DIR)/usr/lib
-+ install -D -m 755 $(@D)/ipu/libipu.so $(TARGET_DIR)/usr/lib
-+endef
-+
-+define IMX_LIB_UNINSTALL_TARGET_CMDS
-+ rm -f $(TARGET_DIR)/usr/lib/libvpu.so
-+ rm -f $(TARGET_DIR)/usr/lib/libsahara.so
-+ rm -f $(TARGET_DIR)/usr/lib/libipu.so
-+endef
-+
-+define IMX_LIB_CLEAN_CMDS
-+ -$(MAKE) -C $(@D) clean
-+endef
-+
-+$(eval $(generic-package))
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in 2012-04-05 12:05:39.000000000 +0200
-+++ buildroot/package/Config.in 2012-04-05 12:42:07.000000000 +0200
-@@ -349,6 +349,7 @@
-
- menu "Hardware handling"
- source "package/ccid/Config.in"
-+source "package/imx-lib/Config.in"
- source "package/lcdapi/Config.in"
- source "package/libaio/Config.in"
- source "package/libraw1394/Config.in"
-Index: buildroot/package/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch 2012-04-05 12:35:42.000000000 +0200
-@@ -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-lib-11.09.01/ipu/mxc_ipu_hl_lib.c imx-lib-11.09.01.mod/ipu/mxc_ipu_hl_lib.c
-+--- imx-lib-11.09.01/ipu/mxc_ipu_hl_lib.c 2012-04-05 12:24:55.000000000 +0200
-++++ imx-lib-11.09.01.mod/ipu/mxc_ipu_hl_lib.c 2011-09-09 16:10:11.000000000 +0200
-+@@ -41,7 +41,7 @@
-+ #include <sys/mman.h>
-+ #include <sys/types.h>
-+ #include <sys/stat.h>
-+-#include <linux/videodev.h>
-++#include <linux/videodev2.h>
-+ #include "mxc_ipu_hl_lib.h"
-+
-+ #define DBG_DEBUG 3
diff --git a/patches/buildroot/2012.02/174-imx-lib-add_package.patch b/patches/buildroot/2013.05/174-imx-lib-customize_package.patch
similarity index 54%
copy from patches/buildroot/2012.02/174-imx-lib-add_package.patch
copy to patches/buildroot/2013.05/174-imx-lib-customize_package.patch
index 7503636..a0e5edc 100644
--- a/patches/buildroot/2012.02/174-imx-lib-add_package.patch
+++ b/patches/buildroot/2013.05/174-imx-lib-customize_package.patch
@@ -1,93 +1,51 @@
+
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: buildroot/package/imx-lib/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/Config.in 2013-05-27 21:35:12.000000000 +0200
-@@ -0,0 +1,4 @@
-+config BR2_PACKAGE_IMX_LIB
-+ bool "imx-lib"
-+ help
-+ Freescale specific libraries for i.MX processors family.
Index: buildroot/package/imx-lib/imx-lib.mk
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/imx-lib.mk 2013-05-28 15:59:43.000000000 +0200
-@@ -0,0 +1,58 @@
-+#############################################################
-+#
-+# imx-lib (helpers librairies from Freescale BSP)
-+#
-+#############################################################
-+IMX_LIB_VERSION = 11.09.01
-+IMX_LIB_SITE = ftp://ftp2.armadeus.com/armadeusw/download/
-+IMX_LIB_INSTALL_STAGING = YES
-+
+--- buildroot.orig/package/imx-lib/imx-lib.mk 2013-05-25 22:23:57.000000000 +0200
++++ buildroot/package/imx-lib/imx-lib.mk 2013-05-28 18:10:54.218306172 +0200
+@@ -12,6 +12,11 @@
+
+ IMX_LIB_INSTALL_STAGING = YES
+
+IMX_LIB_SUBDIRS = vpu
-+
-+ifeq ($(call qstrip,$(BR2_CPU_NAME)),imx27)
-+# Not tested yet !
-+IMX_LIB_BUILD_PLATFORM = IMX27ADS
-+else
-+IMX_LIB_BUILD_PLATFORM = IMX51
++ifeq ($(call qstrip,$(BR2_PACKAGE_IMX_LIB_PLATFORM)),IMX51)
+IMX_LIB_SUBDIRS += ipu sahara2
+endif
+
-+IMX_LIB_INCLUDE = \
-+ -I$(LINUX_DIR)/drivers/mxc/security/rng/include \
-+ -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include \
-+ -idirafter $(LINUX_DIR)/include
-+
-+IMX_LIB_MAKE_ENV = \
-+ $(TARGET_MAKE_ENV) \
-+ $(TARGET_CONFIGURE_OPTS) \
-+ CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
-+ PLATFORM="$(IMX_LIB_BUILD_PLATFORM)" \
-+ INCLUDE="$(IMX_LIB_INCLUDE)"
-+
-+define IMX_LIB_BUILD_CMDS
-+ $(IMX_LIB_MAKE_ENV) $(MAKE1) \
-+ DIRS="$(IMX_LIB_SUBDIRS)" \
-+ -C $(@D)
-+endef
-+
-+define IMX_LIB_INSTALL_STAGING_CMDS
-+ $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DIRS="$(IMX_LIB_SUBDIRS)" \
-+ DEST_DIR=$(STAGING_DIR) install
-+endef
-+
-+define IMX_LIB_INSTALL_TARGET_CMDS
-+ $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DIRS="$(IMX_LIB_SUBDIRS)" \
-+ DEST_DIR=$(TARGET_DIR) install
+ # imx-lib needs access to imx-specific kernel headers
+ IMX_LIB_DEPENDENCIES += linux
+ IMX_LIB_INCLUDE = \
+@@ -27,15 +32,21 @@
+ INCLUDE="$(IMX_LIB_INCLUDE)"
+
+ define IMX_LIB_BUILD_CMDS
+- $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D)
++ $(IMX_LIB_MAKE_ENV) $(MAKE1) DIRS="$(IMX_LIB_SUBDIRS)" -C $(@D)
+ endef
+
+ define IMX_LIB_INSTALL_STAGING_CMDS
+- $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(STAGING_DIR) install
++ $(IMX_LIB_MAKE_ENV) $(MAKE1) DIRS="$(IMX_LIB_SUBDIRS)" -C $(@D) DEST_DIR=$(STAGING_DIR) install
+ endef
+
+ define IMX_LIB_INSTALL_TARGET_CMDS
+- $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(TARGET_DIR) install
++ $(IMX_LIB_MAKE_ENV) $(MAKE1) DIRS="$(IMX_LIB_SUBDIRS)" -C $(@D) DEST_DIR=$(TARGET_DIR) install
+endef
+
+define IMX_LIB_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/lib/libvpu.so
+ rm -f $(TARGET_DIR)/usr/lib/libsahara.so
+ rm -f $(TARGET_DIR)/usr/lib/libipu.so
-+endef
-+
-+define IMX_LIB_CLEAN_CMDS
-+ -$(MAKE) -C $(@D) clean
-+endef
-+
-+$(eval $(call GENTARGETS))
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in 2013-05-27 21:35:12.000000000 +0200
-+++ buildroot/package/Config.in 2013-05-28 16:03:11.000000000 +0200
-@@ -348,6 +348,7 @@
- endmenu
+ endef
- menu "Hardware handling"
-+source "package/imx-lib/Config.in"
- source "package/libaio/Config.in"
- source "package/libraw1394/Config.in"
- source "package/tslib/Config.in"
+ $(eval $(generic-package))
Index: buildroot/package/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch 2013-05-27 21:35:12.000000000 +0200
++++ buildroot/package/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch 2013-05-28 18:10:54.218306172 +0200
@@ -0,0 +1,16 @@
+linux/videodev.h include doesn't exist anymore on V4L2 only (=recent kernels).
+
@@ -108,7 +66,7 @@ Index: buildroot/package/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch
Index: buildroot/package/imx-lib/imx-lib-fixes_build_on_imx27.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/imx-lib-fixes_build_on_imx27.patch 2013-05-28 16:02:42.000000000 +0200
++++ buildroot/package/imx-lib/imx-lib-fixes_build_on_imx27.patch 2013-05-28 18:10:54.218306172 +0200
@@ -0,0 +1,30 @@
+To build but I'm not sure it will work...
+
hooks/post-receive
--
armadeus
|
