Skip to content

Unify some STM32L4 linker scripts into one #440

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

Merged
merged 4 commits into from
Mar 18, 2025
Merged

Unify some STM32L4 linker scripts into one #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6db8833
Unify some STM32L4 linker scripts into one
multiplemonomials Mar 13, 2025
c89ece6
Standardize all the cmsis_nvic.h defines
multiplemonomials Mar 18, 2025
6175bbf
Fix an annoyance
multiplemonomials Mar 18, 2025
48eb838
Fix totally broken stack configuration on STM32L4
multiplemonomials Mar 18, 2025
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ if("MBED_CONF_TARGET_APPLICATION_PROFILE=full" IN_LIST MBED_CONFIG_DEFINITIONS O
elseif("MBED_CONF_TARGET_APPLICATION_PROFILE=bare-metal" IN_LIST MBED_CONFIG_DEFINITIONS)
set(APPLICATION_PROFILE_CONFIG_BAREMETAL TRUE)
else()
message(FATAL_ERROR "target.application-profile must be set to either 'full' or 'bare-metal'!")
message(FATAL_ERROR "target.application-profile must be set to either 'full' or 'bare-metal'! If you are getting this after upgrading mbed-os then you likely need to clear your CMake cache.")
endif()

# mbed-core-flags/mbed-core-sources link mbed-rtos-flags/mbed-rtos-sources or not depending on
Expand Down
1 change: 1 addition & 0 deletions targets/TARGET_STM/TARGET_STM32L4/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ add_subdirectory(TARGET_STM32L4R5xI EXCLUDE_FROM_ALL)
add_subdirectory(TARGET_STM32L4R9xI EXCLUDE_FROM_ALL)
add_subdirectory(TARGET_STM32L4S5xI EXCLUDE_FROM_ALL)
add_subdirectory(STM32Cube_FW EXCLUDE_FROM_ALL)
add_subdirectory(linker_scripts)

add_library(mbed-stm32l4 INTERFACE)

Expand Down
4 changes: 1 addition & 3 deletions targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L432xC/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ add_subdirectory(TARGET_NUCLEO_L432KC EXCLUDE_FROM_ALL)

if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32l432xx.S)
set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32l432xc.ld)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32l432xx.S)
set(LINKER_FILE TOOLCHAIN_ARM/stm32l432xc.sct)
endif()

add_library(mbed-stm32l432xc INTERFACE)
Expand All @@ -23,5 +21,5 @@ target_include_directories(mbed-stm32l432xc
INTERFACE
.
)
mbed_set_linker_script(mbed-stm32l432xc ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})

target_link_libraries(mbed-stm32l432xc INTERFACE mbed-stm32l4)
203 changes: 0 additions & 203 deletions targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L432xC/TOOLCHAIN_GCC_ARM/stm32l432xc.ld
View file
Open in desktop

This file was deleted.

26 changes: 1 addition & 25 deletions targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L432xC/cmsis_nvic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,7 @@
#ifndef MBED_CMSIS_NVIC_H
#define MBED_CMSIS_NVIC_H

#if !defined(MBED_ROM_START)
#define MBED_ROM_START 0x8000000
#endif

#if !defined(MBED_ROM_SIZE)
#define MBED_ROM_SIZE 0x40000 // 256 KB
#endif

#if !defined(MBED_RAM_START)
#define MBED_RAM_START 0x20000000
#endif

#if !defined(MBED_RAM_SIZE)
#define MBED_RAM_SIZE 0xc000 // 48 KB
#endif

#if !defined(MBED_RAM1_START)
#define MBED_RAM1_START 0x10000000
#endif

#if !defined(MBED_RAM1_SIZE)
#define MBED_RAM1_SIZE 0x4000 // 16 KB
#endif

#define NVIC_NUM_VECTORS 99
#define NVIC_RAM_VECTOR_ADDRESS MBED_RAM_START
#define NVIC_RAM_VECTOR_ADDRESS MBED_RAM_BANK_IRAM2_START

#endif
Loading