From 3c72239dc486b20e79308d4c45bc91b36fcfe371 Mon Sep 17 00:00:00 2001 From: Francisco Molina Date: Tue, 7 Jun 2022 08:26:37 +0200 Subject: [PATCH] pkg/mynewt-core: use nrfx package --- pkg/Kconfig | 1 + pkg/mynewt-core/Kconfig | 1 + pkg/mynewt-core/Makefile.dep | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/pkg/Kconfig b/pkg/Kconfig index f6bd78aad4..8c0a894325 100644 --- a/pkg/Kconfig +++ b/pkg/Kconfig @@ -54,6 +54,7 @@ rsource "mynewt-core/Kconfig" rsource "nanocbor/Kconfig" rsource "nanopb/Kconfig" rsource "nanors/Kconfig" +rsource "nrfx/Kconfig" rsource "qcbor/Kconfig" rsource "qdsa/Kconfig" rsource "qr-code-generator/Kconfig" diff --git a/pkg/mynewt-core/Kconfig b/pkg/mynewt-core/Kconfig index 11fc88a87c..53e822bca2 100644 --- a/pkg/mynewt-core/Kconfig +++ b/pkg/mynewt-core/Kconfig @@ -37,5 +37,6 @@ config MODULE_MYNEWT-CORE_UTIL config MODULE_MYNEWT-CORE_NRF5X_HAL bool "mynewt-core nrf52 and nrf51 timer hal" + select PACKAGE_NRFX endif # PACKAGE_MYNEWT-CORE diff --git a/pkg/mynewt-core/Makefile.dep b/pkg/mynewt-core/Makefile.dep index 8131c03595..9555b3d619 100644 --- a/pkg/mynewt-core/Makefile.dep +++ b/pkg/mynewt-core/Makefile.dep @@ -5,5 +5,9 @@ USEMODULE += mynewt-core DEFAULT_MODULE += auto_init_mynewt-core +ifneq (,$(filter mynewt-core_nrf5x_hal,$(USEMODULE))) + USEPKG += nrfx +endif + # esp frequency is not pow2 so is incompatible with os_cputime FEATURES_BLACKLIST += arch_esp