summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Bisson <bisson.gary@gmail.com>2014-06-30 23:52:03 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-07-15 23:09:34 +0200
commit5398253c8a7be6da6318d731c40987d8d5b97124 (patch)
treec78a7e6a2da6d258423e88b0764c076281f8f4b7
parent78c22062d8b685e6dd38026878b7e7b1be2ae418 (diff)
downloadbuildroot-5398253c8a7be6da6318d731c40987d8d5b97124.tar.gz
buildroot-5398253c8a7be6da6318d731c40987d8d5b97124.zip
freescale-imx: change platform choice to be common
That way all the i.MX packages can inherit from that information, for example, the soon-to-be-introduced imx-vpu package. Signed-off-by: Gary Bisson <bisson.gary@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> [yann.morin.1998@free.fr: the part about gpu-viv-bin-mx6q moved to its own patch; rework the commit log] Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Hadrien Boutteville <hadrien.boutteville@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/freescale-imx/Config.in45
-rw-r--r--package/freescale-imx/imx-lib/Config.in37
-rw-r--r--package/freescale-imx/imx-lib/imx-lib.mk2
3 files changed, 44 insertions, 40 deletions
diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
index 7c22f79cf6..f87efcba68 100644
--- a/package/freescale-imx/Config.in
+++ b/package/freescale-imx/Config.in
@@ -1,8 +1,49 @@
-menu "Freescale i.MX libraries"
+menuconfig BR2_PACKAGE_FREESCALE_IMX
+ bool "Freescale i.MX libraries"
depends on BR2_arm
+ help
+ Those packages provide hardware acceleration for GPU or VPU, hardware
+ optimization or some hardware tools for Freescale i.MX platforms.
+
+if BR2_PACKAGE_FREESCALE_IMX
+choice
+ prompt "i.MX platform"
+
+config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX25_3STACK
+ bool "imx25-3stack"
+
+config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX27ADS
+ bool "imx27ads"
+
+config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX37_3STACK
+ bool "imx37-3stack"
+
+config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX50
+ bool "imx50"
+
+config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51
+ bool "imx51"
+
+config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53
+ bool "imx53"
+
+config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
+ bool "imx6q"
+
+endchoice
+
+config BR2_PACKAGE_FREESCALE_IMX_PLATFORM
+ string
+ default "IMX25_3STACK" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX25_3STACK
+ default "IMX27ADS" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX27ADS
+ default "IMX37_3STACK" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX37_3STACK
+ default "IMX50" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX50
+ default "IMX51" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51
+ default "IMX53" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53
+ default "IMX6Q" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
source "package/freescale-imx/imx-lib/Config.in"
source "package/freescale-imx/firmware-imx/Config.in"
source "package/freescale-imx/gpu-viv-bin-mx6q/Config.in"
-endmenu
+endif
diff --git a/package/freescale-imx/imx-lib/Config.in b/package/freescale-imx/imx-lib/Config.in
index 444060bd4b..3b0f7a921d 100644
--- a/package/freescale-imx/imx-lib/Config.in
+++ b/package/freescale-imx/imx-lib/Config.in
@@ -14,40 +14,3 @@ config BR2_PACKAGE_IMX_LIB
This library is provided by Freescale as-is and doesn't have
an upstream.
-if BR2_PACKAGE_IMX_LIB
-choice
- prompt "i.MX platform"
-
-config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK
- bool "imx25-3stack"
-
-config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS
- bool "imx27ads"
-
-config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK
- bool "imx37-3stack"
-
-config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50
- bool "imx50"
-
-config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51
- bool "imx51"
-
-config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53
- bool "imx53"
-
-config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q
- bool "imx6q"
-
-endchoice
-
-config BR2_PACKAGE_IMX_LIB_PLATFORM
- string
- default "IMX25_3STACK" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK
- default "IMX27ADS" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS
- default "IMX37_3STACK" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK
- default "IMX50" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50
- default "IMX51" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51
- default "IMX53" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53
- default "IMX6Q" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q
-endif
diff --git a/package/freescale-imx/imx-lib/imx-lib.mk b/package/freescale-imx/imx-lib/imx-lib.mk
index ecaee25e0f..f643b151ad 100644
--- a/package/freescale-imx/imx-lib/imx-lib.mk
+++ b/package/freescale-imx/imx-lib/imx-lib.mk
@@ -22,7 +22,7 @@ IMX_LIB_MAKE_ENV = \
$(TARGET_MAKE_ENV) \
$(TARGET_CONFIGURE_OPTS) \
CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
- PLATFORM=$(BR2_PACKAGE_IMX_LIB_PLATFORM) \
+ PLATFORM=$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM) \
INCLUDE="$(IMX_LIB_INCLUDE)"
define IMX_LIB_BUILD_CMDS
OpenPOWER on IntegriCloud