diff mbox series

[2/2] package/openfpgaloader: add cmsis-dap support option

Message ID 20211204055944.19323-2-gwenj@trabucayre.com
State Changes Requested
Headers show
Series [1/2] package/openfpgaloader: bump to version 0.6.1 | expand

Commit Message

Gwenhael Goavec-Merou Dec. 4, 2021, 5:59 a.m. UTC 
From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>

CMSIS-DAP support depends on hidapi, but this package has depends on
udev so instead of adding this option by default, this let user decide.

Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
---
 package/openfpgaloader/Config.in         | 13 +++++++++++++
 package/openfpgaloader/openfpgaloader.mk |  7 +++++++
 2 files changed, 20 insertions(+)

Comments

Thomas Petazzoni Dec. 4, 2021, 8:07 p.m. UTC | #1 
On Sat,  4 Dec 2021 06:59:44 +0100
Gwenhael Goavec-Merou <gwenj@trabucayre.com> wrote:

> From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
> 
> CMSIS-DAP support depends on hidapi, but this package has depends on
> udev so instead of adding this option by default, this let user decide.

I think that despite this we really want a "select BR2_PACKAGE_HIDAPI",
as this is what we normally do for such dependencies. Of course, it
needs propagating the "depends on" of hidapi to this new openfpgaloader
option.

Thanks!

Thomas
diff mbox series

Patch

diff --git a/package/openfpgaloader/Config.in b/package/openfpgaloader/Config.in
index c998369bed..c3712a8ea0 100644
--- a/package/openfpgaloader/Config.in
+++ b/package/openfpgaloader/Config.in
@@ -10,6 +10,19 @@  config BR2_PACKAGE_OPENFPGALOADER
 
 	  https://github.com/trabucayre/openFPGALoader/
 
+if BR2_PACKAGE_OPENFPGALOADER
+
+config BR2_PACAKGE_OPENFPGALOADER_CMSIS
+	bool "CMSIS-DAP support"
+	depends on BR2_PACKAGE_HIDAPI
+	help
+	  openfpgaloader CMSIS-DAP support
+
+comment "openfpgaloader CMSIS-DAP needs hidapi"
+	depends on !BR2_PACKAGE_HIDAPI
+
+endif
+
 comment "openfpgaloader needs a toolchain w/ threads, C++, gcc >= 4.9"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_INSTALL_LIBSTDCPP || \
diff --git a/package/openfpgaloader/openfpgaloader.mk b/package/openfpgaloader/openfpgaloader.mk
index 73117cb994..0c39aad687 100644
--- a/package/openfpgaloader/openfpgaloader.mk
+++ b/package/openfpgaloader/openfpgaloader.mk
@@ -17,4 +17,11 @@  else
 OPENFPGALOADER_CONF_OPTS += -DENABLE_UDEV=OFF
 endif
 
+ifeq ($(BR2_PACAKGE_OPENFPGALOADER_CMSIS),y)
+OPENFPGALOADER_DEPENDENCIES += hidapi
+OPENFPGALOADER_CONF_OPTS += -DENABLE_CMSISDAP=ON
+else
+OPENFPGALOADER_CONF_OPTS += -DENABLE_CMSISDAP=OFF
+endif
+
 $(eval $(cmake-package))