bootloader_app_start() correct set

- use sd vector table set if existed
- otherwise use mbr to set to application (0x1000)

Author: hathach

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

@@ -36,13 +36,6 @@
 #include "tusb.h"
 #endif
 
-/**< Maximum number of interrupts available. (from IRQn_Type) */
-#if defined(NRF52832_XXAA)
-  #define MAX_NUMBER_INTERRUPTS  39
-#elif defined(NRF52840_XXAA) || defined(NRF52833_XXAA)
-  #define MAX_NUMBER_INTERRUPTS  48
-#endif
-
 /**@brief Enumeration for specifying current bootloader status.
  */
 typedef enum
@@ -342,45 +335,42 @@ uint32_t bootloader_dfu_start(bool ota, uint32_t timeout_ms)
     return err_code;
 }
 
-
-/**@brief Function for disabling all interrupts before jumping from bootloader to application.
- */
-static void interrupts_disable(void)
+void bootloader_app_start(void)
 {
-  for (uint32_t irq = 0; irq < MAX_NUMBER_INTERRUPTS; irq++)
-  {
-    NVIC_DisableIRQ((IRQn_Type)irq);
-  }
-}
-
-
-void bootloader_app_start(uint32_t app_addr)
-{
-#ifdef SOFTDEVICE_PRESENT
-    // If the applications CRC has been checked and passed, the magic number will be written and we
-    // can start the application safely.
-    APP_ERROR_CHECK ( sd_softdevice_disable() );
+  // If the applications CRC has been checked and passed, the magic number will be written and we
+  // can start the application safely.
+  if ( is_sd_existed() ) sd_softdevice_disable();
+
+  // Disable all interrupts
+  NVIC->ICER[0]=0xFFFFFFFF;
+  NVIC->ICPR[0]=0xFFFFFFFF;
+#if defined(__NRF_NVIC_ISER_COUNT) && __NRF_NVIC_ISER_COUNT == 2
+  NVIC->ICER[1]=0xFFFFFFFF;
+  NVIC->ICPR[1]=0xFFFFFFFF;
 #endif
 
-    interrupts_disable();
+  // default to boot right after MBR
+  uint32_t app_addr = MBR_SIZE;
 
-#if 0 // may need set forward irq
+  if ( is_sd_existed() )
+  {
+    app_addr = SD_SIZE_GET(MBR_SIZE);
+    sd_softdevice_vector_table_base_set(app_addr);
+  }else
+  {
     sd_mbr_command_t command =
     {
-        .command = SD_MBR_COMMAND_IRQ_FORWARD_ADDRESS_SET,
-        .params.irq_forward_address_set.address = MBR_SIZE,
+      .command = SD_MBR_COMMAND_IRQ_FORWARD_ADDRESS_SET,
+      .params.irq_forward_address_set.address = app_addr,
     };
 
     sd_mbr_command(&command);
-#endif
 
-#ifdef SOFTDEVICE_PRESENT
-    APP_ERROR_CHECK( sd_softdevice_vector_table_base_set(app_addr) );
-#else
-    SCB->VTOR = app_addr;
-#endif
+    // VTOR as last resource ?
+    // SCB->VTOR = app_addr;
+  }
 
-    bootloader_util_app_start(app_addr);
+  bootloader_util_app_start(app_addr);
 }
 
 

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

@@ -52,7 +52,7 @@ uint32_t bootloader_dfu_start(bool ota, uint32_t timeout_ms);
  *
  * @param[in]  app_addr      Address to the region where the application is stored.
  */
-void bootloader_app_start(uint32_t app_addr);
+void bootloader_app_start(void);
 
 /**@brief Function for retrieving the bootloader settings.
  *

src/main.c

@@ -189,6 +189,7 @@ int main(void)
   if (dfu_start) NRF_POWER->GPREGRET = 0;
 
   // Save bootloader version to pre-defined register, retrieved by application
+  // TODO move to CF2
   BOOTLOADER_VERSION_REGISTER = (MK_BOOTLOADER_VERSION);
 
   board_init();
@@ -214,7 +215,7 @@ int main(void)
   // DFU + FRESET are pressed --> OTA
   _ota_dfu = _ota_dfu  || ( button_pressed(BUTTON_DFU) && button_pressed(BUTTON_FRESET) ) ;
 
-  bool const valid_app = bootloader_app_is_valid(DFU_BANK_0_REGION_START);
+  bool const valid_app = bootloader_app_is_valid();
   bool const just_start_app = valid_app && !dfu_start && (*dbl_reset_mem) == DFU_DBL_RESET_APP;
 
   if (!just_start_app && APP_ASKS_FOR_SINGLE_TAP_RESET())
@@ -282,20 +283,24 @@ int main(void)
   // Reset Board
   board_teardown();
 
-  // Jump to application if valid
-  if (bootloader_app_is_valid(DFU_BANK_0_REGION_START) && !bootloader_dfu_sd_in_progress())
+  /* Jump to application if valid
+   * "Master Boot Record and SoftDevice initializaton procedure"
+   * - SD_MBR_COMMAND_INIT_SD (if not already)
+   * - sd_softdevice_disable()
+   * - sd_softdevice_vector_table_base_set(APP_ADDR)
+   * - jump to App reset
+   */
+
+  if (bootloader_app_is_valid() && !bootloader_dfu_sd_in_progress())
   {
-#ifdef SOFTDEVICE_PRESENT
     // MBR must be init before start application
-    if ( !sd_inited ) softdev_mbr_init();
-#endif
+    if ( is_sd_existed() && !sd_inited ) softdev_mbr_init();
 
     // clear in case we kept DFU_DBL_RESET_APP there
     (*dbl_reset_mem) = 0;
 
-    // Select a bank region to use as application region.
-    // @note: Only applications running from DFU_BANK_0_REGION_START is supported.
-    bootloader_app_start(DFU_BANK_0_REGION_START);
+    // start application
+    bootloader_app_start();
   }
 
   NVIC_SystemReset();
@@ -323,7 +328,9 @@ void adafruit_factory_reset(void)
 #endif
 
 /**
- * Initializes the SoftDevice and the BLE event interrupt.
+ * Initializes the SotdDevice by following SD specs section
+ * "Master Boot Record and SoftDevice initializaton procedure"
+ *
  * @param[in] init_softdevice  true if SoftDevice should be initialized. The SoftDevice must only
  *                             be initialized if a chip reset has occured. Soft reset (jump ) from
  *                             application must not reinitialize the SoftDevice.