You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by je...@apache.org on 2022/04/01 10:16:30 UTC
[mynewt-core] 02/02: mcu/nordic: Build fixes after nrfx 2.7 upgrade
This is an automated email from the ASF dual-hosted git repository.
jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit 7fe6637f92730be7141a1118d89ef67eb14494b3
Author: Jerzy Kasenberg <je...@codecoup.pl>
AuthorDate: Thu Mar 31 14:13:05 2022 +0200
mcu/nordic: Build fixes after nrfx 2.7 upgrade
Cosmetic changes due to NRFX 2.7 header and source upgrade
---
hw/mcu/nordic/nrf5340/src/hal_system.c | 2 +-
hw/mcu/nordic/nrf5340/src/system_nrf5340.c | 2 +-
hw/mcu/nordic/nrf5340_net/src/system_nrf5340_net.c | 2 +-
hw/mcu/nordic/pkg.yml | 1 +
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/mcu/nordic/nrf5340/src/hal_system.c b/hw/mcu/nordic/nrf5340/src/hal_system.c
index af75d20..4d09e8b 100644
--- a/hw/mcu/nordic/nrf5340/src/hal_system.c
+++ b/hw/mcu/nordic/nrf5340/src/hal_system.c
@@ -94,7 +94,7 @@ hal_system_clock_start(void)
#elif MYNEWT_VAL_CHOICE(MCU_LFCLK_XO_INTCAP, c7pf)
NRF_OSCILLATORS->XOSC32KI.INTCAP = OSCILLATORS_XOSC32KI_INTCAP_INTCAP_C7PF;
#elif MYNEWT_VAL_CHOICE(MCU_LFCLK_XO_INTCAP, c9pf)
- NRF_OSCILLATORS->XOSC32KI.INTCAP = OSCILLATORS_XOSC32KI_INTCAP_INTCAP_C11PF;
+ NRF_OSCILLATORS->XOSC32KI.INTCAP = OSCILLATORS_XOSC32KI_INTCAP_INTCAP_C9PF;
#endif
#if !defined(NRF_TRUSTZONE_NONSECURE)
diff --git a/hw/mcu/nordic/nrf5340/src/system_nrf5340.c b/hw/mcu/nordic/nrf5340/src/system_nrf5340.c
index 84fa385..831d232 100644
--- a/hw/mcu/nordic/nrf5340/src/system_nrf5340.c
+++ b/hw/mcu/nordic/nrf5340/src/system_nrf5340.c
@@ -97,7 +97,7 @@ void SystemInit(void)
/* IAR will complain about the order of volatile pointer accesses. */
#pragma diag_suppress=Pa082
#endif
- *NRF_FICR_S->TRIMCNF[index].ADDR = NRF_FICR_S->TRIMCNF[index].DATA;
+ *((volatile uint32_t *)NRF_FICR_S->TRIMCNF[index].ADDR) = NRF_FICR_S->TRIMCNF[index].DATA;
#if defined ( __ICCARM__ )
#pragma diag_default=Pa082
#endif
diff --git a/hw/mcu/nordic/nrf5340_net/src/system_nrf5340_net.c b/hw/mcu/nordic/nrf5340_net/src/system_nrf5340_net.c
index 86796a6..4998896 100644
--- a/hw/mcu/nordic/nrf5340_net/src/system_nrf5340_net.c
+++ b/hw/mcu/nordic/nrf5340_net/src/system_nrf5340_net.c
@@ -59,7 +59,7 @@ void SystemInit(void)
/* IAR will complain about the order of volatile pointer accesses. */
#pragma diag_suppress=Pa082
#endif
- *NRF_FICR_NS->TRIMCNF[index].ADDR = NRF_FICR_NS->TRIMCNF[index].DATA;
+ *((volatile uint32_t *)NRF_FICR_NS->TRIMCNF[index].ADDR) = NRF_FICR_NS->TRIMCNF[index].DATA;
#if defined ( __ICCARM__ )
#pragma diag_default=Pa082
#endif
diff --git a/hw/mcu/nordic/pkg.yml b/hw/mcu/nordic/pkg.yml
index 7fa2df2..f7a54e1 100644
--- a/hw/mcu/nordic/pkg.yml
+++ b/hw/mcu/nordic/pkg.yml
@@ -34,6 +34,7 @@ pkg.ign_dirs:
- "soc"
- "templates"
- "mdk"
+ - "helpers"
pkg.src_dirs:
- "src/ext/nrfx/"