populate bootloader address and mbr param if not available in MBR

check SD MAGIC before using sd API when init usb

Author: hathach

Makefile

@@ -345,7 +345,7 @@ sd:
 # flash MBR only
 mbr:
 	@echo Flashing: $(MBR_HEX)
-	$(NRFJPROG) --program $(MBR_HEX) -f nrf52 --sectorerase
+	$(NRFJPROG) --program $(MBR_HEX) -f nrf52 --sectorerase --reset
 
 gdbflash: $(BUILD)/$(MERGED_FILE).hex
 	@echo Flashing: $<

lib/sdk11/components/libraries/bootloader_dfu/bootloader.h

@@ -92,6 +92,9 @@ uint32_t bootloader_dfu_sd_update_continue(void);
  */
 uint32_t bootloader_dfu_sd_update_finalize(void);
 
+
+void bootloader_mbr_addrs_populate(void);
+
 #endif // BOOTLOADER_H__
 
 /**@} */

lib/sdk11/components/libraries/bootloader_dfu/bootloader_settings.c

@@ -13,45 +13,23 @@
 #include "bootloader_settings.h"
 #include <stdint.h>
 #include <dfu_types.h>
+#include "nrfx_nvmc.h"
 
-#if defined ( __CC_ARM )
+/**< This variable reserves a codepage for bootloader specific settings, to ensure the compiler doesn't locate any code or variables at his location. */
+__attribute__ ((section(".bootloaderSettings")))
+uint8_t m_boot_settings[CODE_PAGE_SIZE];
 
-  uint8_t  m_boot_settings[CODE_PAGE_SIZE]    __attribute__((at(BOOTLOADER_SETTINGS_ADDRESS))) __attribute__((used));                 /**< This variable reserves a codepage for bootloader specific settings, to ensure the compiler doesn't locate any code or variables at his location. */
-  uint32_t m_uicr_bootloader_start_address    __attribute__((at(NRF_UICR_BOOT_START_ADDRESS))) = BOOTLOADER_REGION_START;             /**< This variable makes the linker script write the bootloader start address to the UICR register. This value will be written in the HEX file and thus written to UICR when the bootloader is flashed into the chip. */
+/**< This variable ensures that the linker script will write the bootloader start address to the UICR register. This value will be written in the HEX file and thus written to UICR when the bootloader is flashed into the chip. */
+ __attribute__ ((section(".uicrBootStartAddress")))
+volatile uint32_t m_uicr_bootloader_start_address = BOOTLOADER_REGION_START;
 
