STM32 / CMAKE / targets : correct CMakeLists.txt files

pull/14154/head
jeromecoutant 2021-01-15 11:22:41 +01:00
parent 7ab7933d12
commit 1bbceb48f0
19 changed files with 41 additions and 33 deletions

View File

@ -49,6 +49,7 @@ target_sources(mbed-core
lp_ticker.c
mbed_crc_api.c
mbed_overrides.c
ospi_api.c
pinmap.c
port_api.c
pwmout_api.c

View File

@ -1,6 +1,12 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
if("NUCLEO_F103RB" IN_LIST MBED_TARGET_LABELS)
target_include_directories(mbed-core INTERFACE TARGET_NUCLEO_F103RB)
set(PERIPHERALPINS_FILE TARGET_NUCLEO_F103RB/PeripheralPins.c)
set(SYSTEM_CLOCK_FILE system_clock.c)
endif()
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32f103xb.S)
set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32f103xb.ld)
@ -13,8 +19,9 @@ set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}
target_sources(mbed-core
INTERFACE
system_clock.c
${PERIPHERALPINS_FILE}
${STARTUP_FILE}
${SYSTEM_CLOCK_FILE}
)
target_include_directories(mbed-core

View File

@ -15,6 +15,7 @@ target_sources(mbed-core
INTERFACE
system_clock.c
ONBOARD_TELIT_HE910.cpp
PeripheralPins.c
${STARTUP_FILE}
)

View File

@ -6,11 +6,11 @@ if("ARCH_MAX" IN_LIST MBED_TARGET_LABELS)
endif()
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32f401xe.S)
set(LINKER_FILE TOOLCHAIN_GCC_ARM/STM32F401XE.ld)
set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32f407xx.S)
set(LINKER_FILE TOOLCHAIN_GCC_ARM/STM32F407XG.ld)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32f401xe.S)
set(LINKER_FILE TOOLCHAIN_ARM/stm32f401xe.sct)
set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32f407xx.S)
set(LINKER_FILE TOOLCHAIN_ARM/STM32F407xx.sct)
endif()
set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})

View File

@ -8,11 +8,11 @@ elseif("UHURU_RAVEN" IN_LIST MBED_TARGET_LABELS)
endif()
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32f756xx.S)
set(LINKER_FILE TOOLCHAIN_GCC_ARM/STM32F756xG.ld)
set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32f767xx.S)
set(LINKER_FILE TOOLCHAIN_GCC_ARM/STM32F767xI.ld)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32f756xx.S)
set(LINKER_FILE TOOLCHAIN_ARM/stm32f756xg.sct)
set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32f767xx.S)
set(LINKER_FILE TOOLCHAIN_ARM/stm32f767xi.sct)
endif()
set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})

View File

@ -18,6 +18,7 @@ set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}
target_sources(mbed-core
INTERFACE
${STARTUP_FILE}
system_clock.c
)
target_include_directories(mbed-core

View File

@ -18,6 +18,7 @@ set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}
target_sources(mbed-core
INTERFACE
${STARTUP_FILE}
system_clock.c
)
target_include_directories(mbed-core

View File

@ -2,11 +2,11 @@
# SPDX-License-Identifier: Apache-2.0
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_stm32l152xe.S)
set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/stm32l152re.ld)
set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_stm32l152xc.S)
set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/STM32L152XC.ld)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
set(STARTUP_FILE device/TOOLCHAIN_ARM/startup_stm32l152xe.S)
set(LINKER_FILE device/TOOLCHAIN_ARM/stm32l152re.sct)
set(STARTUP_FILE device/TOOLCHAIN_ARM/startup_stm32l152xc.S)
set(LINKER_FILE device/TOOLCHAIN_ARM/stm32l152rc.sct)
endif()
set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})

View File

@ -3,7 +3,7 @@
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_stm32l152xe.S)
set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/stm32l152re.ld)
set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/STM32L152XE.ld)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
set(STARTUP_FILE device/TOOLCHAIN_ARM/startup_stm32l152xe.S)
set(LINKER_FILE device/TOOLCHAIN_ARM/stm32l152re.sct)

View File

@ -2,7 +2,9 @@
# SPDX-License-Identifier: Apache-2.0
if("NUCLEO_L432KC" IN_LIST MBED_TARGET_LABELS)
add_subdirectory(TARGET_NUCLEO_L432KC)
target_include_directories(mbed-core INTERFACE TARGET_NUCLEO_L432KC)
set(PERIPHERALPINS_FILE TARGET_NUCLEO_L432KC/PeripheralPins.c)
set(SYSTEM_CLOCK_FILE system_clock.c)
endif()
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
@ -17,7 +19,9 @@ set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}
target_sources(mbed-core
INTERFACE
${PERIPHERALPINS_FILE}
${STARTUP_FILE}
${SYSTEM_CLOCK_FILE}
)
target_include_directories(mbed-core

View File

@ -2,7 +2,9 @@
# SPDX-License-Identifier: Apache-2.0
if("NUCLEO_L433RC_P" IN_LIST MBED_TARGET_LABELS)
add_subdirectory(TARGET_NUCLEO_L433RC_P)
target_include_directories(mbed-core INTERFACE TARGET_NUCLEO_L433RC_P)
set(PERIPHERALPINS_FILE TARGET_NUCLEO_L433RC_P/PeripheralPins.c)
set(SYSTEM_CLOCK_FILE system_clock.c)
endif()
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
@ -17,7 +19,9 @@ set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}
target_sources(mbed-core
INTERFACE
${PERIPHERALPINS_FILE}
${STARTUP_FILE}
${SYSTEM_CLOCK_FILE}
)
target_include_directories(mbed-core

View File

@ -18,6 +18,7 @@ set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}
target_sources(mbed-core
INTERFACE
${STARTUP_FILE}
system_clock.c
)
target_include_directories(mbed-core

View File

@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0
if("DISCO_L476VG" IN_LIST MBED_TARGET_LABELS)
add_subdirectory(TARGET_MTS_DRAGONFLY_L471QG)
add_subdirectory(TARGET_DISCO_L476VG)
elseif("NUCLEO_L476RG" IN_LIST MBED_TARGET_LABELS)
add_subdirectory(TARGET_NUCLEO_L476RG)
elseif("RHOMBIO_L476DMW1K" IN_LIST MBED_TARGET_LABELS)

View File

@ -19,7 +19,6 @@ set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}
target_sources(mbed-core
INTERFACE
system_clock.c
${STARTUP_FILE}
)

View File

@ -1,12 +0,0 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
target_sources(mbed-core
INTERFACE
PeripheralPins.c
)
target_include_directories(mbed-core
INTERFACE
.
)

View File

@ -19,6 +19,7 @@ target_sources(mbed-core
gpio_irq_device.c
pwmout_device.c
serial_device.c
system_clock.c
spi_api.c
)

View File

@ -7,10 +7,10 @@ endif()
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32l552xx.S)
set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32l552xc.ld)
set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32l552xe.ld)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32l552xx.S)
set(LINKER_FILE TOOLCHAIN_ARM/stm32l552xc.sct)
set(LINKER_FILE TOOLCHAIN_ARM/stm32l552xe.sct)
endif()
set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})

View File

@ -12,12 +12,12 @@ add_subdirectory(STM32Cube_FW)
target_sources(mbed-core
INTERFACE
analogin_device.c
analogout_device.c
flash_api.c
gpio_irq_device.c
pwmout_device.c
serial_device.c
spi_api.c
wb_sleep.c
)
target_include_directories(mbed-core