[nrf528xx] changed deprecated flash write call (#4699)

This commit is contained in:
Piotr Koziar
2020-03-17 15:47:06 -07:00
committed by GitHub
parent 661d2b4f5f
commit a144ff653e
3 changed files with 9 additions and 3 deletions
+3 -3
View File
@@ -37,11 +37,11 @@
#include <utils/flash.h> #include <utils/flash.h>
#include "platform-nrf5.h" #include "platform-nrf5.h"
#include "hal/nrf_nvmc.h" #include "drivers/include/nrfx_nvmc.h"
otError nrf5FlashPageErase(uint32_t aAddress) otError nrf5FlashPageErase(uint32_t aAddress)
{ {
nrf_nvmc_page_erase(aAddress); nrfx_nvmc_page_erase(aAddress);
return OT_ERROR_NONE; return OT_ERROR_NONE;
} }
@@ -53,6 +53,6 @@ bool nrf5FlashIsBusy(void)
uint32_t nrf5FlashWrite(uint32_t aAddress, const uint8_t *aData, uint32_t aSize) uint32_t nrf5FlashWrite(uint32_t aAddress, const uint8_t *aData, uint32_t aSize)
{ {
nrf_nvmc_write_bytes(aAddress, aData, aSize); nrfx_nvmc_bytes_write(aAddress, aData, aSize);
return aSize; return aSize;
} }
+2
View File
@@ -170,6 +170,7 @@ NORDICSEMI_COMMON_SOURCES
libraries/app_error/app_error_weak.c \ libraries/app_error/app_error_weak.c \
libraries/utf_converter/utf.c \ libraries/utf_converter/utf.c \
nrfx/drivers/src/nrfx_clock.c \ nrfx/drivers/src/nrfx_clock.c \
nrfx/drivers/src/nrfx_nvmc.c \
nrfx/drivers/src/nrfx_power.c \ nrfx/drivers/src/nrfx_power.c \
nrfx/drivers/src/nrfx_spis.c \ nrfx/drivers/src/nrfx_spis.c \
nrfx/drivers/src/nrfx_systick.c \ nrfx/drivers/src/nrfx_systick.c \
@@ -471,6 +472,7 @@ noinst_HEADERS
$(top_srcdir)/third_party/NordicSemiconductor/nrfx/drivers/nrfx_common.h \ $(top_srcdir)/third_party/NordicSemiconductor/nrfx/drivers/nrfx_common.h \
$(top_srcdir)/third_party/NordicSemiconductor/nrfx/drivers/nrfx_errors.h \ $(top_srcdir)/third_party/NordicSemiconductor/nrfx/drivers/nrfx_errors.h \
$(top_srcdir)/third_party/NordicSemiconductor/nrfx/drivers/include/nrfx_clock.h \ $(top_srcdir)/third_party/NordicSemiconductor/nrfx/drivers/include/nrfx_clock.h \
$(top_srcdir)/third_party/NordicSemiconductor/nrfx/drivers/include/nrfx_nvmc.h \
$(top_srcdir)/third_party/NordicSemiconductor/nrfx/drivers/include/nrfx_power_clock.h \ $(top_srcdir)/third_party/NordicSemiconductor/nrfx/drivers/include/nrfx_power_clock.h \
$(top_srcdir)/third_party/NordicSemiconductor/nrfx/drivers/include/nrfx_power.h \ $(top_srcdir)/third_party/NordicSemiconductor/nrfx/drivers/include/nrfx_power.h \
$(top_srcdir)/third_party/NordicSemiconductor/nrfx/drivers/include/nrfx_spis.h \ $(top_srcdir)/third_party/NordicSemiconductor/nrfx/drivers/include/nrfx_spis.h \
+4
View File
@@ -235,6 +235,10 @@
#endif // SPIS_AS_SERIAL_TRANSPORT == 1 #endif // SPIS_AS_SERIAL_TRANSPORT == 1
#ifndef NRFX_NVMC_ENABLED
#define NRFX_NVMC_ENABLED 1
#endif
#ifndef TIMER_ENABLED #ifndef TIMER_ENABLED
#define TIMER_ENABLED 1 #define TIMER_ENABLED 1
#endif #endif