| Message ID | 20211209141410.694868-1-gwenj@trabucayre.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] package/openfpgaloader: add cmsis-dap support option | expand |
On 09/12/2021 15:14, Gwenhael Goavec-Merou 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. > > Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > --- > Changes v1 -> v2: > - use select BR2_PACKAGE_HIDAPI and add depends on BR2_PACKAGE_HAS_UDEV (Thomas) > --- > package/openfpgaloader/Config.in | 14 ++++++++++++++ > package/openfpgaloader/openfpgaloader.mk | 7 +++++++ > 2 files changed, 21 insertions(+) > > diff --git a/package/openfpgaloader/Config.in b/package/openfpgaloader/Config.in > index c998369bed..792ba918aa 100644 > --- a/package/openfpgaloader/Config.in > +++ b/package/openfpgaloader/Config.in > @@ -10,6 +10,20 @@ 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 This should have a comment fo the provenance (i.e.: # hidapi) Also, hidapi depends on NPTL threads, not simply threads, so that should be propagated as well. And we anyway usually propagate *all* dependencies for suboptions, even the ones that are already covered by the outer config symbol. So I fixed that and applied to master, thanks. Regards, Arnout > + select BR2_PACKAGE_HIDAPI > + help > + openfpgaloader CMSIS-DAP support > + > +comment "openfpgaloader CMSIS-DAP needs udev /dev management" > + depends on !BR2_PACKAGE_HAS_UDEV > + > +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)) >
diff --git a/package/openfpgaloader/Config.in b/package/openfpgaloader/Config.in index c998369bed..792ba918aa 100644 --- a/package/openfpgaloader/Config.in +++ b/package/openfpgaloader/Config.in @@ -10,6 +10,20 @@ 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 + select BR2_PACKAGE_HIDAPI + help + openfpgaloader CMSIS-DAP support + +comment "openfpgaloader CMSIS-DAP needs udev /dev management" + depends on !BR2_PACKAGE_HAS_UDEV + +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))