From patchwork Mon Aug 24 08:38:38 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: 1350133 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 4BZlvX5QWSz9sTF for ; Mon, 24 Aug 2020 18:40:54 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0B74187E41; Mon, 24 Aug 2020 08:40:51 +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 eg+N2Kd4yeZV; Mon, 24 Aug 2020 08:40:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 93FDD87D54; Mon, 24 Aug 2020 08:40:47 +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 930CE1BF3BF for ; Mon, 24 Aug 2020 08:40:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 843892048F for ; Mon, 24 Aug 2020 08:40:46 +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 X8P14Lxl-JVf for ; Mon, 24 Aug 2020 08:40:45 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp2-g21.free.fr (smtp2-g21.free.fr [212.27.42.2]) by silver.osuosl.org (Postfix) with ESMTPS id 96BEE20474 for ; Mon, 24 Aug 2020 08:40:44 +0000 (UTC) Received: from x230.trabucayre.com (unknown [IPv6:2a01:e34:efc8:1080:3e97:eff:fe89:644f]) by smtp2-g21.free.fr (Postfix) with ESMTP id 648EA2003DA; Mon, 24 Aug 2020 10:40:40 +0200 (CEST) From: Gwenhael Goavec-Merou To: buildroot@buildroot.org Date: Mon, 24 Aug 2020 10:38:38 +0200 Message-Id: <20200824083838.12073-1-gwenj@trabucayre.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH/next] package/openfpgaloader: bump to current master 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 , Jean Burgat Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Gwenhael Goavec-Merou - argp is no more used; - UDEV dependency is now optional Fix: - http://autobuild.buildroot.org/results/f3f3cc216ae42bb8a8925b0df7c1a3cc79b027d7 /home/buildroot/autobuild/instance-1/output-1/build/openfpgaloader-849e5751e06d4d00f323205d5f02ee01f9f59a61/src/spiFlash.cpp: In member function 'void SPIFlash::jtag_write_read(uint8_t, uint8_t*, uint8_t*, uint16_t)': /home/buildroot/autobuild/instance-1/output-1/build/openfpgaloader-849e5751e06d4d00f323205d5f02ee01f9f59a61/src/spiFlash.cpp:92:43: error: variable-sized object 'jtx' may not be initialized uint8_t jtx[xfer_len] = {reverseByte(cmd)}; ^ and src/gowin.cpp:73:11: error: 'runtime_error' is not a member of 'std' throw std::runtime_error("both write-flash and write-sram can't be set"); ^ src/gowin.cpp:81:10: error: 'runtime_error' is not a member of 'std' throw std::runtime_error("incompatible file format"); Signed-off-by: Gwenhael Goavec-Merou --- package/openfpgaloader/Config.in | 13 ++++++++++--- package/openfpgaloader/openfpgaloader.hash | 2 +- package/openfpgaloader/openfpgaloader.mk | 12 +++++++----- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/package/openfpgaloader/Config.in b/package/openfpgaloader/Config.in index 9835b84b64..421778105e 100644 --- a/package/openfpgaloader/Config.in +++ b/package/openfpgaloader/Config.in @@ -1,11 +1,8 @@ config BR2_PACKAGE_OPENFPGALOADER bool "openfpgaloader" depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi1 - depends on BR2_PACKAGE_HAS_UDEV depends on BR2_INSTALL_LIBSTDCPP # libftdipp1 depends on BR2_USE_WCHAR # libftdipp1 - select BR2_PACKAGE_ARGP_STANDALONE \ - if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL # argp select BR2_PACKAGE_LIBFTDI1 select BR2_PACKAGE_LIBFTDI1_LIBFTDIPP1 help @@ -13,6 +10,16 @@ config BR2_PACKAGE_OPENFPGALOADER https://github.com/trabucayre/openFPGALoader/ +if BR2_PACKAGE_OPENFPGALOADER + +config BR2_PACKAGE_OPENFPGALODER_UDEV + bool "udev support" + depends on BR2_PACKAGE_HAS_UDEV + help + use udev to search JTAG adapter from /dev/xx + +endif + comment "openfpgaloader needs udev, a toolchain w/ threads, wchar, C++" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_HAS_UDEV diff --git a/package/openfpgaloader/openfpgaloader.hash b/package/openfpgaloader/openfpgaloader.hash index a084e938b0..990149cded 100644 --- a/package/openfpgaloader/openfpgaloader.hash +++ b/package/openfpgaloader/openfpgaloader.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fcff4999164ee2d3734f16b7f1d2063b3a68e237921e8d63c2afe75e16cdc7ce openfpgaloader-849e5751e06d4d00f323205d5f02ee01f9f59a61.tar.gz +sha256 ef3ed60297ab560f15cd4362d61b7da86c44b84e18937e0411023f8d1cf6a606 openfpgaloader-381c67de00a3102cf6e9bb20ca84030a71c7a0f2.tar.gz sha256 8486a10c4393cee1c25392769ddd3b2d6c242d6ec7928e1414efff7dfb2f07ef LICENSE diff --git a/package/openfpgaloader/openfpgaloader.mk b/package/openfpgaloader/openfpgaloader.mk index f806fd68f9..0d60f9405e 100644 --- a/package/openfpgaloader/openfpgaloader.mk +++ b/package/openfpgaloader/openfpgaloader.mk @@ -4,15 +4,17 @@ # ################################################################################ -OPENFPGALOADER_VERSION = 849e5751e06d4d00f323205d5f02ee01f9f59a61 +OPENFPGALOADER_VERSION = 381c67de00a3102cf6e9bb20ca84030a71c7a0f2 OPENFPGALOADER_SITE = $(call github,trabucayre,openFPGALoader,$(OPENFPGALOADER_VERSION)) OPENFPGALOADER_LICENSE = AGPL-3.0 OPENFPGALOADER_LICENSE_FILES = LICENSE -OPENFPGALOADER_DEPENDENCIES = libftdi1 udev +OPENFPGALOADER_DEPENDENCIES = libftdi1 -ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) -OPENFPGALOADER_DEPENDENCIES += argp-standalone -OPENFPGALOADER_CONF_OPTS += -DCMAKE_CXX_STANDARD_LIBRARIES="-largp" +ifeq ($(BR2_PACKAGE_OPENFPGALOADER_UDEV),y) +OPENFPGALOADER_DEPENDENCIES += udev +OPENFPGALOADER_CONF_OPTS += -DENABLE_UDEV=ON +else +OPENFPGALOADER_CONF_OPTS += -DENABLE_UDEV=OFF endif $(eval $(cmake-package))