remove address from checking app valid function

either use address after SD or MBR

Author: hathach

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

@@ -143,37 +143,32 @@ static void wait_for_events(void)
 }
 
 
-bool bootloader_app_is_valid(uint32_t app_addr)
+bool bootloader_app_is_valid(void)
 {
-  bootloader_settings_t const * p_bootloader_settings;
+  uint32_t const app_addr = DFU_BANK_0_REGION_START;
+  bootloader_settings_t const *p_bootloader_settings;
 
-    // There exists an application in CODE region 1.
-    if (*((uint32_t *)app_addr) == EMPTY_FLASH_MASK)
-    {
-        return false;
-    }
+  bool success = false;
 
-    bool success = false;
+  bootloader_util_settings_get(&p_bootloader_settings);
 
-    bootloader_util_settings_get(&p_bootloader_settings);
+  // The application in CODE region 1 is flagged as valid during update.
+  if ( p_bootloader_settings->bank_0 == BANK_VALID_APP )
+  {
+    uint16_t image_crc = 0;
 
-    // The application in CODE region 1 is flagged as valid during update.
-    if (p_bootloader_settings->bank_0 == BANK_VALID_APP)
+    // A stored crc value of 0 indicates that CRC checking is not used.
+    if ( p_bootloader_settings->bank_0_crc != 0 )
     {
-        uint16_t image_crc = 0;
-
-        // A stored crc value of 0 indicates that CRC checking is not used.
-        if (p_bootloader_settings->bank_0_crc != 0)
-        {
-            image_crc = crc16_compute((uint8_t *)app_addr,
-                                      p_bootloader_settings->bank_0_size,
-                                      NULL);
-        }
-
-        success = (image_crc == p_bootloader_settings->bank_0_crc);
+      image_crc = crc16_compute((uint8_t*) app_addr,
+                                p_bootloader_settings->bank_0_size,
+                                NULL);
     }
 
-    return success;
+    success = (image_crc == p_bootloader_settings->bank_0_crc);
+  }
+
+  return success;
 }
 
 

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

@@ -33,13 +33,10 @@
 uint32_t bootloader_init(void);
 
 /**@brief Function for validating application region in flash.
- * 
- * @param[in]  app_addr      Address to the region in flash where the application is stored.
- * 
  * @retval     true          If Application region is valid.
  * @retval     false         If Application region is not valid.
  */
-bool bootloader_app_is_valid(uint32_t app_addr);
+bool bootloader_app_is_valid(void);
 
 /**@brief Function for starting the Device Firmware Update.
  * 

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

@@ -41,8 +41,9 @@ static inline bool is_sd_existed(void)
 #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
+// Application address is either after MBR or SD (if existed)
 #define CODE_REGION_1_START                 (is_sd_existed() ? 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. */