-#elif defined ( __GNUC__ )
-
-  uint8_t m_boot_settings[CODE_PAGE_SIZE] __attribute__ ((section(".bootloaderSettings")));                                           /**< This variable reserves a codepage for bootloader specific settings, to ensure the compiler doesn't locate any code or variables at his location. */
-  volatile uint32_t m_uicr_bootloader_start_address  __attribute__ ((section(".uicrBootStartAddress"))) = BOOTLOADER_REGION_START;    /**< This variable ensures that the linker script will write the bootloader start address to the UICR register. This value will be written in the HEX file and thus written to UICR when the bootloader is flashed into the chip. */
-
-#elif defined ( __ICCARM__ )
-
-  __no_init uint8_t m_boot_settings[CODE_PAGE_SIZE] @ BOOTLOADER_SETTINGS_ADDRESS;                                                    /**< This variable reserves a codepage for bootloader specific settings, to ensure the compiler doesn't locate any code or variables at his location. */
-  __root    const uint32_t m_uicr_bootloader_start_address @ NRF_UICR_BOOT_START_ADDRESS = BOOTLOADER_REGION_START;                   /**< This variable ensures that the linker script will write the bootloader start address to the UICR register. This value will be written in the HEX file and thus written to UICR when the bootloader is flashed into the chip. */
-
-#endif
-
-#if defined(NRF52_SERIES)
-#if defined ( __CC_ARM )
-
-  uint8_t m_mbr_params_page[CODE_PAGE_SIZE]   __attribute__((at(BOOTLOADER_MBR_PARAMS_PAGE_ADDRESS))) __attribute__((used));          /**< This variable reserves a codepage for mbr parameters, to ensure the compiler doesn't locate any code or variables at his location. */
-  uint32_t m_uicr_mbr_params_page_address     __attribute__((at(NRF_UICR_MBR_PARAMS_PAGE_ADDRESS)))
-                                                  = BOOTLOADER_MBR_PARAMS_PAGE_ADDRESS;                                               /**< This variable makes the linker script write the mbr parameters page address to the UICR register. This value will be written in the HEX file and thus written to the UICR when the bootloader is flashed into the chip */
-
-#elif defined (__GNUC__ )
-
-  uint8_t m_mbr_params_page[CODE_PAGE_SIZE]           __attribute__ ((section(".mbrParamsPage")));                                    /**< This variable reserves a codepage for mbr parameters, to ensure the compiler doesn't locate any code or variables at his location. */
-  volatile uint32_t m_uicr_mbr_params_page_address    __attribute__ ((section(".uicrMbrParamsPageAddress")))
-                                                  = BOOTLOADER_MBR_PARAMS_PAGE_ADDRESS;                                               /**< This variable makes the linker script write the mbr parameters page address to the UICR register. This value will be written in the HEX file and thus written to the UICR when the bootloader is flashed into the chip */
-
-#elif defined (__ICCARM__ )
-
-  __no_init uint8_t m_mbr_params_page[CODE_PAGE_SIZE]     @ BOOTLOADER_MBR_PARAMS_PAGE_ADDRESS;                                       /**< This variable reserves a codepage for bootloader specific settings, to ensure the compiler doesn't locate any code or variables at his location. */
-  __root    const uint32_t m_uicr_mbr_params_page_address @ NRF_UICR_MBR_PARAMS_PAGE_ADDRESS = BOOTLOADER_MBR_PARAMS_PAGE_ADDRESS;    /**< This variable ensures that the linker script will write the bootloader start address to the UICR register. This value will be written in the HEX file and thus written to UICR when the bootloader is flashed into the chip. */
-
-#endif
-#endif // NRF52_SERIES
+/**< This variable reserves a codepage for mbr parameters, to ensure the compiler doesn't locate any code or variables at his location. */
+  __attribute__ ((section(".mbrParamsPage")))
+uint8_t m_mbr_params_page[CODE_PAGE_SIZE];
 
+/**< This variable makes the linker script write the mbr parameters page address to the UICR register. This value will be written in the HEX file and thus written to the UICR when the bootloader is flashed into the chip */
+__attribute__ ((section(".uicrMbrParamsPageAddress")))
+volatile uint32_t m_uicr_mbr_params_page_address = BOOTLOADER_MBR_PARAMS_PAGE_ADDRESS;
 
 void bootloader_util_settings_get(const bootloader_settings_t ** pp_bootloader_settings)
 {
@@ -61,3 +39,16 @@ void bootloader_util_settings_get(const bootloader_settings_t ** pp_bootloader_s
 
     *pp_bootloader_settings = p_bootloader_settings;
 }
+
+void bootloader_mbr_addrs_populate(void)
+{
+  if (*(const uint32_t *)MBR_BOOTLOADER_ADDR == 0xFFFFFFFF)
+  {
+    nrfx_nvmc_word_write(MBR_BOOTLOADER_ADDR, BOOTLOADER_REGION_START);
+  }
+
+  if (*(const uint32_t *)MBR_PARAM_PAGE_ADDR == 0xFFFFFFFF)
+  {
+    nrfx_nvmc_word_write(MBR_PARAM_PAGE_ADDR, BOOTLOADER_MBR_PARAMS_PAGE_ADDRESS);
+  }
+}

lib/sdk11/components/libraries/bootloader_dfu/dfu_types.h

@@ -29,12 +29,16 @@
 #include "nrf.h"
 #include "app_util.h"
 
-#define SD_MAGIC_NUMBER 0x51b1e5db
-#define SD_MAGIC_OK() (*((uint32_t*)(SOFTDEVICE_INFO_STRUCT_ADDRESS+4)) == 0x51b1e5db)
+#ifndef SD_MAGIC_NUMBER
+#define SD_MAGIC_NUMBER 0x51B1E5DB
+#endif
+
+#define SD_MAGIC_OK() (*((uint32_t*)(SOFTDEVICE_INFO_STRUCT_ADDRESS+4)) == SD_MAGIC_NUMBER)
 
 #define NRF_UICR_BOOT_START_ADDRESS         (NRF_UICR_BASE + 0x14)      /**< Register where the bootloader start address is stored in the UICR register. */
 #define NRF_UICR_MBR_PARAMS_PAGE_ADDRESS    (NRF_UICR_BASE + 0x18)      /**< Register where the mbr params page is stored in the UICR register. (Only in use in nRF52 MBR).*/
 
+// TODO more testing/checking
 #define CODE_REGION_1_START                 (SD_MAGIC_OK() ? SD_SIZE_GET(MBR_SIZE) : MBR_SIZE)       /**< This field should correspond to the size of Code Region 0, (which is identical to Start of Code Region 1), found in UICR.CLEN0 register. This value is used for compile safety, as the linker will fail if application expands into bootloader. Runtime, the bootloader will use the value found in UICR.CLEN0. */
 #define SOFTDEVICE_REGION_START             MBR_SIZE                    /**< This field should correspond to start address of the bootloader, found in UICR.RESERVED, 0x10001014, register. This value is used for sanity check, so the bootloader will fail immediately if this value differs from runtime value. The value is used to determine max application size for updating. */
 #define CODE_PAGE_SIZE                      0x1000                      /**< Size of a flash codepage. Used for size of the reserved flash space in the bootloader region. Will be runtime checked against NRF_UICR->CODEPAGESIZE to ensure the region is correct. */

src/boards.c

@@ -132,11 +132,6 @@ void SysTick_Handler(void)
 }
 
 
