From patchwork Wed Jul 25 15:01:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 949276 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=boundarydevices.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=boundarydevices-com.20150623.gappssmtp.com header.i=@boundarydevices-com.20150623.gappssmtp.com header.b="gOc3iINt"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41bJNw060Rz9s1x for ; Thu, 26 Jul 2018 01:02:23 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8ECB1C9996; Wed, 25 Jul 2018 15:02:22 +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 2F2VzAwKpGoB; Wed, 25 Jul 2018 15:02:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2924DCB4B5; Wed, 25 Jul 2018 15:02:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 980CF1C0057 for ; Wed, 25 Jul 2018 15:02:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9254B31732 for ; Wed, 25 Jul 2018 15:02:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Uh5L3BT-sKKx for ; Wed, 25 Jul 2018 15:02:09 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by silver.osuosl.org (Postfix) with ESMTPS id CCE0B3170C for ; Wed, 25 Jul 2018 15:02:04 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id t6-v6so7721821wrn.7 for ; Wed, 25 Jul 2018 08:02:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GptsQrHL4DuzTpU8I5qClr1F4A4bFGj6b0RkiuXxhnY=; b=gOc3iINt5YwWlZfgwxv4gnvNq3yrJq9VkK3qNxD8F6+374QuHQBewgvX5oFb6ygFCD WkrJxOXIsLrmjD/lKOdF0Wuh7luB30nPemrHCXjotlfXTdbiGhRDKGm3NJvY6PFSDjqw lAuPbmKrADau07YSgSDRHsoGW45Sxl9NAmtRrEKLjINACjQxiepfLLSAT3Qv+X6P5k1E yZHzKPgBTCrYCg51GbUE0J4UToSgfU3uu6/ft6IaNF3PDhq1dma3Oi+GpQUJchv0QKf+ h/KNHL5SDwElyAnOOxriZuov7u2tY0BVgGEk3pSoD2pNhsMi3W3Kvoe/bdMpktuzKY/E aa0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GptsQrHL4DuzTpU8I5qClr1F4A4bFGj6b0RkiuXxhnY=; b=PFi0sKOOh25pdLJg4+ihDNb/tk/agtg9hgSDFOa/RGg/E6B2gj9TSE1tXCS5DJWRLy ndyIloyWmpXI3FfLVs3fN12EjZ5unIgcbVD3ZBVjYqhXrFJxCtWfW0UBEJjYtmXJQ5kt i/cy8mb9I87awzbeAVra1u3ybGxURucn62x9cyYu44IESMIRZWdpboXsSYofMRj5RU22 x0AeCQd684yeCs+rjZ2CsoCmdsdj88OBOQzpTdVzzAmUgsK6l0FKdsIRYw0WpFU7rYrn ZKHxHhTuEDrHJ4A/tTbyB21XySyT53xiut+5WvX4ePzPo6x4F2mq+leC+ALJeYOSmXM1 nQWw== X-Gm-Message-State: AOUpUlF14JbEIGx1BPTQ8NhDxjNGhjc9u2WQe3EezbzKWJELHKGt11uC AbFK1WbA9YhQPc7C+cgGvUC7Z0zZr14= X-Google-Smtp-Source: AAOMgpcmhICTbKYnid8Gjq3osGZghY78+d8V0cP6r4TuPhgEyBl1Ky6ADRUYjYQFLP0gWUCVuwmJCA== X-Received: by 2002:adf:aadb:: with SMTP id i27-v6mr14656934wrc.149.1532530923224; Wed, 25 Jul 2018 08:02:03 -0700 (PDT) Received: from g751.home (2a01cb040a78e30028cbd66b90cf39f4.ipv6.abo.wanadoo.fr. [2a01:cb04:a78:e300:28cb:d66b:90cf:39f4]) by smtp.googlemail.com with ESMTPSA id q188-v6sm7173425wmd.36.2018.07.25.08.02.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Jul 2018 08:02:02 -0700 (PDT) From: Gary Bisson To: buildroot@buildroot.org Date: Wed, 25 Jul 2018 17:01:46 +0200 Message-Id: <20180725150149.30774-6-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180725150149.30774-1-gary.bisson@boundarydevices.com> References: <20180725150149.30774-1-gary.bisson@boundarydevices.com> Subject: [Buildroot] [PATCH 5/8] imx-vpu: new virtual package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thomas.petazzoni@bootlin.com MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since it can be provided by either imx-vpu-cnm or imx-vpu-hantro. Signed-off-by: Gary Bisson --- package/freescale-imx/Config.in | 1 + package/freescale-imx/imx-codec/imx-codec.mk | 2 +- package/freescale-imx/imx-vpu-cnm/Config.in | 8 ++++++++ package/freescale-imx/imx-vpu-hantro/Config.in | 8 ++++++++ package/freescale-imx/imx-vpu/Config.in | 6 ++++++ package/freescale-imx/imx-vpu/imx-vpu.mk | 7 +++++++ package/freescale-imx/imx-vpuwrap/Config.in | 7 +++---- package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk | 2 +- package/gstreamer/gst-fsl-plugins/Config.in | 2 +- package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk | 2 +- package/libimxvpuapi/Config.in | 7 +++---- package/libimxvpuapi/libimxvpuapi.mk | 2 +- 12 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 package/freescale-imx/imx-vpu/Config.in 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 9b47958ff3..bcddf647ef 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -80,6 +80,7 @@ source "package/freescale-imx/imx-lib/Config.in" source "package/freescale-imx/imx-m4fwloader/Config.in" source "package/freescale-imx/imx-parser/Config.in" source "package/freescale-imx/imx-uuc/Config.in" +source "package/freescale-imx/imx-vpu/Config.in" source "package/freescale-imx/imx-vpu-cnm/Config.in" source "package/freescale-imx/imx-vpu-hantro/Config.in" source "package/freescale-imx/imx-vpuwrap/Config.in" diff --git a/package/freescale-imx/imx-codec/imx-codec.mk b/package/freescale-imx/imx-codec/imx-codec.mk index 7b8a5bd4d5..7f738d8129 100644 --- a/package/freescale-imx/imx-codec/imx-codec.mk +++ b/package/freescale-imx/imx-codec/imx-codec.mk @@ -21,7 +21,7 @@ ifeq ($(BR2_ARM_EABIHF),y) IMX_CODEC_CONF_OPTS += --enable-fhw endif -ifeq ($(BR2_PACKAGE_IMX_VPU_CNM),y) +ifeq ($(BR2_PACKAGE_HAS_IMX_VPU),y) IMX_CODEC_CONF_OPTS += --enable-vpu endif diff --git a/package/freescale-imx/imx-vpu-cnm/Config.in b/package/freescale-imx/imx-vpu-cnm/Config.in index 1d8b1cb397..b93c01815c 100644 --- a/package/freescale-imx/imx-vpu-cnm/Config.in +++ b/package/freescale-imx/imx-vpu-cnm/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_IMX_VPU_CNM depends on BR2_arm # Only relevant for i.MX depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU select BR2_PACKAGE_FIRMWARE_IMX + select BR2_PACKAGE_HAS_IMX_VPU help Library of userspace helpers specific for the Freescale i.MX platform integrating a Chips&Media CODA Video Processing Unit @@ -15,3 +16,10 @@ config BR2_PACKAGE_IMX_VPU_CNM This library is provided by Freescale as-is and doesn't have an upstream. + +if BR2_PACKAGE_IMX_VPU_CNM + +config BR2_PACKAGE_PROVIDES_IMX_VPU + default "imx-vpu-cnm" + +endif diff --git a/package/freescale-imx/imx-vpu-hantro/Config.in b/package/freescale-imx/imx-vpu-hantro/Config.in index 5a1255164e..c6208c7ba1 100644 --- a/package/freescale-imx/imx-vpu-hantro/Config.in +++ b/package/freescale-imx/imx-vpu-hantro/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_IMX_VPU_HANTRO bool "imx-vpu-hantro" depends on BR2_aarch64 # Only relevant for i.MX8 depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU + select BR2_PACKAGE_HAS_IMX_VPU help Library of userspace helpers specific for the NXP i.MX CPUs integrating a Hantro Video Processing Unit (VPU). It requires @@ -13,3 +14,10 @@ config BR2_PACKAGE_IMX_VPU_HANTRO This library is provided by Freescale as-is and doesn't have an upstream. + +if BR2_PACKAGE_IMX_VPU_HANTRO + +config BR2_PACKAGE_PROVIDES_IMX_VPU + default "imx-vpu-hantro" + +endif diff --git a/package/freescale-imx/imx-vpu/Config.in b/package/freescale-imx/imx-vpu/Config.in new file mode 100644 index 0000000000..caefe9db8c --- /dev/null +++ b/package/freescale-imx/imx-vpu/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_HAS_IMX_VPU + bool + +config BR2_PACKAGE_PROVIDES_IMX_VPU + depends on BR2_PACKAGE_HAS_IMX_VPU + string 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 0000000000..6e44ad1fce --- /dev/null +++ b/package/freescale-imx/imx-vpu/imx-vpu.mk @@ -0,0 +1,7 @@ +################################################################################ +# +# imx-vpu +# +################################################################################ + +$(eval $(virtual-package)) diff --git a/package/freescale-imx/imx-vpuwrap/Config.in b/package/freescale-imx/imx-vpuwrap/Config.in index 85eb16004d..87303cca9d 100644 --- a/package/freescale-imx/imx-vpuwrap/Config.in +++ b/package/freescale-imx/imx-vpuwrap/Config.in @@ -2,16 +2,15 @@ comment "imx-vpuwrap needs an imx-specific Linux kernel to be built" depends on BR2_arm depends on !BR2_LINUX_KERNEL -comment "imx-vpuwrap needs an i.MX platform with VPU support" +comment "imx-vpuwrap needs an i.MX VPU backend provider" depends on BR2_arm - depends on BR2_LINUX_KERNEL && !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU + depends on BR2_LINUX_KERNEL && !BR2_PACKAGE_HAS_IMX_VPU config BR2_PACKAGE_IMX_VPUWRAP bool "imx-vpuwrap" depends on BR2_LINUX_KERNEL depends on BR2_arm # Only relevant for i.MX - depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU - select BR2_PACKAGE_IMX_VPU_CNM + depends on BR2_PACKAGE_HAS_IMX_VPU help Wrapper library for the vpu library, giving it a different API. diff --git a/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk b/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk index 0b60868e9a..edba87279f 100644 --- a/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk +++ b/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk @@ -7,7 +7,7 @@ IMX_VPUWRAP_VERSION = 1.0.68 IMX_VPUWRAP_SITE = $(FREESCALE_IMX_SITE) IMX_VPUWRAP_SOURCE = imx-vpuwrap-$(IMX_VPUWRAP_VERSION).bin -IMX_VPUWRAP_DEPENDENCIES = imx-vpu-cnm +IMX_VPUWRAP_DEPENDENCIES = imx-vpu IMX_VPUWRAP_INSTALL_STAGING = YES IMX_VPUWRAP_LICENSE = NXP Semiconductor Software License Agreement diff --git a/package/gstreamer/gst-fsl-plugins/Config.in b/package/gstreamer/gst-fsl-plugins/Config.in index a2ff11ec3e..86226c31fb 100644 --- a/package/gstreamer/gst-fsl-plugins/Config.in +++ b/package/gstreamer/gst-fsl-plugins/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_GST_FSL_PLUGINS depends on BR2_arm # Only relevant for i.MX depends on BR2_TOOLCHAIN_USES_GLIBC # imx-codec select BR2_PACKAGE_GST_PLUGINS_BASE - select BR2_PACKAGE_IMX_VPUWRAP if BR2_PACKAGE_FREESCALE_IMX_HAS_VPU + select BR2_PACKAGE_IMX_VPUWRAP if BR2_PACKAGE_HAS_IMX_VPU select BR2_PACKAGE_IMX_LIB select BR2_PACKAGE_IMX_PARSER select BR2_PACKAGE_IMX_CODEC diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk index 547d253e88..45a629ba39 100644 --- a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk +++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk @@ -18,7 +18,7 @@ GST_FSL_PLUGINS_AUTORECONF = YES GST_FSL_PLUGINS_DEPENDENCIES += host-pkgconf gstreamer gst-plugins-base \ imx-lib imx-parser imx-codec -ifeq ($(BR2_PACKAGE_FREESCALE_IMX_HAS_VPU),y) +ifeq ($(BR2_PACKAGE_HAS_IMX_VPU),y) GST_FSL_PLUGINS_DEPENDENCIES += imx-vpuwrap endif diff --git a/package/libimxvpuapi/Config.in b/package/libimxvpuapi/Config.in index 3d25b3b751..479377743d 100644 --- a/package/libimxvpuapi/Config.in +++ b/package/libimxvpuapi/Config.in @@ -1,12 +1,11 @@ -comment "libimxvpuapi needs an i.MX platform with VPU support" +comment "libimxvpuapi needs an i.MX VPU backend provider" depends on BR2_arm - depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU + depends on !BR2_PACKAGE_HAS_IMX_VPU config BR2_PACKAGE_LIBIMXVPUAPI bool "libimxvpuapi" depends on BR2_arm # Only relevant for i.MX - depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU - select BR2_PACKAGE_IMX_VPU_CNM + depends on BR2_PACKAGE_HAS_IMX_VPU help This library provides an API for using the iMX6 VPU video engine. It is an alternative to Freescale's VPU diff --git a/package/libimxvpuapi/libimxvpuapi.mk b/package/libimxvpuapi/libimxvpuapi.mk index 27189ff044..bcabbf3877 100644 --- a/package/libimxvpuapi/libimxvpuapi.mk +++ b/package/libimxvpuapi/libimxvpuapi.mk @@ -8,7 +8,7 @@ LIBIMXVPUAPI_VERSION = 0.10.3 LIBIMXVPUAPI_SITE = $(call github,Freescale,libimxvpuapi,$(LIBIMXVPUAPI_VERSION)) LIBIMXVPUAPI_LICENSE = LGPL-2.1+ LIBIMXVPUAPI_LICENSE_FILES = LICENSE -LIBIMXVPUAPI_DEPENDENCIES = host-pkgconf host-python imx-vpu-cnm +LIBIMXVPUAPI_DEPENDENCIES = host-pkgconf host-python imx-vpu LIBIMXVPUAPI_INSTALL_STAGING = YES $(eval $(waf-package))