RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

Merge pull request #16819 from fjmolinas/pr_edhoc_blacklist_nimble_revert

Browse Source 
pkg/edhoc-c: remove nimble blacklist
This commit is contained in:
benpicco 2021-09-07 21:29:24 +02:00 committed by GitHub
commit 639811d7c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/edhoc-c/Makefile.dep
View File

@ -11,9 +11,6 @@ endif
ifneq (,$(filter edhoc-c_crypto_tinycrypt,$(USEMODULE))) ifneq (,$(filter edhoc-c_crypto_tinycrypt,$(USEMODULE)))
USEPKG += tinycrypt USEPKG += tinycrypt
# Blacklist platforms using nimble, mynewt-nimble has an in-tree copy
# of tinycrypt that conflicts with the remote one
FEATURES_BLACKLIST += ble_nimble
USEPKG += c25519 USEPKG += c25519
endif endif

2
pkg/tinycrypt/Makefile
View File

@ -5,5 +5,7 @@ PKG_LICENSE=BSD-3-Clause
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk
CFLAGS += -Wno-newline-eof
all: Makefile.tinycrypt all: Makefile.tinycrypt
$(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/lib/source/ -f $(CURDIR)/Makefile.tinycrypt -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) $(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/lib/source/ -f $(CURDIR)/Makefile.tinycrypt -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME)