Merge pull request #7523 from maximmbed/max32625pico-bl-updates

Add bootloader configuration parameters for MAX32625PICO

targets/TARGET_Maxim/TARGET_MAX32625/device/TOOLCHAIN_ARM_STD/TARGET_MAX32625_BOOT/MAX32625.sct

@@ -1,9 +1,18 @@
+#! armcc -E
 ; MAX32625
 ; 512KB FLASH (0x80000) @ 0x000000000
 ; 160KB RAM (0x28000) @ 0x20000000
 
-LR_IROM1 0x000010000 0x70000  {    ; load region size_region
+#if !defined(MBED_APP_START)
-    ER_IROM1 0x000010000 0x70000  {  ; load address = execution address
+    #define MBED_APP_START 0x00010000
+#endif
+
+#if !defined(MBED_APP_SIZE)
+    #define MBED_APP_SIZE 0x00070000
+#endif
+
+LR_IROM1 MBED_APP_START MBED_APP_SIZE  {    ; load region size_region
+    ER_IROM1 MBED_APP_START MBED_APP_SIZE  {  ; load address = execution address
         *.o (RESET, +First)
         *(InRoot$$Sections)
         .ANY (+RO)

targets/TARGET_Maxim/TARGET_MAX32625/device/TOOLCHAIN_GCC_ARM/TARGET_MAX32625_BOOT/max32625.ld

@@ -31,9 +31,17 @@
  *******************************************************************************
  */
 
+#if !defined(MBED_APP_START)
+   #define MBED_APP_START 0x00010000
+#endif
+
+#if !defined(MBED_APP_SIZE)
+   #define MBED_APP_SIZE 0x00070000
+#endif
+
 MEMORY
 {
-    FLASH (rx) : ORIGIN = 0x00010000, LENGTH = 0x00070000
+    FLASH (rx) : ORIGIN = MBED_APP_START, LENGTH = MBED_APP_SIZE
     RAM  (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00028000
 }
 

targets/TARGET_Maxim/TARGET_MAX32625/device/TOOLCHAIN_IAR/TARGET_MAX32625_BOOT/MAX32625.icf

@@ -1,7 +1,14 @@
+if (!isdefinedsymbol(MBED_APP_START)) {
+    define symbol MBED_APP_START = 0x00010000;
+}
+if (!isdefinedsymbol(MBED_APP_SIZE)) {
+    define symbol MBED_APP_SIZE = 0x00070000;
+}
+
 /* [ROM] */
-define symbol __intvec_start__        = 0x00010000;
+define symbol __intvec_start__        = MBED_APP_START;
-define symbol __region_ROM_start__    = 0x00010000;
+define symbol __region_ROM_start__    = MBED_APP_START;
-define symbol __region_ROM_end__      = 0x0007FFFF;
+define symbol __region_ROM_end__      = MBED_APP_START + MBED_APP_SIZE - 1;
 
 /* [RAM] Vector table dynamic copy: 68 vectors * 4 bytes = 272 (0x110) bytes */
 define symbol __NVIC_start__          = 0x00010000;

targets/targets.json

@@ -2909,33 +2909,21 @@
         "extra_labels": ["Maxim", "MAX32625"],
         "supported_toolchains": ["GCC_ARM", "IAR", "ARM"],
         "device_has": ["ANALOGIN", "I2C", "INTERRUPTIN", "LPTICKER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "STDIO_MESSAGES", "USTICKER"],
+        "device_name": "MAX32625",
         "release_versions": ["2", "5"],
         "public": false
     },
-    "MAX32625_BOOT": {
-        "inherits": ["MAX32625_BASE"],
-        "extra_labels_add": ["MAX32625_BOOT"],
-        "public": false
-    },
-    "MAX32625_NO_BOOT": {
-        "inherits": ["MAX32625_BASE"],
-        "extra_labels_add": ["MAX32625_NO_BOOT"],
-        "public": false
-    },
     "MAX32625MBED": {
-        "inherits": ["MAX32625_NO_BOOT"]
+        "inherits": ["MAX32625_BASE"],
+        "extra_labels_add": ["MAX32625_NO_BOOT"]
     },
     "MAX32625PICO": {
-        "inherits": ["MAX32625_BOOT"],
+        "inherits": ["MAX32625_BASE"],
-        "extra_labels_add": ["MAX32625PICO_BASE"]
+        "extra_labels_add": ["MAX32625_BOOT"],
-    },
+        "bootloader_supported": true
-    "MAX32625PICO_NO_BOOT": {
-        "inherits": ["MAX32625_NO_BOOT"],
-        "extra_labels_add": ["MAX32625PICO_BASE"]
     },
     "MAX32625NEXPAQ": {
-        "inherits": ["MAX32625_BASE"],
+        "inherits": ["MAX32625_BASE"]
-        "extra_labels_add": ["MAX32625NEXPAQ"]
     },
     "MAX32630FTHR": {
         "inherits": ["Target"],