From ed655ab29bb0c2869207ffa7f566e651332da910 Mon Sep 17 00:00:00 2001 From: Dylan Laduranty Date: Tue, 7 Sep 2021 09:27:11 +0200 Subject: [PATCH] pkg/mynewt-core: don't pull unwanted dependencies for nRF9160 As nRF9160 doesn't have a bluetooth radio, we should not pull the same dependencies as nRF52, thus ensure these dependencies are only added for nrf5x families --- pkg/mynewt-core/contrib/Makefile | 2 +- pkg/mynewt-core/mynewt-core_os.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/mynewt-core/contrib/Makefile b/pkg/mynewt-core/contrib/Makefile index 0bb65a903f..c16f097dad 100644 --- a/pkg/mynewt-core/contrib/Makefile +++ b/pkg/mynewt-core/contrib/Makefile @@ -3,7 +3,7 @@ MODULE = mynewt-core # exclude submodule sources from *.c wildcard source selection SRC := $(filter-out nrf5x_isr.c cputime.c,$(wildcard *.c)) -ifneq (,$(filter nrf%,$(CPU))) +ifneq (,$(filter nrf5%,$(CPU))) SRC += nrf5x_isr.c else SRC += cputime.c diff --git a/pkg/mynewt-core/mynewt-core_os.mk b/pkg/mynewt-core/mynewt-core_os.mk index 8077bdeabe..6bfbccbb1b 100644 --- a/pkg/mynewt-core/mynewt-core_os.mk +++ b/pkg/mynewt-core/mynewt-core_os.mk @@ -8,7 +8,7 @@ SRC := \ os_cputime_pwr2.c \ # -ifneq (,$(filter nrf%,$(CPU))) +ifneq (,$(filter nrf5%,$(CPU))) SRC += os_cputime.c endif