michaelh/zephyr
1
0
Fork 0
Code Releases Activity

extensions.cmake: Replace TEXT_START with ROM_START

Browse source 
In zephyr_linker_sources().
This is done since the point of the location is to place things at given
offsets. This can only be done consistenly if the linker code is placed
into the _first_ section.

All uses of TEXT_START are replaced with ROM_START.

ROM_START is only supported in some arches, as some arches have several
custom sections before text. These don't currently have ROM_START or
TEXT_START available, but that could be added with a bit of refactoring
in their linker script.

No SORT_KEYs are changed.

This also fixes an error introduced when TEXT_START was added, where
TEXT_SECTION_OFFSET was applied to riscv's common linker.ld instead of
to openisa_rv32m1's specific linker.ld.

Signed-off-by: Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>
This commit is contained in:
Øyvind Rønningstad 2020-01-17 14:36:19 +01:00 • committed by Andrew Boie
commit 05f0d85b6a
16 changed files with 39 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/arc/core/CMakeLists.txt
View file

@ -31,4 +31,4 @@ zephyr_library_sources_ifdef(CONFIG_ARC_CONNECT arc_smp.c)
add_subdirectory_ifdef(CONFIG_ARC_CORE_MPU mpu) add_subdirectory_ifdef(CONFIG_ARC_CORE_MPU mpu)
add_subdirectory_ifdef(CONFIG_ARC_SECURE_FIRMWARE secureshield) add_subdirectory_ifdef(CONFIG_ARC_SECURE_FIRMWARE secureshield)
zephyr_linker_sources(TEXT_START SORT_KEY 0x0vectors vector_table.ld) zephyr_linker_sources(ROM_START SORT_KEY 0x0vectors vector_table.ld)

2
arch/arm/core/aarch32/CMakeLists.txt
View file

@ -34,4 +34,4 @@ add_subdirectory_ifdef(CONFIG_ARM_NONSECURE_FIRMWARE cortex_m/tz)
add_subdirectory_ifdef(CONFIG_CPU_CORTEX_R cortex_r) add_subdirectory_ifdef(CONFIG_CPU_CORTEX_R cortex_r)
zephyr_linker_sources(TEXT_START SORT_KEY 0x0vectors vector_table.ld) zephyr_linker_sources(ROM_START SORT_KEY 0x0vectors vector_table.ld)

2
arch/arm/core/aarch32/cortex_m/CMakeLists.txt
View file

@ -12,7 +12,7 @@ zephyr_library_sources(
) )
zephyr_linker_sources_ifdef(CONFIG_SW_VECTOR_RELAY zephyr_linker_sources_ifdef(CONFIG_SW_VECTOR_RELAY
TEXT_START ROM_START
SORT_KEY 0x0relay_vectors SORT_KEY 0x0relay_vectors
relay_vector_table.ld relay_vector_table.ld
) )

7
arch/common/CMakeLists.txt
View file

@ -34,7 +34,8 @@ zephyr_linker_sources_ifdef(CONFIG_NOCACHE_MEMORY
nocache.ld nocache.ld
) )
# Only ARM, X86 and RISCV use TEXT_SECTION_OFFSET # Only ARM, X86 and OPENISA_RV32M1_RISCV32 use TEXT_SECTION_OFFSET.
if (DEFINED CONFIG_ARM OR DEFINED CONFIG_X86 OR DEFINED CONFIG_RISCV) if (DEFINED CONFIG_ARM OR DEFINED CONFIG_X86
zephyr_linker_sources(TEXT_START SORT_KEY 0x0 text_section_offset.ld) OR DEFINED CONFIG_SOC_OPENISA_RV32M1_RISCV32)
zephyr_linker_sources(ROM_START SORT_KEY 0x0 text_section_offset.ld)
endif() endif()

15
cmake/extensions.cmake
View file

