From: Gary Bisson <bisson.gary@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/5] freescale-imx: bump to version 3.10.17-1.0.0
Date: Wed, 18 Jun 2014 21:03:55 -0700 [thread overview]
Message-ID: <1403150639-29382-2-git-send-email-bisson.gary@gmail.com> (raw)
In-Reply-To: <1403150639-29382-1-git-send-email-bisson.gary@gmail.com>
Signed-off-by: Gary Bisson <bisson.gary@gmail.com>
---
package/freescale-imx/Config.in | 1 +
package/freescale-imx/freescale-imx.mk | 2 +-
package/freescale-imx/imx-lib/imx-lib.mk | 26 ++--------
package/freescale-imx/imx-vpu/Config.in | 53 ++++++++++++++++++++
.../imx-vpu-0001-fix-IOSystemInit-failure.patch | 21 ++++++++
package/freescale-imx/imx-vpu/imx-vpu.mk | 57 ++++++++++++++++++++++
6 files changed, 138 insertions(+), 22 deletions(-)
create mode 100644 package/freescale-imx/imx-vpu/Config.in
create mode 100644 package/freescale-imx/imx-vpu/imx-vpu-0001-fix-IOSystemInit-failure.patch
create mode 100644 package/freescale-imx/imx-vpu/imx-vpu.mk
diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
index 7c22f79..0b3af89 100644
--- a/package/freescale-imx/Config.in
+++ b/package/freescale-imx/Config.in
@@ -2,6 +2,7 @@ menu "Freescale i.MX libraries"
depends on BR2_arm
source "package/freescale-imx/imx-lib/Config.in"
+source "package/freescale-imx/imx-vpu/Config.in"
source "package/freescale-imx/firmware-imx/Config.in"
source "package/freescale-imx/gpu-viv-bin-mx6q/Config.in"
diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk
index 39ffa8a..843ba61 100644
--- a/package/freescale-imx/freescale-imx.mk
+++ b/package/freescale-imx/freescale-imx.mk
@@ -4,7 +4,7 @@
#
################################################################################
-FREESCALE_IMX_VERSION = 3.5.7-1.0.0
+FREESCALE_IMX_VERSION = 3.10.17-1.0.0
FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/
include $(sort $(wildcard package/freescale-imx/*/*.mk))
diff --git a/package/freescale-imx/imx-lib/imx-lib.mk b/package/freescale-imx/imx-lib/imx-lib.mk
index 4f605d7..253ed31 100644
--- a/package/freescale-imx/imx-lib/imx-lib.mk
+++ b/package/freescale-imx/imx-lib/imx-lib.mk
@@ -6,18 +6,19 @@
IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION)
IMX_LIB_SITE = $(FREESCALE_IMX_SITE)
-IMX_LIB_LICENSE = Freescale License (vpu), LGPLv2.1+ (the rest)
+IMX_LIB_LICENSE = LGPLv2.1+
IMX_LIB_LICENSE_FILES = EULA
-IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).bin
+IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).tar.gz
IMX_LIB_INSTALL_STAGING = YES
# imx-lib needs access to imx-specific kernel headers
IMX_LIB_DEPENDENCIES += linux
IMX_LIB_INCLUDE = \
+ -I$(LINUX_DIR)/include/uapi \
+ -I$(LINUX_DIR)/include \
-I$(LINUX_DIR)/drivers/mxc/security/rng/include \
- -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include \
- -idirafter $(LINUX_DIR)/include
+ -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include
IMX_LIB_MAKE_ENV = \
$(TARGET_MAKE_ENV) \
@@ -26,23 +27,6 @@ IMX_LIB_MAKE_ENV = \
PLATFORM=$(BR2_PACKAGE_IMX_LIB_PLATFORM) \
INCLUDE="$(IMX_LIB_INCLUDE)"
-# The archive is a shell-self-extractor of a bzipped tar. It happens
-# to extract in the correct directory (imx-lib-x.y.z)
-# The --force makes sure it doesn't fail if the source dir already exists.
-# The --auto-accept skips the license check - not needed for us
-# because we have legal-info
-# Since there's a EULA in the bin file, extract it to imx-lib-x.y.z/EULA
-#
-define IMX_LIB_EXTRACT_CMDS
- awk 'BEGIN { start=0; } \
- /^EOEULA/ { start = 0; } \
- { if (start) print; } \
- /<<EOEULA/ { start=1; }'\
- $(DL_DIR)/$(IMX_LIB_SOURCE) > $(@D)/EULA
- cd $(BUILD_DIR); \
- sh $(DL_DIR)/$(IMX_LIB_SOURCE) --force --auto-accept
-endef
-
define IMX_LIB_BUILD_CMDS
$(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D)
endef
diff --git a/package/freescale-imx/imx-vpu/Config.in b/package/freescale-imx/imx-vpu/Config.in
new file mode 100644
index 0000000..e3e5823
--- /dev/null
+++ b/package/freescale-imx/imx-vpu/Config.in
@@ -0,0 +1,53 @@
+comment "imx-vpu needs an imx-specific Linux kernel to be built"
+ depends on BR2_arm && !BR2_LINUX_KERNEL
+
+config BR2_PACKAGE_IMX_VPU
+ bool "imx-vpu"
+ depends on BR2_LINUX_KERNEL
+ depends on BR2_arm # Only relevant for i.MX
+ help
+ Library of userspace helpers specific for the Freescale i.MX
+ platform. It wraps the kernel interfaces for the i.MX platform
+ Video Processing Unit (VPU) driver. It requires a kernel that
+ includes the i.MX specific headers to be built.
+
+ This library is provided by Freescale as-is and doesn't have
+ an upstream.
+
+if BR2_PACKAGE_IMX_VPU
+choice
+ prompt "i.MX platform"
+
+config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX25_3STACK
+ bool "imx25-3stack"
+
+config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX27ADS
+ bool "imx27ads"
+
+config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX37_3STACK
+ bool "imx37-3stack"
+
+config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX50
+ bool "imx50"
+
+config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX51
+ bool "imx51"
+
+config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX53
+ bool "imx53"
+
+config BR2_PACKAGE_IMX_VPU_PLATFORM_IMX6Q
+ bool "imx6q"
+
+endchoice
+
+config BR2_PACKAGE_IMX_VPU_PLATFORM
+ string
+ default "IMX25_3STACK" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX25_3STACK
+ default "IMX27ADS" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX27ADS
+ default "IMX37_3STACK" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX37_3STACK
+ default "IMX50" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX50
+ default "IMX51" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX51
+ default "IMX53" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX53
+ default "IMX6Q" if BR2_PACKAGE_IMX_VPU_PLATFORM_IMX6Q
+endif
diff --git a/package/freescale-imx/imx-vpu/imx-vpu-0001-fix-IOSystemInit-failure.patch b/package/freescale-imx/imx-vpu/imx-vpu-0001-fix-IOSystemInit-failure.patch
new file mode 100644
index 0000000..b73a959
--- /dev/null
+++ b/package/freescale-imx/imx-vpu/imx-vpu-0001-fix-IOSystemInit-failure.patch
@@ -0,0 +1,21 @@
+[PATCH] fix IOSystemInit failure
+
+Signed-off-by: Gary Bisson <bisson.gary@gmail.com>
+---
+ vpu/vpu_io.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vpu/vpu_io.c b/vpu/vpu_io.c
+index 8cbb571..14759da 100644
+--- a/vpu/vpu_io.c
++++ b/vpu/vpu_io.c
+@@ -265,7 +265,7 @@ int IOSystemInit(void *callback)
+ goto err;
+ }
+
+- if (IOGetVirtMem(&bit_work_addr) <= 0)
++ if (IOGetVirtMem(&bit_work_addr) == -1)
+ goto err;
+ #endif
+ UnlockVpu(vpu_semap);
+
diff --git a/package/freescale-imx/imx-vpu/imx-vpu.mk b/package/freescale-imx/imx-vpu/imx-vpu.mk
new file mode 100644
index 0000000..fb72203
--- /dev/null
+++ b/package/freescale-imx/imx-vpu/imx-vpu.mk
@@ -0,0 +1,57 @@
+################################################################################
+#
+# imx-vpu
+#
+################################################################################
+
+IMX_VPU_VERSION = $(FREESCALE_IMX_VERSION)
+IMX_VPU_SITE = $(FREESCALE_IMX_SITE)
+IMX_VPU_LICENSE = Freescale License
+IMX_VPU_LICENSE_FILES = EULA
+IMX_VPU_SOURCE = imx-vpu-$(IMX_VPU_VERSION).bin
+
+IMX_VPU_INSTALL_STAGING = YES
+
+# imx-vpu needs access to imx-specific kernel headers
+IMX_VPU_DEPENDENCIES += linux
+IMX_VPU_INCLUDE = \
+ -I$(LINUX_DIR)/include/uapi \
+ -I$(LINUX_DIR)/include
+
+IMX_VPU_MAKE_ENV = \
+ $(TARGET_MAKE_ENV) \
+ $(TARGET_CONFIGURE_OPTS) \
+ CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
+ PLATFORM=$(BR2_PACKAGE_IMX_VPU_PLATFORM) \
+ INCLUDE="$(IMX_VPU_INCLUDE)"
+
+# The archive is a shell-self-extractor of a bzipped tar. It happens
+# to extract in the correct directory (imx-vpu-x.y.z)
+# The --force makes sure it doesn't fail if the source dir already exists.
+# The --auto-accept skips the license check - not needed for us
+# because we have legal-info
+# Since there's a EULA in the bin file, extract it to imx-vpu-x.y.z/EULA
+#
+define IMX_VPU_EXTRACT_CMDS
+ awk 'BEGIN { start=0; } \
+ /^EOEULA/ { start = 0; } \
+ { if (start) print; } \
+ /<<EOEULA/ { start=1; }'\
+ $(DL_DIR)/$(IMX_VPU_SOURCE) > $(@D)/EULA
+ cd $(BUILD_DIR); \
+ sh $(DL_DIR)/$(IMX_VPU_SOURCE) --force --auto-accept
+endef
+
+define IMX_VPU_BUILD_CMDS
+ $(IMX_VPU_MAKE_ENV) $(MAKE1) -C $(@D)
+endef
+
+define IMX_VPU_INSTALL_STAGING_CMDS
+ $(IMX_VPU_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(STAGING_DIR) install
+endef
+
+define IMX_VPU_INSTALL_TARGET_CMDS
+ $(IMX_VPU_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(TARGET_DIR) install
+endef
+
+$(eval $(generic-package))
--
2.0.0
next prev parent reply other threads:[~2014-06-19 4:03 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-19 4:03 [Buildroot] [PATCH 0/5] freescale: update userspace packages Gary Bisson
2014-06-19 4:03 ` Gary Bisson [this message]
2014-06-19 16:20 ` [Buildroot] [PATCH 1/5] freescale-imx: bump to version 3.10.17-1.0.0 Yann E. MORIN
2014-06-20 2:40 ` Gary Bisson
2014-06-20 21:01 ` Yann E. MORIN
2014-06-21 3:44 ` Eric Nelson
2014-06-19 4:03 ` [Buildroot] [PATCH 2/5] libfslvpuwrap: bump to version 1.0.46 Gary Bisson
2014-06-19 4:03 ` [Buildroot] [PATCH 3/5] libfslcodec: bump to version 3.0.11 Gary Bisson
2014-06-19 4:03 ` [Buildroot] [PATCH 4/5] libfslparser: " Gary Bisson
2014-06-19 4:03 ` [Buildroot] [PATCH 5/5] gst-fsl-plugins: " Gary Bisson
2014-06-20 21:12 ` Yann E. MORIN
2014-06-27 5:24 ` [Buildroot] [PATCH v2 00/11] freescale: update userspace packages Gary Bisson
2014-06-27 5:24 ` [Buildroot] [PATCH v2 01/11] libfslvpuwrap: change version to be independent Gary Bisson
2014-06-29 19:01 ` Yann E. MORIN
2014-06-27 5:24 ` [Buildroot] [PATCH v2 02/11] freescale-imx: bump to version 3.10.17-1.0.0 Gary Bisson
2014-06-27 5:24 ` [Buildroot] [PATCH v2 03/11] freescale-imx: update imx-lib package Gary Bisson
2014-06-27 5:24 ` [Buildroot] [PATCH v2 04/11] freescale-imx: change platform choice to be common Gary Bisson
2014-06-27 5:24 ` [Buildroot] [PATCH v2 05/11] freescale-imx: add imx-vpu package Gary Bisson
2014-06-27 5:24 ` [Buildroot] [PATCH v2 06/11] libfslvpuwrap: bump to version 1.0.46 Gary Bisson
2014-06-27 5:24 ` [Buildroot] [PATCH v2 07/11] libfslcodec: bump to version 3.0.11 Gary Bisson
2014-06-27 5:24 ` [Buildroot] [PATCH v2 08/11] libfslparser: " Gary Bisson
2014-06-27 5:24 ` [Buildroot] [PATCH v2 09/11] gst-fsl-plugins: " Gary Bisson
2014-06-27 5:24 ` [Buildroot] [PATCH v2 10/11] imx-vpu: fix IOSystemInit failure Gary Bisson
2014-06-27 5:24 ` [Buildroot] [PATCH v2 11/11] imx-vpu: fix IOGetVirtMem return value checks Gary Bisson
2014-06-29 19:04 ` [Buildroot] [PATCH v2 00/11] freescale: update userspace packages Yann E. MORIN
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1403150639-29382-2-git-send-email-bisson.gary@gmail.com \
--to=bisson.gary@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox