From 60621916c258fc8edf1e8695ffec50b2a787c60e Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Thu, 9 Dec 2021 15:14:10 +0100 Subject: [PATCH] package/openfpgaloader: add cmsis-dap support option 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 [Arnout: also propagate hidapi's NPTL dependency] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/openfpgaloader/Config.in | 16 ++++++++++++++++ package/openfpgaloader/openfpgaloader.mk | 7 +++++++ 2 files changed, 23 insertions(+) diff --git a/package/openfpgaloader/Config.in b/package/openfpgaloader/Config.in index c998369bed..054278c256 100644 --- a/package/openfpgaloader/Config.in +++ b/package/openfpgaloader/Config.in @@ -10,6 +10,22 @@ 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_HAS_UDEV # hidapi + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # hidapi + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # hidapi -> libusb + select BR2_PACKAGE_HIDAPI + help + openfpgaloader CMSIS-DAP support + +comment "openfpgaloader CMSIS-DAP needs udev /dev management and a toolchain w/ NPTL threads" + depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS_NPTL + +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))