Skip to content

Commit e419e41

Browse files
committed
CMake: Fix selection of scatter file and startup file for DISCO_L475_IOT01A
1 parent 053c648 commit e419e41

File tree

4 files changed

+3
-452
lines changed

4 files changed

+3
-452
lines changed

targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ function(_mbed_get_assembly_disco_l475vg_iot01a)
55
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
66
set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32l475xx.S)
77
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
8-
set(STARTUP_FILE TOOLCHAIN_ARM_STD/startup_stm32l475xx.S)
8+
set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32l475xx.S)
99
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
1010
set(STARTUP_FILE TOOLCHAIN_IAR/startup_stm32l475xx.S)
1111
endif()
@@ -16,7 +16,7 @@ function(_mbed_set_linker_file)
1616
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
1717
set(LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/TOOLCHAIN_GCC_ARM/STM32L475XX.ld)
1818
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
19-
set(LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/TOOLCHAIN_ARM_STD/stm32l475xx.sct)
19+
set(LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/TOOLCHAIN_ARM/stm32l475xx.sct)
2020
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
2121
set(LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/TOOLCHAIN_IAR/stm32l475xx.icf)
2222
endif()

targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/TOOLCHAIN_ARM/stm32l475xx.sct

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#! armcc -E
1+
#! armclang -E --target=arm-arm-none-eabi -x c -mcpu=cortex-m4
22
; Scatter-Loading Description File
33
;
44
; SPDX-License-Identifier: BSD-3-Clause

targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/TOOLCHAIN_ARM_STD/startup_stm32l475xx.S

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

0 commit comments

Comments
 (0)