From 5d627c5554f5ef1581e89310e2f123cce8030eab Mon Sep 17 00:00:00 2001 From: Francisco Molina Date: Tue, 8 Jun 2021 14:25:07 +0200 Subject: [PATCH] pkg/nimble: use tinycrypt pkg --- pkg/nimble/Makefile | 3 --- pkg/nimble/Makefile.dep | 2 +- pkg/nimble/Makefile.include | 5 ----- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pkg/nimble/Makefile b/pkg/nimble/Makefile index 28e4797fbc..82c066d937 100644 --- a/pkg/nimble/Makefile +++ b/pkg/nimble/Makefile @@ -50,9 +50,6 @@ nimble_host_util: nimble_host_store_ram: $(QQ)"$(MAKE)" -C $(PDIR)/nimble/host/store/ram/src/ -f $(RIOTBASE)/Makefile.base MODULE=$@ -nimble_tinycrypt: - $(QQ)"$(MAKE)" -C $(PDIR)/ext/tinycrypt/src/ -f $(RIOTBASE)/Makefile.base MODULE=$@ - # service implementations nimble_svc_gap: $(QQ)"$(MAKE)" -C $(PDIR)/nimble/host/services/gap/src/ -f $(RIOTBASE)/Makefile.base MODULE=$@ diff --git a/pkg/nimble/Makefile.dep b/pkg/nimble/Makefile.dep index 110476872a..73cfa3dd6b 100644 --- a/pkg/nimble/Makefile.dep +++ b/pkg/nimble/Makefile.dep @@ -26,8 +26,8 @@ endif # include host dependencies ifneq (,$(filter nimble_host,$(USEMODULE))) USEMODULE += nimble_host_util - USEMODULE += nimble_tinycrypt USEMODULE += nimble_host_store_ram + USEPKG += tinycrypt endif # nimble controller dependencies diff --git a/pkg/nimble/Makefile.include b/pkg/nimble/Makefile.include index fa3191052d..19a226ae77 100644 --- a/pkg/nimble/Makefile.include +++ b/pkg/nimble/Makefile.include @@ -33,11 +33,6 @@ ifneq (,$(filter nimble_host_util,$(USEMODULE))) INCLUDES += $(NIMIBASE)/nimble/host/util/include endif -# include tinycrypt headers -ifneq (,$(filter nimble_controller,$(USEMODULE))) - INCLUDES += $(NIMIBASE)/ext/tinycrypt/include -endif - # include transport headers ifneq (,$(filter nimble_transport_ram,$(USEMODULE))) INCLUDES += $(NIMIBASE)/nimble/transport/ram/include