You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ut...@apache.org on 2020/06/07 20:34:22 UTC

[mynewt-core] branch master updated: Allow nrf5x enc flash driver to work on nrf52840

This is an automated email from the ASF dual-hosted git repository.

utzig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git


The following commit(s) were added to refs/heads/master by this push:
     new 6b205af  Allow nrf5x enc flash driver to work on nrf52840
6b205af is described below

commit 6b205affd69a6f05787264fa2c70c621bbbdd325
Author: Fabio Utzig <ut...@apache.org>
AuthorDate: Sat Jun 6 07:25:53 2020 -0300

    Allow nrf5x enc flash driver to work on nrf52840
---
 hw/drivers/flash/enc_flash/ef_nrf5x/src/ef_nrf5x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/drivers/flash/enc_flash/ef_nrf5x/src/ef_nrf5x.c b/hw/drivers/flash/enc_flash/ef_nrf5x/src/ef_nrf5x.c
index 0d5f775..d3c4c9e 100644
--- a/hw/drivers/flash/enc_flash/ef_nrf5x/src/ef_nrf5x.c
+++ b/hw/drivers/flash/enc_flash/ef_nrf5x/src/ef_nrf5x.c
@@ -24,7 +24,7 @@
 
 #include <mcu/cortex_m4.h>
 
-#if MYNEWT_VAL(BSP_NRF52)
+#if MYNEWT_VAL(BSP_NRF52) || MYNEWT_VAL(BSP_NRF52840)
 #include <mcu/nrf52_hal.h>
 #elif MYNEWT_VAL(BSP_NRF51)
 #include <mcu/nrf51_hal.h>