[riot-notifications] [RIOT-OS/RIOT] pkg/nimble: adapt to nrf51 family (#11463)

Hauke Petersen notifications at github.com
Mon Apr 29 15:14:14 CEST 2019


haukepetersen requested changes on this pull request.

I just see a problem when (in the near future) building Nimble for non-Nordic platforms. But easy to fix...

> @@ -61,8 +61,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:

I would leave this as NRF specific submodule, as it is only valid for these CPUs at the moment. So how about `nimble_drivers_nrf5x`?!

> @@ -1,6 +1,6 @@
 PKG_NAME    = nimble
 PKG_URL     = https://github.com/apache/mynewt-nimble.git
-PKG_VERSION = a7b3c939146e735b59d55bff740c906bde6f86f9
+PKG_VERSION = 976bb8f84bf9547efdea444ae79a62d5a355a613

If we merge #11273, this line should not be needed, right?

> @@ -26,9 +26,7 @@ endif
 # nimble controller dependencies
 ifneq (,$(filter nimble_controller,$(USEMODULE)))
   USEMODULE += nimble_transport_ram
-  ifeq (nrf52,$(CPU_FAM))
-    USEMODULE += nimble_drivers_nrf52
-  endif
+  USEMODULE += nimble_drivers

don't drop the ifdef, as the `nimble_drivers` submodule should only be included for nordic boards...

> @@ -33,9 +33,7 @@
 #endif
 
 #ifdef MODULE_NIMBLE_CONTROLLER
-#ifdef CPU_FAM_NRF52

the ifdef needs to stay, and simply be extended with the `CPU_FAM_NRF51`. Otherwise we get in trouble when building for non Nordic targets (in the future...).

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/RIOT-OS/RIOT/pull/11463#pullrequestreview-231665510
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.riot-os.org/pipermail/notifications/attachments/20190429/388f2861/attachment-0001.html>


More information about the notifications mailing list