michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/flash/soc_flash_nrf: Rename config option SOC_FLASH_NRF_RADIO_SYNC

Browse source 
Call it SOC_FLASH_NRF_RADIO_SYNC_TICKER so it is not too generic.

Signed-off-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@nordicsemi.no>
This commit is contained in:
Ievgenii Meshcheriakov 2020-09-17 15:44:37 +02:00 • committed by Carles Cufí
commit d27c32efc3
7 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/flash/CMakeLists.txt
View file

@ -7,7 +7,7 @@ zephyr_library_sources_ifdef(CONFIG_NORDIC_QSPI_NOR nrf_qspi_nor.c)
zephyr_library_sources_ifdef(CONFIG_FLASH_SIMULATOR flash_simulator.c)
zephyr_library_sources_ifdef(CONFIG_SPI_FLASH_AT45 spi_flash_at45.c)
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF soc_flash_nrf.c)
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF_RADIO_SYNC soc_flash_nrf_ticker.c)
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_NRF_RADIO_SYNC_TICKER soc_flash_nrf_ticker.c)
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_MCUX soc_flash_mcux.c)
zephyr_library_sources_ifdef(CONFIG_FLASH_PAGE_LAYOUT flash_page_layout.c)
zephyr_library_sources_ifdef(CONFIG_USERSPACE flash_handlers.c)
@ -30,7 +30,7 @@ if(CONFIG_SOC_FLASH_STM32)
endif()
zephyr_include_directories_ifdef(
CONFIG_SOC_FLASH_NRF_RADIO_SYNC
CONFIG_SOC_FLASH_NRF_RADIO_SYNC_TICKER
${ZEPHYR_BASE}/subsys/bluetooth
${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/nordic
)

6
drivers/flash/Kconfig.nrf
View file

@ -22,12 +22,12 @@ if SOC_FLASH_NRF
choice SOC_FLASH_NRF_RADIO_SYNC_CHOICE
prompt "Nordic nRFx flash driver synchronization"
default SOC_FLASH_NRF_RADIO_SYNC if BT_CTLR
default SOC_FLASH_NRF_RADIO_SYNC_TICKER if BT_CTLR
default SOC_FLASH_NRF_RADIO_SYNC_NONE
help
synchronization between flash memory driver and radio.
config SOC_FLASH_NRF_RADIO_SYNC
config SOC_FLASH_NRF_RADIO_SYNC_TICKER
bool "Nordic nRFx flash driver synchronized with radio"
depends on BT_CTLR
help
@ -50,7 +50,7 @@ config SOC_FLASH_NRF_PARTIAL_ERASE
This allows interrupting flash erase between operations
to perform other task by MCU.
This feature may also be used for better syncing flash erase
operations, when compiled with SOC_FLASH_NRF_RADIO_SYNC,
operations, when compiled with SOC_FLASH_NRF_RADIO_SYNC_TICKER,
with Bluetooth.
config SOC_FLASH_NRF_PARTIAL_ERASE_MS

2
subsys/bluetooth/controller/ll_sw/ull.c
View file

@ -110,7 +110,7 @@
#define BT_CONN_TICKER_NODES 0
#endif
#if defined(CONFIG_SOC_FLASH_NRF_RADIO_SYNC)
#if defined(CONFIG_SOC_FLASH_NRF_RADIO_SYNC_TICKER)
#define FLASH_TICKER_NODES 2 /* No. of tickers reserved for flashing */
#define FLASH_TICKER_USER_APP_OPS 1 /* No. of additional ticker operations */
#else

2
tests/bluetooth/init/prj_controller_4_0_ll_sw_split.conf
View file

@ -38,6 +38,6 @@ CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
CONFIG_BT_GATT_CLIENT=y
CONFIG_BT_BREDR=n
CONFIG_FLASH=y
CONFIG_SOC_FLASH_NRF_RADIO_SYNC=y
CONFIG_SOC_FLASH_NRF_RADIO_SYNC_TICKER=y
CONFIG_ZTEST=y

2
tests/bluetooth/init/prj_controller_dbg_ll_sw_split.conf
View file

@ -59,5 +59,5 @@ CONFIG_BT_DEBUG_GATT=y
CONFIG_BT_BREDR=n
CONFIG_DEBUG=y
CONFIG_FLASH=y
CONFIG_SOC_FLASH_NRF_RADIO_SYNC=n
CONFIG_SOC_FLASH_NRF_RADIO_SYNC_TICKER=n
CONFIG_ZTEST=y

2
tests/bluetooth/init/prj_controller_ll_sw_split.conf
View file

@ -12,6 +12,6 @@ CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
CONFIG_BT_GATT_CLIENT=y
CONFIG_BT_BREDR=n
CONFIG_FLASH=y
CONFIG_SOC_FLASH_NRF_RADIO_SYNC=y
CONFIG_SOC_FLASH_NRF_RADIO_SYNC_TICKER=y
CONFIG_ZTEST=y

2
tests/bluetooth/init/prj_controller_tiny_ll_sw_split.conf
View file

@ -43,6 +43,6 @@ CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
CONFIG_BT_GATT_CLIENT=y
CONFIG_BT_BREDR=n
CONFIG_FLASH=y
CONFIG_SOC_FLASH_NRF_RADIO_SYNC=y
CONFIG_SOC_FLASH_NRF_RADIO_SYNC_TICKER=y
CONFIG_ZTEST=y