This is an automated email from the ASF dual-hosted git repository. janc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit 4208dbdbe949ab6a417ff1266fec6db138d89f64 Author: Szymon Janc <[email protected]> AuthorDate: Mon Feb 23 15:24:14 2026 +0100 mcu/nordic: Remove deprecated XTAL config options Those were deprecated for quite a long and should be safe to cleanup. --- docs/os/core_os/porting/port_bsp.rst | 2 +- hw/mcu/nordic/nrf51xxx/syscfg.yml | 32 ----------------------- hw/mcu/nordic/nrf52xxx/syscfg.yml | 49 ------------------------------------ hw/mcu/nordic/nrf91xx/syscfg.yml | 7 ------ 4 files changed, 1 insertion(+), 89 deletions(-) diff --git a/docs/os/core_os/porting/port_bsp.rst b/docs/os/core_os/porting/port_bsp.rst index ca24be6ea..6b91f8012 100644 --- a/docs/os/core_os/porting/port_bsp.rst +++ b/docs/os/core_os/porting/port_bsp.rst @@ -384,7 +384,7 @@ Our example nRF52 BSP requires the following changes: # Settings this BSP overrides. syscfg.vals: - XTAL_32768: 1 + MCU_LFCLK_SOURCE: LFXO Test it ~~~~~~~ diff --git a/hw/mcu/nordic/nrf51xxx/syscfg.yml b/hw/mcu/nordic/nrf51xxx/syscfg.yml index 0ff2ef75c..646fa90b8 100644 --- a/hw/mcu/nordic/nrf51xxx/syscfg.yml +++ b/hw/mcu/nordic/nrf51xxx/syscfg.yml @@ -108,40 +108,8 @@ syscfg.defs: - LFXO # 32.768 kHz crystal oscillator - LFSYNTH # 32.768 kHz synthesized from HFCLK - # Deprecated settings - - XTAL_32768: - description: "Use 'MCU_LFCLK_SOURCE: LFXO' instead" - value: 0 - restrictions: - - "!XTAL_32768_SYNTH" - - "!XTAL_RC" - deprecated: 1 - XTAL_RC: - description: "Use 'MCU_LFCLK_SOURCE: LFRC' instead" - value: 0 - restrictions: - - "!XTAL_32768_SYNTH" - - "!XTAL_32768" - deprecated: 1 - XTAL_32768_SYNTH: - description: "Use 'MCU_LFCLK_SOURCE: LFSYNTH' instead" - value: 0 - restrictions: - - "!XTAL_RC" - - "!XTAL_32768" - deprecated: 1 - - syscfg.vals: # The nRF51 microcontroller uses RTC0 for periodic interrupts and it is # clocked at 32768Hz. The tick frequency is chosen such that it divides # cleanly into 32768 to avoid a systemic bias in the actual tick frequency. OS_TICKS_PER_SEC: 128 - -syscfg.vals.XTAL_32768: - MCU_LFCLK_SOURCE: LFXO -syscfg.vals.XTAL_RC: - MCU_LFCLK_SOURCE: LFRC -syscfg.vals.XTAL_32768_SYNTH: - MCU_LFCLK_SOURCE: LFSYNTH diff --git a/hw/mcu/nordic/nrf52xxx/syscfg.yml b/hw/mcu/nordic/nrf52xxx/syscfg.yml index fe2477198..c875df0ba 100644 --- a/hw/mcu/nordic/nrf52xxx/syscfg.yml +++ b/hw/mcu/nordic/nrf52xxx/syscfg.yml @@ -442,61 +442,12 @@ syscfg.defs: description: 'Enable pin reset' value: 0 -# Deprecated settings - - MCU_NRF52832: - description: Use MCU_TARGET instead - value: 0 - restrictions: - - "!MCU_NRF52840" - deprecated: 1 - MCU_NRF52840: - description: Use MCU_TARGET instead - value: 0 - restrictions: - - "!MCU_NRF52832" - deprecated: 1 - - XTAL_32768: - description: Use MCU_LFCLK_SOURCE instead - value: 0 - restrictions: - - "!XTAL_RC" - - "!XTAL_32768_SYNTH" - deprecated: 1 - XTAL_RC: - description: Use MCU_LFCLK_SOURCE instead - value: 0 - restrictions: - - "!XTAL_32768" - - "!XTAL_32768_SYNTH" - deprecated: 1 - XTAL_32768_SYNTH: - description: Use MCU_LFCLK_SOURCE instead - value: 0 - restrictions: - - "!XTAL_32768" - - "!XTAL_RC" - deprecated: 1 - syscfg.vals: OS_TICKS_PER_SEC: 128 -syscfg.vals.MCU_NRF52832: - MCU_TARGET: nRF52832 -syscfg.vals.MCU_NRF52840: - MCU_TARGET: nRF52840 - syscfg.vals.'(MCU_TARGET == "nRF52832" || MCU_TARGET == "nRF52840")': MCU_ICACHE_ENABLED: 1 -syscfg.vals.XTAL_32768: - MCU_LFCLK_SOURCE: LFXO -syscfg.vals.XTAL_RC: - MCU_LFCLK_SOURCE: LFRC -syscfg.vals.XTAL_32768_SYNTH: - MCU_LFCLK_SOURCE: LFSYNTH - syscfg.restrictions: - "!I2C_0 || (I2C_0_PIN_SCL && I2C_0_PIN_SDA)" - "!I2C_1 || (I2C_1_PIN_SCL && I2C_1_PIN_SDA)" diff --git a/hw/mcu/nordic/nrf91xx/syscfg.yml b/hw/mcu/nordic/nrf91xx/syscfg.yml index 369f9d7f2..afc17353b 100644 --- a/hw/mcu/nordic/nrf91xx/syscfg.yml +++ b/hw/mcu/nordic/nrf91xx/syscfg.yml @@ -454,13 +454,6 @@ syscfg.vals: syscfg.vals.MCU_NRF9160: MCU_TARGET: nRF9160 -syscfg.vals.XTAL_32768: - MCU_LFCLK_SOURCE: LFXO -syscfg.vals.XTAL_RC: - MCU_LFCLK_SOURCE: LFRC -syscfg.vals.XTAL_32768_SYNTH: - MCU_LFCLK_SOURCE: LFSYNTH - syscfg.restrictions: - "!I2C_0 || (I2C_0_PIN_SCL != -1 && I2C_0_PIN_SDA != -1)" - "!I2C_1 || (I2C_1_PIN_SCL != -1 && I2C_1_PIN_SDA != -1)"
