1bd0b29918
Fixes: #28847 This commit fixes two places that was causing gen_relocate_app to fail in windows. gen_relocate_app.py now splits only on first `:` in `<MEM_REGION>:<file>`. Windows contains `:` in path, thus only first `:` is valid for splitting mem region and file path. Second part of the issue is fixed in CMake where `'` was used for quoting of command arguments. This causes a file not found on Windows because the final `'` would be treated as part of the filename. Similar the first `'` would be treated as path of the mem region name. This is fixed by using `"` for quoting, which works correctly on all platforms. gen_relocate_app.py:403: UserWarning: File: .../kernel/sem.c' Not found Note the stray `'` ^^^ Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
31 lines
1.2 KiB
CMake
31 lines
1.2 KiB
CMake
# SPDX-License-Identifier: Apache-2.0
|
|
|
|
# See root CMakeLists.txt for description and expectations of these macros
|
|
|
|
macro(toolchain_ld_relocation)
|
|
set(MEM_RELOCATION_LD "${PROJECT_BINARY_DIR}/include/generated/linker_relocate.ld")
|
|
set(MEM_RELOCATION_SRAM_DATA_LD
|
|
"${PROJECT_BINARY_DIR}/include/generated/linker_sram_data_relocate.ld")
|
|
set(MEM_RELOCATION_SRAM_BSS_LD
|
|
"${PROJECT_BINARY_DIR}/include/generated/linker_sram_bss_relocate.ld")
|
|
set(MEM_RELOCATION_CODE "${PROJECT_BINARY_DIR}/code_relocation.c")
|
|
|
|
add_custom_command(
|
|
OUTPUT ${MEM_RELOCATION_CODE} ${MEM_RELOCATION_LD}
|
|
COMMAND
|
|
${PYTHON_EXECUTABLE}
|
|
${ZEPHYR_BASE}/scripts/gen_relocate_app.py
|
|
$<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
|
|
-d ${APPLICATION_BINARY_DIR}
|
|
-i \"$<TARGET_PROPERTY:code_data_relocation_target,COMPILE_DEFINITIONS>\"
|
|
-o ${MEM_RELOCATION_LD}
|
|
-s ${MEM_RELOCATION_SRAM_DATA_LD}
|
|
-b ${MEM_RELOCATION_SRAM_BSS_LD}
|
|
-c ${MEM_RELOCATION_CODE}
|
|
DEPENDS app kernel ${ZEPHYR_LIBS_PROPERTY}
|
|
)
|
|
|
|
add_library(code_relocation_source_lib STATIC ${MEM_RELOCATION_CODE})
|
|
target_link_libraries(code_relocation_source_lib zephyr_interface)
|
|
endmacro()
|