Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unify MAX32625 targets #327

Merged
merged 1 commit into from
Sep 13, 2024
Merged

Unify MAX32625 targets #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions targets/TARGET_Maxim/TARGET_MAX32625/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
2 changes: 1 addition & 1 deletion targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625MBED/CMakeLists.txt
View file
Open in desktop
Original file line number Diff 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)
2 changes: 1 addition & 1 deletion targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625PICO/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion targets/TARGET_Maxim/TARGET_MAX32625/TARGET_SDT32625B/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
26 changes: 0 additions & 26 deletions targets/TARGET_Maxim/TARGET_MAX32625/device/CMakeLists.txt
View file
Open in desktop

This file was deleted.

191 changes: 0 additions & 191 deletions ...ts/TARGET_Maxim/TARGET_MAX32625/device/TOOLCHAIN_GCC_ARM/TARGET_MAX32625_BOOT/max32625.ld
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...C_ARM/TARGET_MAX32625_NO_BOOT/max32625.ld → ...2625/device/TOOLCHAIN_GCC_ARM/max32625.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions targets/cmsis_mcu_descriptions.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2397,8 +2397,8 @@
"write": true
},
"default": true,
"size": 163840,
"start": 536870912,
"size": 0x28000,
"start": 0x20000000,
"startup": false
},
"IROM1": {
Expand All @@ -2412,7 +2412,7 @@
"write": false
},
"default": true,
"size": 524288,
"size": 0x80000,
"start": 0,
"startup": true
}
Expand Down
18 changes: 9 additions & 9 deletions targets/targets.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6463,9 +6463,6 @@
"inherits": [
"MAX32625_BASE"
],
"extra_labels_add": [
"MAX32625_NO_BOOT"
],
"detect_code": [
"0415"
],
Expand All @@ -6475,9 +6472,6 @@
"inherits": [
"MAX32625_BASE"
],
"extra_labels_add": [
"MAX32625_NO_BOOT"
],
"detect_code": [
"3102"
],
Expand All @@ -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"
],
Expand Down
Loading