@ -873,8 +873,9 @@ endfunction(zephyr_check_compiler_flag_hardcoded)
# NOINIT Inside the noinit output section. # NOINIT Inside the noinit output section.
# RWDATA Inside the data output section. # RWDATA Inside the data output section.
# RODATA Inside the rodata output section. # RODATA Inside the rodata output section.
# TEXT_START At the beginning of the text section, i.e. the beginning of # ROM_START Inside the first output section of the image. This option is
# the image. # currently only available on ARM Cortex-M, ARM Cortex-R,
# x86, ARC, and openisa_rv32m1.
# RAM_SECTIONS Inside the RAMABLE_REGION GROUP. # RAM_SECTIONS Inside the RAMABLE_REGION GROUP.
# SECTIONS Near the end of the file. Don't use this when linking into # SECTIONS Near the end of the file. Don't use this when linking into
# RAMABLE_REGION, use RAM_SECTIONS instead. # RAMABLE_REGION, use RAM_SECTIONS instead.
@ -884,7 +885,7 @@ endfunction(zephyr_check_compiler_flag_hardcoded)
# #
# Use NOINIT, RWDATA, and RODATA unless they don't work for your use case. # Use NOINIT, RWDATA, and RODATA unless they don't work for your use case.
# #
# When placing into NOINIT, RWDATA, RODATA, or TEXT_START the contents of the files # When placing into NOINIT, RWDATA, RODATA, ROM_START, the contents of the files
# will be placed inside an output section, so assume the section definition is # will be placed inside an output section, so assume the section definition is
# already present, e.g.: # already present, e.g.:
# _mysection_start = .; # _mysection_start = .;
@ -914,7 +915,7 @@ function(zephyr_linker_sources location)
set(snippet_base "${__build_dir}/include/generated") set(snippet_base "${__build_dir}/include/generated")
set(sections_path "${snippet_base}/snippets-sections.ld") set(sections_path "${snippet_base}/snippets-sections.ld")
set(ram_sections_path "${snippet_base}/snippets-ram-sections.ld") set(ram_sections_path "${snippet_base}/snippets-ram-sections.ld")
set(text_start_path "${snippet_base}/snippets-text-start.ld") set(rom_start_path "${snippet_base}/snippets-rom-start.ld")
set(noinit_path "${snippet_base}/snippets-noinit.ld") set(noinit_path "${snippet_base}/snippets-noinit.ld")
set(rwdata_path "${snippet_base}/snippets-rwdata.ld") set(rwdata_path "${snippet_base}/snippets-rwdata.ld")
set(rodata_path "${snippet_base}/snippets-rodata.ld") set(rodata_path "${snippet_base}/snippets-rodata.ld")
@ -924,7 +925,7 @@ function(zephyr_linker_sources location)
if (NOT DEFINED cleared) if (NOT DEFINED cleared)
file(WRITE ${sections_path} "") file(WRITE ${sections_path} "")
file(WRITE ${ram_sections_path} "") file(WRITE ${ram_sections_path} "")
file(WRITE ${text_start_path} "") file(WRITE ${rom_start_path} "")
file(WRITE ${noinit_path} "") file(WRITE ${noinit_path} "")
file(WRITE ${rwdata_path} "") file(WRITE ${rwdata_path} "")
file(WRITE ${rodata_path} "") file(WRITE ${rodata_path} "")
@ -936,8 +937,8 @@ function(zephyr_linker_sources location)
set(snippet_path "${sections_path}") set(snippet_path "${sections_path}")
elseif("${location}" STREQUAL "RAM_SECTIONS") elseif("${location}" STREQUAL "RAM_SECTIONS")
set(snippet_path "${ram_sections_path}") set(snippet_path "${ram_sections_path}")
elseif("${location}" STREQUAL "TEXT_START") elseif("${location}" STREQUAL "ROM_START")
set(snippet_path "${text_start_path}") set(snippet_path "${rom_start_path}")
elseif("${location}" STREQUAL "NOINIT") elseif("${location}" STREQUAL "NOINIT")
set(snippet_path "${noinit_path}") set(snippet_path "${noinit_path}")
elseif("${location}" STREQUAL "RWDATA") elseif("${location}" STREQUAL "RWDATA")

7
include/arch/arc/v2/linker.ld
View file

