Skip to content

Commit ecb1e2d

Browse files
committed
Fix stm32u5 TZEN CMake build
1 parent 84f762b commit ecb1e2d

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,11 @@ if(ARCH STREQUAL "ARM")
668668
endif()
669669
if(${WOLFBOOT_TARGET} STREQUAL "stm32u5")
670670
set(ARCH_FLASH_OFFSET 0x08000000)
671-
set(WOLFBOOT_ORIGIN ${ARCH_FLASH_OFFSET})
671+
if(TZEN)
672+
set(WOLFBOOT_ORIGIN 0x0C000000)
673+
else()
674+
set(WOLFBOOT_ORIGIN ${ARCH_FLASH_OFFSET})
675+
endif()
672676
endif()
673677

674678
if(${WOLFBOOT_TARGET} STREQUAL "stm32h5")

test-app/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,11 @@ endif()
5252
if("${WOLFBOOT_TARGET}" STREQUAL "stm32h7")
5353
set(APP_LSCRIPT_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/ARM-stm32h7.ld)
5454
elseif("${WOLFBOOT_TARGET}" STREQUAL "stm32u5")
55-
set(APP_LSCRIPT_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/ARM-stm32u5.ld)
55+
if(TZEN)
56+
set(APP_LSCRIPT_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/ARM-stm32u5-ns.ld)
57+
else()
58+
set(APP_LSCRIPT_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/ARM-stm32u5.ld)
59+
endif()
5660
elseif("${WOLFBOOT_TARGET}" STREQUAL "stm32h5")
5761
if(TZEN)
5862
set(APP_LSCRIPT_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/ARM-stm32h5-ns.ld)

0 commit comments

Comments
 (0)