From fd6092901c9420c74e35cb8be84534072498bb82 Mon Sep 17 00:00:00 2001 From: Mateusz Michalek Date: Wed, 31 Jan 2024 10:25:08 +0100 Subject: [PATCH] [nrf fromlist] drivers: flash: rram singlethreading support Upstream PR: https://github.com/zephyrproject-rtos/zephyr/pull/68309 Adds conditional usage of locking mechanisms to allow building without multithreading. Signed-off-by: Mateusz Michalek --- drivers/flash/soc_flash_nrf_rram.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/flash/soc_flash_nrf_rram.c b/drivers/flash/soc_flash_nrf_rram.c index 369ff61c556..4930eb31697 100644 --- a/drivers/flash/soc_flash_nrf_rram.c +++ b/drivers/flash/soc_flash_nrf_rram.c @@ -30,10 +30,16 @@ LOG_MODULE_REGISTER(flash_nrf_rram, CONFIG_FLASH_LOG_LEVEL); #define WRITE_BLOCK_SIZE_FROM_DT DT_PROP(RRAM, write_block_size) #define ERASE_VALUE 0xFF +#ifdef CONFIG_MULTITHREADING static struct k_sem sem_lock; #define SYNC_INIT() k_sem_init(&sem_lock, 1, 1) #define SYNC_LOCK() k_sem_take(&sem_lock, K_FOREVER) #define SYNC_UNLOCK() k_sem_give(&sem_lock) +#else +#define SYNC_INIT() +#define SYNC_LOCK() +#define SYNC_UNLOCK() +#endif /* CONFIG_MULTITHREADING */ #if CONFIG_NRF_RRAM_WRITE_BUFFER_SIZE > 0 #define WRITE_BUFFER_ENABLE 1