deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

freescale-imx: add BR2_PACKAGE_FREESCALE_IMX_HAS_VPU config

Browse source 
Since the imx-vpu package build is skipped if the platform doesn't
have a VPU, libraries dependent on the package such as libimxvpuapi
can fail although the imx-vpu package build went "fine".

This patch therefore adds a BR2_PACKAGE_FREESCALE_IMX_HAS_VPU config
which is used in every package selecting imx-vpu directly or indrectly.

It fixes the following build errors:
http://autobuild.buildroot.net/results/892/8924b17f3aa5eba1a8016d84d4478ecb0a96b236/
http://autobuild.buildroot.net/results/86f/86fef2a30065d5bc0d7755706e9ca3332426834d/
http://autobuild.buildroot.net/results/b47/b47eb03e93e2f1af85caebb707f7b4667f7e3d74/
http://autobuild.buildroot.net/results/4c9/4c9b22b33533132fd9f88917cc341ae2c2e171a8/
http://autobuild.buildroot.net/results/a8b/a8b33bfd099d9b9cd383cc568ea70846eb13c34d/

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Gary Bisson 2016-03-09 16:05:09 +01:00 committed by Thomas Petazzoni
parent e1c9a23490
commit 3b0b67afe1
6 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
package/freescale-imx/Config.in
View file

@ -42,6 +42,13 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM
default "IMX53" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53
default "IMX6Q" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
bool
default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX27ADS || \
BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 || \
BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53 || \
BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
source "package/freescale-imx/imx-kobs/Config.in"
source "package/freescale-imx/imx-lib/Config.in"
source "package/freescale-imx/imx-vpu/Config.in"

5
package/freescale-imx/imx-vpu/Config.in
View file

@ -1,6 +1,11 @@
comment "imx-vpu needs an i.MX platform with VPU support"
depends on BR2_arm
depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
config BR2_PACKAGE_IMX_VPU
bool "imx-vpu"
depends on BR2_arm # Only relevant for i.MX
depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
select BR2_PACKAGE_FIRMWARE_IMX
help
Library of userspace helpers specific for the Freescale i.MX

3
package/gstreamer/gst-fsl-plugins/Config.in
View file

@ -11,9 +11,8 @@ config BR2_PACKAGE_GST_FSL_PLUGINS
depends on BR2_arm # Only relevant for i.MX
depends on BR2_TOOLCHAIN_USES_GLIBC # libfslcodec
select BR2_PACKAGE_GST_PLUGINS_BASE
select BR2_PACKAGE_LIBFSLVPUWRAP
select BR2_PACKAGE_LIBFSLVPUWRAP if BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
select BR2_PACKAGE_IMX_LIB
select BR2_PACKAGE_IMX_VPU
select BR2_PACKAGE_LIBFSLPARSER
select BR2_PACKAGE_LIBFSLCODEC
select BR2_PACKAGE_FREESCALE_IMX

6
package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
View file

@ -16,7 +16,11 @@ GST_FSL_PLUGINS_INSTALL_STAGING = YES
GST_FSL_PLUGINS_AUTORECONF = YES
GST_FSL_PLUGINS_DEPENDENCIES += host-pkgconf gstreamer gst-plugins-base \
libfslvpuwrap imx-lib imx-vpu libfslparser libfslcodec
imx-lib libfslparser libfslcodec
ifeq ($(BR2_PACKAGE_FREESCALE_IMX_HAS_VPU),y)
GST_FSL_PLUGINS_DEPENDENCIES += libfslvpuwrap
endif
GST_FSL_PLUGINS_CONF_ENV = \
PLATFORM=$(BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM) \

6
package/libfslvpuwrap/Config.in
View file

@ -2,11 +2,15 @@ comment "libfslvpuwrap needs an imx-specific Linux kernel to be built"
depends on BR2_arm
depends on !BR2_LINUX_KERNEL
comment "libfslvpuwrap needs an i.MX platform with VPU support"
depends on BR2_arm
depends on BR2_LINUX_KERNEL && !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
config BR2_PACKAGE_LIBFSLVPUWRAP
bool "libfslvpuwrap"
depends on BR2_LINUX_KERNEL
depends on BR2_arm # Only relevant for i.MX
select BR2_PACKAGE_FREESCALE_IMX
depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
select BR2_PACKAGE_IMX_VPU
help
Wrapper library for the vpu library, giving it a different API.

6
package/libimxvpuapi/Config.in
View file

@ -1,7 +1,11 @@
comment "libimxvpuapi needs an i.MX platform with VPU support"
depends on BR2_arm
depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
config BR2_PACKAGE_LIBIMXVPUAPI
bool "libimxvpuapi"
depends on BR2_arm # Only relevant for i.MX
select BR2_PACKAGE_FREESCALE_IMX
depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
select BR2_PACKAGE_IMX_VPU
help
This library provides an API for using the iMX6 VPU video