From patchwork Mon Nov 2 13:54:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1392269 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=trabucayre.com 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 4CPvZ51D6Mz9sVk for ; Tue, 3 Nov 2020 00:55:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 54ABB8737E; Mon, 2 Nov 2020 13:55: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 l3EwMDDhneC8; Mon, 2 Nov 2020 13:55:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A1E7E87309; Mon, 2 Nov 2020 13:55:19 +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 2AA471BF325 for ; Mon, 2 Nov 2020 13:55:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 24A6E203CE for ; Mon, 2 Nov 2020 13:55:18 +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 GFKEJK3LyzMR for ; Mon, 2 Nov 2020 13:55:16 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp6-g21.free.fr (smtp6-g21.free.fr [212.27.42.6]) by silver.osuosl.org (Postfix) with ESMTPS id 207AB2035C for ; Mon, 2 Nov 2020 13:55:16 +0000 (UTC) Received: from localhost.localdomain (unknown [78.252.129.8]) by smtp6-g21.free.fr (Postfix) with ESMTP id D95117803B0; Mon, 2 Nov 2020 14:55:12 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@buildroot.org Date: Mon, 2 Nov 2020 14:54:49 +0100 Message-Id: <20201102135451.1753136-1-gwenj@trabucayre.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [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 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 32cb4cf89d..2b30ab5161 100644 --- a/package/uhd/Config.in +++ b/package/uhd/Config.in @@ -65,6 +65,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 @@ -76,4 +113,30 @@ config BR2_PACKAGE_UHD_USB help enable UHD USB support +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 adb7579019..ad96b427cc 100644 --- a/package/uhd/uhd.mk +++ b/package/uhd/uhd.mk @@ -25,18 +25,9 @@ UHD_CONF_OPTS = \ -DENABLE_DOXYGEN=OFF \ -DENABLE_DPKD=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 Nov 2 13:54:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1392270 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=trabucayre.com Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CPvZ443ZJz9sVX for ; Tue, 3 Nov 2020 00:55:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 00D378701E; Mon, 2 Nov 2020 13:55: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 Qbr2DVnukcke; Mon, 2 Nov 2020 13:55:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id BF0C686FF6; Mon, 2 Nov 2020 13:55:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 99A701BF325 for ; Mon, 2 Nov 2020 13:55:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9683886A0C for ; Mon, 2 Nov 2020 13:55:18 +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 dl7KuoXw6TxD for ; Mon, 2 Nov 2020 13:55:16 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp6-g21.free.fr (smtp6-g21.free.fr [212.27.42.6]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0EBC086A90 for ; Mon, 2 Nov 2020 13:55:16 +0000 (UTC) Received: from localhost.localdomain (unknown [78.252.129.8]) by smtp6-g21.free.fr (Postfix) with ESMTP id 3C7197803A5; Mon, 2 Nov 2020 14:55:13 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@buildroot.org Date: Mon, 2 Nov 2020 14:54:50 +0100 Message-Id: <20201102135451.1753136-2-gwenj@trabucayre.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201102135451.1753136-1-gwenj@trabucayre.com> References: <20201102135451.1753136-1-gwenj@trabucayre.com> MIME-Version: 1.0 Subject: [Buildroot] [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 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 cd31ce8864..48012c7056 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -154,4 +154,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