Sergey Solodunov / nrf51-sdk

my fork of nrf51-sdk

Dependents:   nRF51822

Fork of nrf51-sdk by Nordic Semiconductor

Files at this revision

API Documentation at this revision

Revision 46:8a1d38437d75, committed 2016-08-07

Comitter:
sergoserg
Date:
Sun Aug 07 05:51:59 2016 +0000
Parent:
45:4a80ff6428ab
Commit message:
Fixed compile error

Changed in this revision

source/nordic_sdk/components/libraries/fstorage/fstorage_config.h Show annotated file Show diff for this revision Revisions of this file 
diff -r 4a80ff6428ab -r 8a1d38437d75 source/nordic_sdk/components/libraries/fstorage/fstorage_config.h
--- a/source/nordic_sdk/components/libraries/fstorage/fstorage_config.h	Mon Apr 11 16:13:57 2016 +0000
+++ b/source/nordic_sdk/components/libraries/fstorage/fstorage_config.h	Sun Aug 07 05:51:59 2016 +0000
@@ -82,12 +82,15 @@
  */
 static __INLINE uint32_t fs_flash_page_end_addr()
 {
+#if 0
     uint32_t const bootloader_addr = NRF_UICR->NRFFW[0];
+#else
+    uint32_t const bootloader_addr = NRF_UICR->BOOTLOADERADDR;
+#endif
     return  ((bootloader_addr != FS_EMPTY_MASK) ?
              bootloader_addr : NRF_FICR->CODESIZE * FS_PAGE_SIZE);
 }
 
-
 /**@brief Macro for last page address
  *
  * @note    If there is a bootloader present the bootloader address read from UICR