-uint32_t tusb_hal_millis(void)
-{
-  return ( ( ((uint64_t)app_timer_cnt_get())*1000*(APP_TIMER_CONFIG_RTC_FREQUENCY+1)) / APP_TIMER_CLOCK_FREQ );
-}
-
 void pwm_teardown(NRF_PWM_Type* pwm )
 {
   pwm->TASKS_SEQSTART[0] = 0;

src/main.c

@@ -166,6 +166,9 @@ void softdev_mbr_init(void)
 //--------------------------------------------------------------------+
 int main(void)
 {
+  // Populate Boot Address and MBR Param if not already
+  bootloader_mbr_addrs_populate();
+
   // SD is already Initialized in case of BOOTLOADER_DFU_OTA_MAGIC
   bool sd_inited = (NRF_POWER->GPREGRET == DFU_MAGIC_OTA_APPJUM);
 

src/usb/usb.c

@@ -56,6 +56,7 @@ void USBD_IRQHandler(void)
 //------------- IMPLEMENTATION -------------//
 void usb_init(bool cdc_only)
 {
+  // 0, 1 is reserved for SD
   NVIC_SetPriority(USBD_IRQn, 2);
 
   // USB power may already be ready at this time -> no event generated
@@ -64,9 +65,14 @@ void usb_init(bool cdc_only)
 
 #ifdef SOFTDEVICE_PRESENT
   uint8_t sd_en = false;
-  (void) sd_softdevice_is_enabled(&sd_en);
 
-  if ( sd_en ) {
+  if ( SD_MAGIC_OK() )
+  {
+    sd_softdevice_is_enabled(&sd_en);
+  }
+
+  if ( sd_en )
+  {
     sd_power_usbdetected_enable(true);
     sd_power_usbpwrrdy_enable(true);
     sd_power_usbremoved_enable(true);
@@ -106,29 +112,8 @@ void usb_init(bool cdc_only)
 
 void usb_teardown(void)
 {
-  if ( NRF_USBD->ENABLE )
-  {
-    // Abort all transfers
-
-    // Disable pull up
-    nrf_usbd_pullup_disable(NRF_USBD);
-
-    // Disable Interrupt
-    NVIC_DisableIRQ(USBD_IRQn);
-
-    // disable all interrupt
-    NRF_USBD->INTENCLR = NRF_USBD->INTEN;
-
-    nrf_usbd_disable(NRF_USBD);
-
-#if defined(SOFTDEVICE_PRESENT)
-    sd_clock_hfclk_release();
-
-    sd_power_usbdetected_enable(false);
-    sd_power_usbpwrrdy_enable(false);
-    sd_power_usbremoved_enable(false);
-#endif
-  }
+  // Simulate an disconnect which cause pullup disable, USB perpheral disable and hclk disable
+  tusb_hal_nrf_power_event(NRFX_POWER_USB_EVT_REMOVED);
 }
 
 //--------------------------------------------------------------------+