Unify MAX32625 targets

mbed-ce · Sep 13, 2024 · 8bf7db2 · 8bf7db2
1 parent 232d767
commit 8bf7db2
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 238 deletions.
diff --git a/targets/TARGET_Maxim/TARGET_MAX32625/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32625/CMakeLists.txt
@@ -4,12 +4,10 @@
 add_subdirectory(TARGET_MAX32625MBED EXCLUDE_FROM_ALL)
 add_subdirectory(TARGET_MAX32625PICO EXCLUDE_FROM_ALL)
 add_subdirectory(TARGET_SDT32625B EXCLUDE_FROM_ALL)
-add_subdirectory(device EXCLUDE_FROM_ALL)
 
-if(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    set(STARTUP_FILE device/TOOLCHAIN_ARM_STD/startup_MAX32625.S)
-elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
+if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_max32625.S)
+    set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/max32625.ld)
 endif()
 
 add_library(mbed-max32625 INTERFACE)
@@ -71,4 +69,6 @@ target_sources(mbed-max32625
         ${STARTUP_FILE}
 )
 
+mbed_set_linker_script(mbed-max32625 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+
 target_link_libraries(mbed-max32625 INTERFACE mbed-maxim)
diff --git a/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625MBED/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625MBED/CMakeLists.txt
@@ -8,4 +8,4 @@ target_include_directories(mbed-max32625mbed
         .
 )
 
-target_link_libraries(mbed-max32625mbed INTERFACE mbed-max32625 mbed-max32625-no-boot)
+target_link_libraries(mbed-max32625mbed INTERFACE mbed-max32625)
diff --git a/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625PICO/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625PICO/CMakeLists.txt
@@ -13,4 +13,4 @@ target_sources(mbed-max32625pico
         low_level_init.c
 )
 
-target_link_libraries(mbed-max32625pico INTERFACE mbed-max32625 mbed-max32625-boot)
+target_link_libraries(mbed-max32625pico INTERFACE mbed-max32625)
diff --git a/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_SDT32625B/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_SDT32625B/CMakeLists.txt
@@ -8,4 +8,4 @@ target_include_directories(mbed-sdt32625b
         .
 )
 
-target_link_libraries(mbed-sdt32625b INTERFACE mbed-max32625-no-boot)
+target_link_libraries(mbed-sdt32625b INTERFACE mbed-max32625)
diff --git a/targets/TARGET_Maxim/TARGET_MAX32625/device/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32625/device/CMakeLists.txt
diff --git a/...ts/TARGET_Maxim/TARGET_MAX32625/device/TOOLCHAIN_GCC_ARM/TARGET_MAX32625_BOOT/max32625.ld b/...ts/TARGET_Maxim/TARGET_MAX32625/device/TOOLCHAIN_GCC_ARM/TARGET_MAX32625_BOOT/max32625.ld
diff --git a/...C_ARM/TARGET_MAX32625_NO_BOOT/max32625.ld → ...2625/device/TOOLCHAIN_GCC_ARM/max32625.ld b/...C_ARM/TARGET_MAX32625_NO_BOOT/max32625.ld → ...2625/device/TOOLCHAIN_GCC_ARM/max32625.ld
@@ -39,8 +39,8 @@ STACK_SIZE = MBED_CONF_TARGET_BOOT_STACK_SIZE;
 
 MEMORY
 {
-    FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00080000
-    RAM  (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00028000
+    FLASH (rx) : ORIGIN = MBED_CONFIGURED_ROM_BANK_IROM1_START, LENGTH = MBED_CONFIGURED_ROM_BANK_IROM1_SIZE
+    RAM  (rwx) : ORIGIN = MBED_CONFIGURED_RAM_BANK_IRAM1_START, LENGTH = MBED_CONFIGURED_RAM_BANK_IRAM1_SIZE
 }
 
 /* Linker script to place sections and symbol values. Should be used together

diff --git a/targets/cmsis_mcu_descriptions.json5 b/targets/cmsis_mcu_descriptions.json5
@@ -2397,8 +2397,8 @@
                     "write": true
                 },
                 "default": true,
-                "size": 163840,
-                "start": 536870912,
+                "size": 0x28000,
+                "start": 0x20000000,
                 "startup": false
             },
             "IROM1": {
@@ -2412,7 +2412,7 @@
                     "write": false
                 },
                 "default": true,
-                "size": 524288,
+                "size": 0x80000,
                 "start": 0,
                 "startup": true
             }

diff --git a/targets/targets.json5 b/targets/targets.json5
@@ -6463,9 +6463,6 @@
         "inherits": [
             "MAX32625_BASE"
         ],
-        "extra_labels_add": [
-            "MAX32625_NO_BOOT"
-        ],
         "detect_code": [
             "0415"
         ],
@@ -6475,9 +6472,6 @@
         "inherits": [
             "MAX32625_BASE"
         ],
-        "extra_labels_add": [
-            "MAX32625_NO_BOOT"
-        ],
         "detect_code": [
             "3102"
         ],
@@ -6487,10 +6481,16 @@
         "inherits": [
             "MAX32625_BASE"
         ],
-        "extra_labels_add": [
-            "MAX32625_BOOT"
-        ],
         "bootloader_supported": true,
+
+        // Reserve the first 64k of flash for the bootloader
+        "memory_bank_config": {
+            "IROM1": {
+                "start": 0x00010000,
+                "size": 0x00070000
+            }
+        },
+
         "detect_code": [
             "0444"
         ],
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,4 @@ target_include_directories(mbed-max32625mbed @@
             .
     )
-    target_link_libraries(mbed-max32625mbed INTERFACE mbed-max32625 mbed-max32625-no-boot)
+    target_link_libraries(mbed-max32625mbed INTERFACE mbed-max32625)