From f4ec2f001d132e837ef87410008f6bf93274bbc4 Mon Sep 17 00:00:00 2001 From: chrysn Date: Tue, 24 Dec 2024 03:01:26 +0100 Subject: [PATCH] fixup! pkg/nimble: Account for the nrf5[23] unification of 1.6.0 --- pkg/nimble/Makefile | 2 ++ pkg/nimble/Makefile.dep | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/nimble/Makefile b/pkg/nimble/Makefile index 2c6d1bcd8b1f..9a4c265fdc20 100644 --- a/pkg/nimble/Makefile +++ b/pkg/nimble/Makefile @@ -78,6 +78,8 @@ nimble_controller: nimble_drivers_nrf5x: $(QQ)"$(MAKE)" -C $(PDIR)/nimble/drivers/nrf5x/src/ -f $(RIOTBASE)/Makefile.base MODULE=$@ + +nimble_drivers_nrf5x_specific: $(QQ)"$(MAKE)" -C $(PDIR)/nimble/drivers/nrf5x/src/$(CPU_FAM)/ -f $(RIOTBASE)/Makefile.base MODULE=$@ # additional, RIOT specific nimble modules diff --git a/pkg/nimble/Makefile.dep b/pkg/nimble/Makefile.dep index df7b054760cb..f6a970715b55 100644 --- a/pkg/nimble/Makefile.dep +++ b/pkg/nimble/Makefile.dep @@ -54,7 +54,7 @@ endif # nimble controller dependencies ifneq (,$(filter nimble_controller,$(USEMODULE))) ifneq (,$(filter nrf51 nrf52,$(CPU_FAM))) - USEMODULE += nimble_drivers_nrf5x + USEMODULE += nimble_drivers_nrf5x nimble_drivers_nrf5x_specific endif endif