pkg: don't align nrf53 features on nrf51/nrf52

Signed-off-by: Dylan Laduranty <[email protected]>
RIOT-OS · Jul 13, 2023 · 883d138 · 883d138
1 parent b050ad3
commit 883d138
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/pkg/mynewt-core/Makefile.include b/pkg/mynewt-core/Makefile.include
@@ -8,7 +8,7 @@ INCLUDES += -I$(RIOTPKG)/mynewt-core/include \
 DIRS += $(RIOTPKG)/mynewt-core/contrib \
         #
 
-ifneq (,$(filter nrf5%,$(CPU)))
+ifneq (,$(filter nrf51 nrf52,$(CPU)))
   # OS_CPUTIME is set to 32.767 Hz
   CFLAGS += -DMYNEWT_VAL_OS_CPUTIME_FREQ=32768
 else

diff --git 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 nrf5%,$(CPU)))
+ifneq (,$(filter nrf51 nrf52,$(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
@@ -8,7 +8,7 @@ SRC := \
   os_cputime_pwr2.c \
   #
 
-ifneq (,$(filter nrf5%,$(CPU)))
+ifneq (,$(filter nrf51 nrf52,$(CPU)))
   SRC += os_cputime.c
 endif
 

diff --git a/pkg/nimble/Makefile.dep b/pkg/nimble/Makefile.dep
@@ -53,7 +53,7 @@ endif
 
 # nimble controller dependencies
 ifneq (,$(filter nimble_controller,$(USEMODULE)))
-  ifneq (,$(filter nrf5%,$(CPU_FAM)))
+  ifneq (,$(filter nrf51 nrf52,$(CPU_FAM)))
     USEMODULE += nimble_drivers_nrf5x
   endif
 endif

diff --git a/pkg/uwb-core/Makefile.dep b/pkg/uwb-core/Makefile.dep
@@ -19,7 +19,8 @@ endif
 ifneq (,$(filter uwb-core_dpl,$(USEMODULE)))
   USEPKG += mynewt-core
   USEMODULE += mynewt-core_os
-  ifneq (,$(filter nrf5%,$(CPU)))
+  # don't pull nrf53 into the list
+  ifneq (,$(filter nrf51 nrf52,$(CPU)))
     USEMODULE += mynewt-core_nrf5x_hal
   endif
 endif