From patchwork Mon Feb 8 15:19:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1437736 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DZ9P16qgHz9sBy for ; Tue, 9 Feb 2021 02:46:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3C30520430; Mon, 8 Feb 2021 15:46:28 +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 n+3h2Flcn8HF; Mon, 8 Feb 2021 15:46:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E764E20403; Mon, 8 Feb 2021 15:46:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id C42241BF396 for ; Mon, 8 Feb 2021 15:46:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C0EAA85932 for ; Mon, 8 Feb 2021 15:46: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 BCrBa-mhzf50 for ; Mon, 8 Feb 2021 15:46:21 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail (kmf.trabucayre.com [91.121.117.161]) by fraxinus.osuosl.org (Postfix) with ESMTP id 53ECA858C9 for ; Mon, 8 Feb 2021 15:46:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by mail (Postfix) with ESMTP id A862B39856; Mon, 8 Feb 2021 16:19:16 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@buildroot.org Date: Mon, 8 Feb 2021 16:19:14 +0100 Message-Id: <1612797555-14782-1-git-send-email-gwenj@trabucayre.com> X-Mailer: git-send-email 1.6.4.2 Subject: [Buildroot] [RESEND PATCH 1/2] package/uhd: add missing support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gwenhael Goavec-Merou MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Gwenhael Goavec-Merou Complete uhd package with the rest of USRP, octoclock and python support. Signed-off-by: Gwenhael Goavec-Merou --- package/uhd/Config.in | 63 +++++++++++++++++++++++++++++++++++++++ package/uhd/uhd.mk | 68 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 121 insertions(+), 10 deletions(-) diff --git a/package/uhd/Config.in b/package/uhd/Config.in index 6715f1f10b..fae0887509 100644 --- a/package/uhd/Config.in +++ b/package/uhd/Config.in @@ -75,6 +75,43 @@ config BR2_PACKAGE_UHD_MPMD help enable MPMD support +config BR2_PACKAGE_UHD_N230 + bool "N230 support" + help + enable N230 support + +config BR2_PACKAGE_UHD_N300 + bool "N300 support" + select BR2_PACKAGE_UHD_MPMD + help + enable N300 support + +config BR2_PACKAGE_UHD_N320 + bool "N320 support" + select BR2_PACKAGE_UHD_MPMD + help + enable N320 support + +config BR2_PACKAGE_UHD_OCTOCLOCK + bool "OctoClock support" + help + enable OctoClock support + +comment "uhd python API needs python3 and a toolchain w/ glibc or musl" + depends on !BR2_PACKAGE_PYTHON3 + depends on !BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on !(BR2_TOOLCHAIN_USES_GLIBC && BR2_TOOLCHAIN_USES_MUSL) # python-numpy + +config BR2_PACKAGE_UHD_PYTHON + bool "python API support" + depends on BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + select BR2_PACKAGE_PYTHON_NUMPY + select BR2_PACKAGE_PYTHON_REQUESTS + help + enable python API support + config BR2_PACKAGE_UHD_RFNOC bool "RFNoC support" help @@ -90,4 +127,30 @@ config BR2_PACKAGE_UHD_USB comment "USB support needs a toolchain w/ gcc >= 4.9" depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 +config BR2_PACKAGE_UHD_USRP1 + bool "USRP1 support" + select BR2_PACKAGE_UHD_USB + help + enable USRP1 support + +config BR2_PACKAGE_UHD_USRP2 + bool "USRP2 support" + help + enable USRP2 support + +comment "uhd utils depends on python API support" + depends on !BR2_PACKAGE_UHD_PYTHON + +config BR2_PACKAGE_UHD_UTILS + bool "uhd-utils" + depends on BR2_PACKAGE_UHD_PYTHON + select BR2_PACKAGE_PYTHON_SIX + help + uhd-utils + +config BR2_PACKAGE_UHD_X300 + bool "X300 support" + help + enable X300 support + endif diff --git a/package/uhd/uhd.mk b/package/uhd/uhd.mk index 2a40efdd23..a8001dfd74 100644 --- a/package/uhd/uhd.mk +++ b/package/uhd/uhd.mk @@ -25,18 +25,9 @@ UHD_CONF_OPTS = \ -DENABLE_DOXYGEN=OFF \ -DENABLE_DPDK=OFF \ -DENABLE_LIBUHD=ON \ - -DENABLE_N230=OFF \ - -DENABLE_N300=OFF \ - -DENABLE_N320=OFF \ -DENABLE_MANUAL=OFF \ -DENABLE_MAN_PAGES=OFF \ - -DENABLE_OCTOCLOCK=OFF \ - -DENABLE_PYTHON_API=OFF \ - -DENABLE_TESTS=OFF \ - -DENABLE_USRP1=OFF \ - -DENABLE_USRP2=OFF \ - -DENABLE_UTILS=OFF \ - -DENABLE_X300=OFF + -DENABLE_TESTS=OFF # As soon as architecture is ARM, uhd will try to use NEON. # But not all ARM cores have NEON support. @@ -89,12 +80,44 @@ else UHD_CONF_OPTS += -DENABLE_MPMD=OFF endif +ifeq ($(BR2_PACKAGE_UHD_N230),y) +UHD_CONF_OPTS += -DENABLE_N230=ON +else +UHD_CONF_OPTS += -DENABLE_N230=OFF +endif + +ifeq ($(BR2_PACKAGE_UHD_N300),y) +UHD_CONF_OPTS += -DENABLE_N300=ON +else +UHD_CONF_OPTS += -DENABLE_N300=OFF +endif + +ifeq ($(BR2_PACKAGE_UHD_N320),y) +UHD_CONF_OPTS += -DENABLE_N320=ON +else +UHD_CONF_OPTS += -DENABLE_N320=OFF +endif + +ifeq ($(BR2_PACKAGE_UHD_OCTOCLOCK),y) +UHD_CONF_OPTS += -DENABLE_OCTOCLOCK=ON +else +UHD_CONF_OPTS += -DENABLE_OCTOCLOCK=OFF +endif + ifeq ($(BR2_PACKAGE_UHD_RFNOC),y) UHD_CONF_OPTS += -DENABLE_RFNOC=ON else UHD_CONF_OPTS += -DENABLE_RFNOC=OFF endif +ifeq ($(BR2_PACKAGE_UHD_PYTHON),y) +UHD_DEPENDENCIES += host-python-numpy host-python3-requests \ + python-numpy python-requests +UHD_CONF_OPTS += -DENABLE_PYTHON_API=ON +else +UHD_CONF_OPTS += -DENABLE_PYTHON_API=OFF +endif + ifeq ($(BR2_PACKAGE_UHD_USB),y) UHD_DEPENDENCIES += libusb UHD_CONF_OPTS += -DENABLE_USB=ON @@ -102,4 +125,29 @@ else UHD_CONF_OPTS += -DENABLE_USB=OFF endif +ifeq ($(BR2_PACKAGE_UHD_USRP1),y) +UHD_CONF_OPTS += -DENABLE_USRP1=ON +else +UHD_CONF_OPTS += -DENABLE_USRP1=OFF +endif + +ifeq ($(BR2_PACKAGE_UHD_USRP2),y) +UHD_CONF_OPTS += -DENABLE_USRP2=ON +else +UHD_CONF_OPTS += -DENABLE_USRP2=OFF +endif + +ifeq ($(BR2_PACKAGE_UHD_UTILS),y) +UHD_DEPENDENCIES += python-six +UHD_CONF_OPTS += -DENABLE_UTILS=ON +else +UHD_CONF_OPTS += -DENABLE_UTILS=OFF +endif + +ifeq ($(BR2_PACKAGE_UHD_X300),y) +UHD_CONF_OPTS += -DENABLE_X300=ON +else +UHD_CONF_OPTS += -DENABLE_X300=OFF +endif + $(eval $(cmake-package)) From patchwork Mon Feb 8 15:19:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1437735 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DZ9P00wkSz9sBy for ; Tue, 9 Feb 2021 02:46:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1386E86269; Mon, 8 Feb 2021 15:46:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KsCho6bTpk1u; Mon, 8 Feb 2021 15:46:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 74131864E6; Mon, 8 Feb 2021 15:46:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 63B081BF396 for ; Mon, 8 Feb 2021 15:46:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6039D864E6 for ; Mon, 8 Feb 2021 15:46:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 77XZfenybZC8 for ; Mon, 8 Feb 2021 15:46:21 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail (kmf.trabucayre.com [91.121.117.161]) by hemlock.osuosl.org (Postfix) with ESMTP id 58A4086269 for ; Mon, 8 Feb 2021 15:46:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by mail (Postfix) with ESMTP id D493839857; Mon, 8 Feb 2021 16:19:16 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@buildroot.org Date: Mon, 8 Feb 2021 16:19:15 +0100 Message-Id: <1612797555-14782-2-git-send-email-gwenj@trabucayre.com> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1612797555-14782-1-git-send-email-gwenj@trabucayre.com> References: <1612797555-14782-1-git-send-email-gwenj@trabucayre.com> Subject: [Buildroot] [RESEND PATCH 2/2] package/gnuradio: add gr-uhd option X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gwenhael Goavec-Merou MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Gwenhael Goavec-Merou GNURadio has a block to use USRP, through UHD, to receive or transmit RF signals. Signed-off-by: Gwenhael Goavec-Merou --- package/gnuradio/Config.in | 9 +++++++++ package/gnuradio/gnuradio.mk | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index c7b01b454b..738088802e 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -156,4 +156,13 @@ config BR2_PACKAGE_GNURADIO_TRELLIS help Trellis coded modulation blocks +config BR2_PACKAGE_GNURADIO_UHD + bool "gr-uhd support" + select BR2_PACKAGE_UHD + select BR2_PACKAGE_GNURADIO_ANALOG + select BR2_PACKAGE_GNURADIO_BLOCKS + select BR2_PACKAGE_GNURADIO_FILTER + help + UHD support + endif diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 0a818cfc24..1f4458db92 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -149,6 +149,13 @@ else GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=OFF endif +ifeq ($(BR2_PACKAGE_GNURADIO_UHD),y) +GNURADIO_DEPENDENCIES += uhd +GNURADIO_CONF_OPTS += -DENABLE_GR_UHD=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_UHD=OFF +endif + ifeq ($(BR2_PACKAGE_GNURADIO_UTILS),y) GNURADIO_CONF_OPTS += -DENABLE_GR_UTILS=ON else