Skip to content

Commit 4db4364

Browse files
Sadik.OzerSadik.Ozer
authored andcommitted
Remove device folder as subdir
Signed-off-by: Sadik.Ozer <[email protected]>
1 parent de4d4ca commit 4db4364

File tree

2 files changed

+12
-31
lines changed

2 files changed

+12
-31
lines changed

targets/TARGET_Maxim/TARGET_MAX32660/CMakeLists.txt

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,17 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
add_subdirectory(TARGET_MAX32660EVSYS EXCLUDE_FROM_ALL)
5-
add_subdirectory(device EXCLUDE_FROM_ALL)
65

7-
add_library(mbed-max32660 INTERFACE)
6+
if(${MBED_TOOLCHAIN} STREQUAL "ARM")
7+
set(LINKER_FILE device/TOOLCHAIN_ARM_STD/MAX32660.sct)
8+
set(STARTUP_FILE device/TOOLCHAIN_ARM_STD/startup_MAX32660.S)
9+
elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
10+
set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/max32660.ld)
11+
set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_max32660.S)
12+
endif()
813

14+
add_library(mbed-max32660 INTERFACE)
15+
mbed_set_linker_script(mbed-max32660 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
916

1017
set(MXM_PARTNUMBER MAX32660)
1118
set(MXM_SOURCE_DIR ./Libraries/PeriphDrivers/Source)
@@ -15,6 +22,7 @@ set(MXM_CMSIS_DIR ./Libraries/CMSIS/Device/Maxim)
1522
target_include_directories(mbed-max32660
1623
INTERFACE
1724
.
25+
device
1826

1927
${MXM_PERIPH_DRIVER_DIR}/Include/${MXM_PARTNUMBER}
2028
${MXM_CMSIS_DIR}/${MXM_PARTNUMBER}/Include
@@ -99,6 +107,8 @@ target_sources(mbed-max32660
99107
${MXM_SOURCE_DIR}/WDT/wdt_common.c
100108
${MXM_SOURCE_DIR}/WDT/wdt_me11.c
101109
${MXM_SOURCE_DIR}/WDT/wdt_reva.c
110+
111+
${STARTUP_FILE}
102112
)
103113

104114
target_link_libraries(mbed-max32660

targets/TARGET_Maxim/TARGET_MAX32660/device/CMakeLists.txt

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)