@ -87,10 +87,11 @@ SECTIONS {
_image_rom_start = .; _image_rom_start = .;
_image_text_start = .; _image_text_start = .;
/* Located in generated directory. This file is populated by the /* Located in generated directory. This file is populated by calling
* zephyr_linker_sources() Cmake function. * zephyr_linker_sources(ROM_START ...). This typically contains the vector
* table and debug information.
*/ */
#include <snippets-text-start.ld> #include <snippets-rom-start.ld>
*(.text) *(.text)
*(".text.*") *(".text.*")

7
include/arch/arm/aarch32/cortex_m/scripts/linker.ld
View file

@ -138,10 +138,11 @@ SECTIONS
SECTION_PROLOGUE(rom_start,,) SECTION_PROLOGUE(rom_start,,)
{ {
/* Located in generated directory. This file is populated by the /* Located in generated directory. This file is populated by calling
* zephyr_linker_sources() Cmake function. * zephyr_linker_sources(ROM_START ...). This typically contains the vector
* table and debug information.
*/ */
#include <snippets-text-start.ld> #include <snippets-rom-start.ld>
} GROUP_LINK_IN(ROMABLE_REGION) } GROUP_LINK_IN(ROMABLE_REGION)

7
include/arch/arm/aarch32/cortex_r/scripts/linker.ld
View file

@ -135,10 +135,11 @@ SECTIONS
SECTION_PROLOGUE(_TEXT_SECTION_NAME,,) SECTION_PROLOGUE(_TEXT_SECTION_NAME,,)
{ {
/* Located in generated directory. This file is populated by the /* Located in generated directory. This file is populated by calling
* zephyr_linker_sources() Cmake function. * zephyr_linker_sources(ROM_START ...). This typically contains the vector
* table and debug information.
*/ */
#include <snippets-text-start.ld> #include <snippets-rom-start.ld>
} GROUP_LINK_IN(ROMABLE_REGION) } GROUP_LINK_IN(ROMABLE_REGION)

5
include/arch/nios2/linker.ld
View file

@ -121,11 +121,6 @@ SECTIONS
_image_text_start = .; _image_text_start = .;
/* Located in generated directory. This file is populated by the
* zephyr_linker_sources() Cmake function.
*/
#include <snippets-text-start.ld>
*(.text) *(.text)
*(".text.*") *(".text.*")
*(.gnu.linkonce.t.*) *(.gnu.linkonce.t.*)

5
include/arch/riscv/common/linker.ld
View file

@ -89,11 +89,6 @@ SECTIONS
_image_text_start = .; _image_text_start = .;
/* Located in generated directory. This file is populated by the
* zephyr_linker_sources() Cmake function.
*/
#include <snippets-text-start.ld>
*(.text) *(.text)
*(".text.*") *(".text.*")
*(.gnu.linkonce.t.*) *(.gnu.linkonce.t.*)

7
include/arch/x86/ia32/linker.ld
View file

@ -86,10 +86,11 @@ SECTIONS
SECTION_PROLOGUE(_TEXT_SECTION_NAME,,) SECTION_PROLOGUE(_TEXT_SECTION_NAME,,)
{ {
/* Located in generated directory. This file is populated by the /* Located in generated directory. This file is populated by calling
* zephyr_linker_sources() Cmake function. * zephyr_linker_sources(ROM_START ...). This typically contains the vector
* table and debug information.
*/ */
#include <snippets-text-start.ld> #include <snippets-rom-start.ld>
*(.text_start) *(.text_start)
*(".text_start.*") *(".text_start.*")

2
soc/arm/nxp_imx/rt/CMakeLists.txt
View file

@ -9,4 +9,4 @@ zephyr_sources(
) )
zephyr_linker_sources_ifdef(CONFIG_NXP_IMX_RT_BOOT_HEADER zephyr_linker_sources_ifdef(CONFIG_NXP_IMX_RT_BOOT_HEADER
TEXT_START SORT_KEY 0 boot_header.ld) ROM_START SORT_KEY 0 boot_header.ld)

2
soc/arm/nxp_kinetis/CMakeLists.txt
View file

@ -5,7 +5,7 @@ zephyr_sources_ifdef(CONFIG_KINETIS_FLASH_CONFIG flash_configuration.c)
add_subdirectory(${SOC_SERIES}) add_subdirectory(${SOC_SERIES})
zephyr_linker_sources_ifdef(CONFIG_KINETIS_FLASH_CONFIG zephyr_linker_sources_ifdef(CONFIG_KINETIS_FLASH_CONFIG
TEXT_START ROM_START
SORT_KEY ${CONFIG_KINETIS_FLASH_CONFIG_OFFSET} SORT_KEY ${CONFIG_KINETIS_FLASH_CONFIG_OFFSET}
flash_config.ld flash_config.ld
) )

2
soc/arm/ti_simplelink/cc32xx/CMakeLists.txt
View file

@ -3,5 +3,5 @@
zephyr_sources(soc.c) zephyr_sources(soc.c)
if (DEFINED CONFIG_CC3220SF_DEBUG OR DEFINED CONFIG_CC3235SF_DEBUG) if (DEFINED CONFIG_CC3220SF_DEBUG OR DEFINED CONFIG_CC3235SF_DEBUG)
zephyr_linker_sources(TEXT_START SORT_KEY 0 cc32xx_debug.ld) zephyr_linker_sources(ROM_START SORT_KEY 0 cc32xx_debug.ld)
endif() endif()

2
soc/riscv/openisa_rv32m1/CMakeLists.txt
View file

@ -19,4 +19,4 @@ zephyr_sources(
soc.c soc.c
) )
zephyr_linker_sources(TEXT_START SORT_KEY 0x0vectors vector_table.ld) zephyr_linker_sources(ROM_START SORT_KEY 0x0vectors vector_table.ld)

7
soc/riscv/openisa_rv32m1/linker.ld
View file

@ -104,10 +104,11 @@ SECTIONS
SECTION_PROLOGUE(_TEXT_SECTION_NAME,,) SECTION_PROLOGUE(_TEXT_SECTION_NAME,,)
{ {
/* Located in generated directory. This file is populated by the /* Located in generated directory. This file is populated by calling
* zephyr_linker_sources() Cmake function. * zephyr_linker_sources(ROM_START ...). This typically contains the vector
* table and debug information.
*/ */
#include <snippets-text-start.ld> #include <snippets-rom-start.ld>
_image_text_start = .; _image_text_start = .;