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>

diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
index 7c22f79cf6e3e20b23fbbb1f37b574618242d08b..f87efcba68aa717db448eb19a3e16b00e98f039a 100644 (file)
--- 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 444060bd4bed5ece251c75ee70063e121e0f3fa8..3b0f7a921dbfe2fa153c6c9c5e9d61befc04b80c 100644 (file)
--- 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 ecaee25e0fb0708730775a8b1f65a476ddafd9ff..f643b151ad42be58f7e033d2d25d28bb6388ddf0 100644 (file)
--- 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