Merge pull request #14266 from rwalton-arm/dev/rwalton-arm/fix-st-targets

Fix up some ST CMake targets
pull/14242/head
Martin Kojtal 2021-02-11 13:15:32 +00:00 committed by GitHub
commit 2f7728eed5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 57 additions and 10 deletions

View File

@ -12,3 +12,5 @@ target_include_directories(mbed-nucleo-g431kb
INTERFACE
.
)
target_link_libraries(mbed-nucleo-g431kb INTERFACE mbed-stm32g431xb)

View File

@ -1,10 +1,10 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
add_subdirectory(TARGET_STM32H747xI_CM4 EXCLUDE_FROM_ALL)
add_subdirectory(TARGET_STM32H747xI_CM7 EXCLUDE_FROM_ALL)
add_subdirectory(TARGET_DISCO_H747I EXCLUDE_FROM_ALL)
add_subdirectory(TARGET_PORTENTA_H7 EXCLUDE_FROM_ALL)
add_subdirectory(TARGET_STM32H747xI_CM7 EXCLUDE_FROM_ALL)
add_subdirectory(TARGET_STM32H747xI_CM4 EXCLUDE_FROM_ALL)
add_library(mbed-stm32h747xi INTERFACE)

View File

@ -13,10 +13,34 @@ target_include_directories(mbed-disco-h747i
.
)
target_link_libraries(mbed-disco-h747i INTERFACE mbed-stm32h747xi mbed-stm32h747xi-cm7)
target_link_libraries(mbed-disco-h747i INTERFACE mbed-stm32h747xi-cm7)
add_library(mbed-disco-h747i-cm7 INTERFACE)
target_link_libraries(mbed-disco-h747i-cm7 INTERFACE mbed-stm32h747xi mbed-stm32h747xi-cm7)
target_sources(mbed-disco-h747i-cm7
INTERFACE
PeripheralPins.c
)
target_include_directories(mbed-disco-h747i-cm7
INTERFACE
.
)
target_link_libraries(mbed-disco-h747i-cm7 INTERFACE mbed-stm32h747xi-cm7)
add_library(mbed-disco-h747i-cm4 INTERFACE)
target_link_libraries(mbed-disco-h747i-cm4 INTERFACE mbed-stm32h747xi mbed-stm32h747xi-cm4)
target_sources(mbed-disco-h747i-cm4
INTERFACE
PeripheralPins.c
)
target_include_directories(mbed-disco-h747i-cm4
INTERFACE
.
)
target_link_libraries(mbed-disco-h747i-cm4 INTERFACE mbed-stm32h747xi-cm4)

View File

@ -1,18 +1,35 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
add_library(mbed-portenta-h7 INTERFACE)
add_library(mbed-portenta-h7-m4 INTERFACE)
target_sources(mbed-portenta-h7
target_sources(mbed-portenta-h7-m4
INTERFACE
PeripheralPins.c
system_clock_override.c
portenta_power.cpp
)
target_include_directories(mbed-portenta-h7
target_include_directories(mbed-portenta-h7-m4
INTERFACE
.
)
target_link_libraries(mbed-portenta-h7 INTERFACE mbed-stm32h747xi)
target_link_libraries(mbed-portenta-h7-m4 INTERFACE mbed-stm32h747xi-cm4)
add_library(mbed-portenta-h7-m7 INTERFACE)
target_sources(mbed-portenta-h7-m7
INTERFACE
PeripheralPins.c
system_clock_override.c
portenta_power.cpp
)
target_include_directories(mbed-portenta-h7-m7
INTERFACE
.
)
target_link_libraries(mbed-portenta-h7-m7 INTERFACE mbed-stm32h747xi-cm7)

View File

@ -5,7 +5,7 @@ add_subdirectory(TARGET_NUCLEO_L073RZ EXCLUDE_FROM_ALL)
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32l073xx.S)
set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32l073xz.ld)
set(LINKER_FILE TOOLCHAIN_GCC_ARM/STM32L073XZ.ld)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32l073xx.S)
set(LINKER_FILE TOOLCHAIN_ARM/stm32l073xz.sct)

View File

@ -14,3 +14,7 @@ target_include_directories(mbed-nucleo-l4r5zi
)
target_link_libraries(mbed-nucleo-l4r5zi INTERFACE mbed-stm32l4r5xi)
add_library(mbed-nucleo-l4r5zi-p INTERFACE)
target_link_libraries(mbed-nucleo-l4r5zi-p INTERFACE mbed-nucleo-l4r5zi)