[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-275-gd36b701
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-275-gd36b701
|
From: Julien B a. A. <ar...@us...> - 2013-05-28 14:09:11
|
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 d36b701d77711f5d9d1a428b939901ae2fac4225 (commit)
from 06700620ebbe74a3e7782ff52c90e0534aa6ef00 (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 d36b701d77711f5d9d1a428b939901ae2fac4225
Author: Julien Boibessot <jul...@ar...>
Date: Tue May 28 16:07:54 2013 +0200
[BUILDROOT] 2011.02: makes imx-lib compile again (vpu only) on i.MX27
-----------------------------------------------------------------------
Summary of changes:
.../2012.02/174-imx-lib-add_package.patch | 93 ++++++++++++++------
1 files changed, 65 insertions(+), 28 deletions(-)
diff --git a/patches/buildroot/2012.02/174-imx-lib-add_package.patch b/patches/buildroot/2012.02/174-imx-lib-add_package.patch
index 9ea4304..7503636 100644
--- a/patches/buildroot/2012.02/174-imx-lib-add_package.patch
+++ b/patches/buildroot/2012.02/174-imx-lib-add_package.patch
@@ -3,7 +3,7 @@ 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
++++ 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"
@@ -12,51 +12,53 @@ Index: buildroot/package/imx-lib/Config.in
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 @@
++++ 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_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
++IMX_LIB_SUBDIRS = vpu
++
++ifeq ($(call qstrip,$(BR2_CPU_NAME)),imx27)
++# Not tested yet !
++IMX_LIB_BUILD_PLATFORM = IMX27ADS
+else
-+BUILD_PLATFORM = IMX51
++IMX_LIB_BUILD_PLATFORM = IMX51
++IMX_LIB_SUBDIRS += ipu sahara2
+endif
+
-+IMX_LIB_SUBDIRS += sahara2
-+IMX_LIB_SUBDIRS += vpu
-+IMX_LIB_SUBDIRS += ipu
++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
-+ $(MAKE) CC="$(TARGET_CC)" \
-+ PLATFORM=$(BUILD_PLATFORM) \
++ $(IMX_LIB_MAKE_ENV) $(MAKE1) \
+ 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
++ $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DIRS="$(IMX_LIB_SUBDIRS)" \
++ DEST_DIR=$(STAGING_DIR) install
+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
++ $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DIRS="$(IMX_LIB_SUBDIRS)" \
++ DEST_DIR=$(TARGET_DIR) install
+endef
+
+define IMX_LIB_UNINSTALL_TARGET_CMDS
@@ -72,9 +74,9 @@ Index: buildroot/package/imx-lib/imx-lib.mk
+$(eval $(call GENTARGETS))
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 @@
+--- 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
menu "Hardware handling"
@@ -85,7 +87,7 @@ Index: buildroot/package/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
++++ buildroot/package/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch 2013-05-27 21:35:12.000000000 +0200
@@ -0,0 +1,16 @@
+linux/videodev.h include doesn't exist anymore on V4L2 only (=recent kernels).
+
@@ -103,3 +105,38 @@ Index: buildroot/package/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch
+ #include "mxc_ipu_hl_lib.h"
+
+ #define DBG_DEBUG 3
+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
+@@ -0,0 +1,30 @@
++To build but I'm not sure it will work...
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++diff -urN -X linux-3.8.6/Documentation/dontdiff imx-lib-11.09.01/vpu/vpu_reg.h imx-lib-11.09.01.mod2/vpu/vpu_reg.h
++--- imx-lib-11.09.01/vpu/vpu_reg.h 2011-09-09 16:10:11.000000000 +0200
+++++ imx-lib-11.09.01.mod2/vpu/vpu_reg.h 2013-05-28 15:55:45.000000000 +0200
++@@ -369,7 +369,7 @@
++ #if defined(IMX27ADS)
++ #define CODE_BUF_SIZE (64 * 1024)
++ #define FMO_SLICE_SAVE_BUF_SIZE (32)
++- #define WORK_BUF_SIZE (288 * 1024) + (FMO_SLICE_SAVE_BUF_SIZE * 1024 * 8)
+++ #define TEMP_BUF_SIZE (288 * 1024) + (FMO_SLICE_SAVE_BUF_SIZE * 1024 * 8)
++ #define PARA_BUF2_SIZE (1728)
++ #define PARA_BUF_SIZE (10 * 1024)
++ #elif defined(IMX51) || defined(IMX53)
++diff -urN -X linux-3.8.6/Documentation/dontdiff imx-lib-11.09.01/vpu/vpu_util.h imx-lib-11.09.01.mod2/vpu/vpu_util.h
++--- imx-lib-11.09.01/vpu/vpu_util.h 2011-09-09 16:10:11.000000000 +0200
+++++ imx-lib-11.09.01.mod2/vpu/vpu_util.h 2013-05-28 15:56:38.000000000 +0200
++@@ -97,7 +97,9 @@
++ /* dummy */
++ RV_DEC = 0x81,
++ MJPG_DEC = 0x82,
++- MJPG_ENC = 0x83
+++ MJPG_ENC = 0x83,
+++ AVS_DEC = 0x84,
+++ VPX_DEC = 0x85
++ };
++ #endif
++
hooks/post-receive
--
armadeus
|
