diff --git a/pkg/nimble/Makefile b/pkg/nimble/Makefile index 88ff0480a5..9003bff94f 100644 --- a/pkg/nimble/Makefile +++ b/pkg/nimble/Makefile @@ -64,8 +64,8 @@ nimble_transport_ram: nimble_controller: "$(MAKE)" -C $(PDIR)/nimble/controller/src/ -f $(TDIR)/controller.mk -nimble_drivers_nrf52: - "$(MAKE)" -C $(PDIR)/nimble/drivers/nrf52/src/ -f $(TDIR)/drivers.nrf52.mk +nimble_drivers_nrf5x: + "$(MAKE)" -C $(PDIR)/nimble/drivers/$(CPU_FAM)/src/ -f $(TDIR)/drivers.nrf5x.mk # additional, RIOT specific nimble modules nimble_addr: diff --git a/pkg/nimble/Makefile.dep b/pkg/nimble/Makefile.dep index f584adf1a1..c917a37926 100644 --- a/pkg/nimble/Makefile.dep +++ b/pkg/nimble/Makefile.dep @@ -29,8 +29,8 @@ endif # nimble controller dependencies ifneq (,$(filter nimble_controller,$(USEMODULE))) USEMODULE += nimble_transport_ram - ifeq (nrf52,$(CPU_FAM)) - USEMODULE += nimble_drivers_nrf52 + ifneq (,$(filter nrf5%,$(CPU_FAM))) + USEMODULE += nimble_drivers_nrf5x endif endif diff --git a/pkg/nimble/Makefile.include b/pkg/nimble/Makefile.include index df4a181fbe..ade682ca6b 100644 --- a/pkg/nimble/Makefile.include +++ b/pkg/nimble/Makefile.include @@ -17,8 +17,8 @@ ifneq (,$(filter nimble_controller,$(USEMODULE))) CFLAGS += -DNIMBLE_CFG_CONTROLLER=1 CFLAGS += -DMYNEWT_VAL_OS_CPUTIME_FREQ=32768 - ifneq (,$(filter nimble_drivers_nrf52,$(USEMODULE))) - INCLUDES += $(NIMIBASE)/nimble/drivers/nrf52/include + ifneq (,$(filter nimble_drivers_nrf5x,$(USEMODULE))) + INCLUDES += $(NIMIBASE)/nimble/drivers/$(CPU_FAM)/include endif endif diff --git a/pkg/nimble/contrib/nimble_riot.c b/pkg/nimble/contrib/nimble_riot.c index 8179183414..31126059b3 100644 --- a/pkg/nimble/contrib/nimble_riot.c +++ b/pkg/nimble/contrib/nimble_riot.c @@ -36,7 +36,7 @@ #endif #ifdef MODULE_NIMBLE_CONTROLLER -#ifdef CPU_FAM_NRF52 +#if defined(CPU_FAM_NRF52) || defined(CPU_FAM_NRF51) #include "nrf_clock.h" #endif @@ -56,9 +56,10 @@ static void *_host_thread(void *arg) #ifdef MODULE_NIMBLE_CONTROLLER /* XXX: NimBLE needs the nRF5x's LF clock to run */ -#ifdef CPU_FAM_NRF52 +#if defined(CPU_FAM_NRF52) || defined(CPU_FAM_NRF51) clock_start_lf(); #endif + /* Run the controller * * Create task where NimBLE LL will run. This one is required as LL has its diff --git a/pkg/nimble/drivers.nrf52.mk b/pkg/nimble/drivers.nrf5x.mk similarity index 53% rename from pkg/nimble/drivers.nrf52.mk rename to pkg/nimble/drivers.nrf5x.mk index c00a9d61a6..206407ee98 100644 --- a/pkg/nimble/drivers.nrf52.mk +++ b/pkg/nimble/drivers.nrf5x.mk @@ -1,3 +1,3 @@ -MODULE = nimble_drivers_nrf52 +MODULE = nimble_drivers_nrf5x include $(RIOTBASE)/Makefile.base