From patchwork Fri Jun 27 05:24:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 364772 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 70C3D1400DE for ; Fri, 27 Jun 2014 15:26:12 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D0FF88B789; Fri, 27 Jun 2014 05:26:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LssA8XWOqe-5; Fri, 27 Jun 2014 05:26:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id C6DC78B7AA; Fri, 27 Jun 2014 05:26:06 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 32B841C2098 for ; Fri, 27 Jun 2014 05:25:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2FDA68B830 for ; Fri, 27 Jun 2014 05:25:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YQao23X+-wZW for ; Fri, 27 Jun 2014 05:25:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ie0-f173.google.com (mail-ie0-f173.google.com [209.85.223.173]) by whitealder.osuosl.org (Postfix) with ESMTPS id 75EB28B7B4 for ; Fri, 27 Jun 2014 05:25:56 +0000 (UTC) Received: by mail-ie0-f173.google.com with SMTP id y20so3959137ier.4 for ; Thu, 26 Jun 2014 22:25:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yRDB+phxJNxSoNOxHx8JaRxFsCblpzEZm42iQa0avVY=; b=0yYXeIX6fgwpvhi7K7HQY4OjuHcnDRgAxsBBLLzUemL8yTN9as8QYP3DFf2oaAYuCN efspCo3vGE7hVB2ZeEXajrC6O3+LyJHm8Wu8213rHwJZr8KrvUWpWTQ1NidOVoXsmMLN ZY2aXe7kCUwGy7Jtlx4JAWmNXvdRzZbVE4DuaaHP/+wtRhH6d7co7Ba4bGlkCB3MRTnZ y2TPF/kLJyTfEf1GsB/24NVozcErk5BaqWQ1Rc0mS2jTpITvX9y8M4aftyvbG1XSis8S 7cRYk8+hCU2dgJgm4swu1praE2SVvH6JeviLQitmkmTLI3q4cxw1a9NqPLPEhaOf0pNV vrlA== X-Received: by 10.50.112.132 with SMTP id iq4mr9713225igb.45.1403846755963; Thu, 26 Jun 2014 22:25:55 -0700 (PDT) Received: from localhost.localdomain (216-50-218-2.dal-10.cvx.algx.net. [216.50.218.2]) by mx.google.com with ESMTPSA id uu8sm10678526igb.13.2014.06.26.22.25.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Jun 2014 22:25:55 -0700 (PDT) From: Gary Bisson To: buildroot@busybox.net Date: Thu, 26 Jun 2014 22:24:47 -0700 Message-Id: <1403846694-21974-5-git-send-email-bisson.gary@gmail.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1403846694-21974-1-git-send-email-bisson.gary@gmail.com> References: <1403150639-29382-1-git-send-email-bisson.gary@gmail.com> <1403846694-21974-1-git-send-email-bisson.gary@gmail.com> Cc: Gary Bisson , yann.morin.1998@free.fr Subject: [Buildroot] [PATCH v2 04/11] freescale-imx: change platform choice to be common X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net that way all the packages can inherit from that information plus the Vivante package will only be available for iMX6Q platforms. Signed-off-by: Gary Bisson --- package/freescale-imx/Config.in | 47 ++++++++++++++++++++++++++++++-- package/freescale-imx/imx-lib/Config.in | 37 ------------------------- package/freescale-imx/imx-lib/imx-lib.mk | 2 +- 3 files changed, 46 insertions(+), 40 deletions(-) diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 7c22f79..0626a74 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -1,8 +1,51 @@ -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" +if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q source "package/freescale-imx/gpu-viv-bin-mx6q/Config.in" +endif -endmenu +endif diff --git a/package/freescale-imx/imx-lib/Config.in b/package/freescale-imx/imx-lib/Config.in index 444060b..3b0f7a9 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 2a94430..0d66759 100644 --- a/package/freescale-imx/imx-lib/imx-lib.mk +++ b/package/freescale-imx/imx-lib/imx-lib.mk @@ -23,7 +23,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