Skip to content

Commit d342e4c

Browse files
gmarullnashif
gmarull
authored and
nashif
committed
linker: update files with <zephyr/...> include prefix
Linker files were not migrated with the new <zephyr/...> prefix. Note that the conversion has been scripted, refer to #45388 for more details. Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
1 parent 76e7164 commit d342e4c

File tree

164 files changed

+482
-459
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+482
-459
lines changed

‎boards/arm/ip_k66f/linker.ld‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ ITERABLE_SECTION_RAM(net_if_dev, 4) \
4242
ITERABLE_SECTION_RAM(net_l2, 4) \
4343
ITERABLE_SECTION_RAM(eth_bridge, 4)
4444

45-
#include <arch/arm/aarch32/cortex_m/scripts/linker.ld>
45+
#include <zephyr/arch/arm/aarch32/cortex_m/scripts/linker.ld>

‎boards/x86/qemu_x86/qemu_x86_tiny.ld‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
* SPDX-License-Identifier: Apache-2.0
66
*/
77

8-
#include <devicetree.h>
8+
#include <zephyr/devicetree.h>
99
#include <offsets.h>
10-
#include <linker/linker-defs.h>
11-
#include <linker/linker-tool.h>
12-
#include <sys/util.h>
13-
#include <sys/mem_manage.h>
10+
#include <zephyr/linker/linker-defs.h>
11+
#include <zephyr/linker/linker-tool.h>
12+
#include <zephyr/sys/util.h>
13+
#include <zephyr/sys/mem_manage.h>
1414

1515

1616
/* Bounds of physical RAM from DTS */
@@ -241,7 +241,7 @@ ENTRY(epoint)
241241
SECTIONS
242242
{
243243

244-
#include <linker/rel-sections.ld>
244+
#include <zephyr/linker/rel-sections.ld>
245245

246246
/DISCARD/ :
247247
{
@@ -389,7 +389,7 @@ SECTIONS
389389

390390
ZEPHYR_KERNEL_FUNCS_IN_SECT
391391

392-
#include <linker/kobject-text.ld>
392+
#include <zephyr/linker/kobject-text.ld>
393393

394394
MMU_PAGE_ALIGN_PERM
395395

@@ -400,12 +400,12 @@ SECTIONS
400400

401401
lnkr_pinned_rodata_start = .;
402402

403-
#include <linker/common-rom.ld>
404-
#include <linker/thread-local-storage.ld>
403+
#include <zephyr/linker/common-rom.ld>
404+
#include <zephyr/linker/thread-local-storage.ld>
405405

406406
SECTION_PROLOGUE(pinned.rodata,,)
407407
{
408-
#include <arch/x86/ia32/scripts/static_intr.ld>
408+
#include <zephyr/arch/x86/ia32/scripts/static_intr.ld>
409409

410410
LIB_KERNEL_IN_SECT(rodata)
411411
LIB_ARCH_X86_IN_SECT(rodata)
@@ -429,7 +429,7 @@ SECTIONS
429429

430430
#include <snippets-rodata.ld>
431431

432-
#include <linker/kobject-rom.ld>
432+
#include <zephyr/linker/kobject-rom.ld>
433433

434434
MMU_PAGE_ALIGN_PERM
435435

@@ -444,8 +444,8 @@ SECTIONS
444444

445445
. = ALIGN(4);
446446

447-
#include <arch/x86/ia32/scripts/shared_kernel_pages.ld>
448-
#include <arch/x86/ia32/scripts/dynamic_intr.ld>
447+
#include <zephyr/arch/x86/ia32/scripts/shared_kernel_pages.ld>
448+
#include <zephyr/arch/x86/ia32/scripts/dynamic_intr.ld>
449449

450450
LIB_KERNEL_IN_SECT(data)
451451
LIB_ARCH_X86_IN_SECT(data)
@@ -460,9 +460,9 @@ SECTIONS
460460

461461
} GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
462462

463-
#include <linker/common-ram.ld>
464-
#include <arch/x86/pagetables.ld>
465-
#include <linker/kobject-data.ld>
463+
#include <zephyr/linker/common-ram.ld>
464+
#include <zephyr/arch/x86/pagetables.ld>
465+
#include <zephyr/linker/kobject-data.ld>
466466

467467
lnkr_pinned_data_end = .;
468468

@@ -593,7 +593,7 @@ SECTIONS
593593
*(.eini)
594594

595595
#ifndef CONFIG_LINKER_USE_PINNED_SECTION
596-
#include <linker/kobject-text.ld>
596+
#include <zephyr/linker/kobject-text.ld>
597597
#endif
598598

599599
MMU_PAGE_ALIGN_PERM
@@ -604,8 +604,8 @@ SECTIONS
604604
__rodata_region_start = .;
605605

606606
#ifndef CONFIG_LINKER_USE_PINNED_SECTION
607-
#include <linker/common-rom.ld>
608-
#include <linker/thread-local-storage.ld>
607+
#include <zephyr/linker/common-rom.ld>
608+
#include <zephyr/linker/thread-local-storage.ld>
609609
#endif
610610

611611
SECTION_PROLOGUE(_RODATA_SECTION_NAME,,)
@@ -616,7 +616,7 @@ SECTIONS
616616

617617
#ifndef CONFIG_DYNAMIC_INTERRUPTS
618618
#ifndef CONFIG_LINKER_USE_PINNED_SECTION
619-
#include <arch/x86/ia32/scripts/static_intr.ld>
619+
#include <zephyr/arch/x86/ia32/scripts/static_intr.ld>
620620
#endif /* !CONFIG_LINKER_USE_PINNED_SECTION */
621621
#endif /* CONFIG_DYNAMIC_INTERRUPTS */
622622

@@ -626,11 +626,11 @@ SECTIONS
626626
*/
627627
#include <snippets-rodata.ld>
628628

629-
#include <linker/kobject-rom.ld>
629+
#include <zephyr/linker/kobject-rom.ld>
630630
#endif
631631
} GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
632632

633-
#include <linker/cplusplus-rom.ld>
633+
#include <zephyr/linker/cplusplus-rom.ld>
634634

635635
MMU_PAGE_ALIGN_PERM
636636
/* ROM ends here, position counter will now be in RAM areas */
@@ -693,7 +693,7 @@ SECTIONS
693693

694694
__bss_num_words = (__bss_end - __bss_start) >> 2;
695695

696-
#include <linker/common-noinit.ld>
696+
#include <zephyr/linker/common-noinit.ld>
697697

698698
MMU_PAGE_ALIGN_PERM
699699

@@ -708,7 +708,7 @@ SECTIONS
708708

709709
#ifdef CONFIG_DYNAMIC_INTERRUPTS
710710
#ifndef CONFIG_LINKER_USE_PINNED_SECTION
711-
#include <arch/x86/ia32/scripts/dynamic_intr.ld>
711+
#include <zephyr/arch/x86/ia32/scripts/dynamic_intr.ld>
712712
#endif /* !CONFIG_LINKER_USE_PINNED_SECTION */
713713
#endif /* CONFIG_DYNAMIC_INTERRUPTS */
714714

@@ -718,22 +718,22 @@ SECTIONS
718718
#include <snippets-rwdata.ld>
719719

720720
#ifndef CONFIG_LINKER_USE_PINNED_SECTION
721-
#include <arch/x86/ia32/scripts/shared_kernel_pages.ld>
721+
#include <zephyr/arch/x86/ia32/scripts/shared_kernel_pages.ld>
722722
#endif /* !CONFIG_LINKER_USE_PINNED_SECTION */
723723

724724
. = ALIGN(4);
725725
} GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
726726

727727
__data_rom_start = LOADADDR(_DATA_SECTION_NAME);
728728

729-
#include <linker/cplusplus-ram.ld>
729+
#include <zephyr/linker/cplusplus-ram.ld>
730730

731731
#ifndef CONFIG_LINKER_USE_PINNED_SECTION
732-
#include <linker/common-ram.ld>
733-
#include <arch/x86/pagetables.ld>
732+
#include <zephyr/linker/common-ram.ld>
733+
#include <zephyr/arch/x86/pagetables.ld>
734734

735735
/* Must be last in RAM */
736-
#include <linker/kobject-data.ld>
736+
#include <zephyr/linker/kobject-data.ld>
737737
#endif /* !CONFIG_LINKER_USE_PINNED_SECTION */
738738

739739
MMU_PAGE_ALIGN
@@ -778,7 +778,7 @@ SECTIONS
778778
*/
779779
#include <snippets-sections.ld>
780780

781-
#include <linker/debug-sections.ld>
781+
#include <zephyr/linker/debug-sections.ld>
782782

783783
/DISCARD/ : { *(.note.GNU-stack) }
784784

‎include/zephyr/arch/arc/v2/linker.ld‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
* GNU and MWDT toolchains.
1010
*/
1111

12-
#include <linker/sections.h>
13-
#include <linker/linker-defs.h>
14-
#include <linker/linker-tool.h>
12+
#include <zephyr/linker/sections.h>
13+
#include <zephyr/linker/linker-defs.h>
14+
#include <zephyr/linker/linker-tool.h>
1515

1616
/* physical address of RAM */
1717
#ifdef CONFIG_HARVARD
@@ -69,7 +69,7 @@ MEMORY {
6969

7070
SECTIONS {
7171

72-
#include <linker/rel-sections.ld>
72+
#include <zephyr/linker/rel-sections.ld>
7373

7474
GROUP_START(ROMABLE_REGION)
7575

@@ -85,14 +85,14 @@ SECTIONS {
8585
*(.gnu.linkonce.t.*)
8686

8787
. = ALIGN(4);
88-
#include <linker/kobject-text.ld>
88+
#include <zephyr/linker/kobject-text.ld>
8989
} GROUP_LINK_IN(ROMABLE_REGION)
9090

9191
__text_region_end = .;
9292
__rodata_region_start = .;
9393

94-
#include <linker/common-rom.ld>
95-
#include <linker/thread-local-storage.ld>
94+
#include <zephyr/linker/common-rom.ld>
95+
#include <zephyr/linker/thread-local-storage.ld>
9696

9797
SECTION_PROLOGUE(_RODATA_SECTION_NAME,,) {
9898
*(".rodata")
@@ -104,7 +104,7 @@ SECTIONS {
104104
*/
105105
#include <snippets-rodata.ld>
106106

107-
#include <linker/kobject-rom.ld>
107+
#include <zephyr/linker/kobject-rom.ld>
108108

109109
#if defined(CONFIG_CPLUSPLUS) && !defined(CONFIG_CPP_STATIC_INIT_GNU) && defined(__MWDT_LINKER_CMD__)
110110
. = ALIGN(4);
@@ -117,7 +117,7 @@ SECTIONS {
117117
#ifdef __MWDT_LINKER_CMD__
118118
/* TODO: add mwdt specific ROM C++ sections */
119119
#else
120-
#include <linker/cplusplus-rom.ld>
120+
#include <zephyr/linker/cplusplus-rom.ld>
121121
#endif /* __MWDT_LINKER_CMD__ */
122122

123123
__rodata_region_end = .;
@@ -169,7 +169,7 @@ SECTIONS {
169169
__bss_end = ALIGN(4);
170170
} GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
171171

172-
#include <linker/common-noinit.ld>
172+
#include <zephyr/linker/common-noinit.ld>
173173

174174
GROUP_START(DATA_REGION)
175175

@@ -196,13 +196,13 @@ SECTIONS {
196196

197197
__data_region_load_start = LOADADDR(_DATA_SECTION_NAME);
198198

199-
#include <linker/common-ram.ld>
200-
#include <linker/kobject-data.ld>
199+
#include <zephyr/linker/common-ram.ld>
200+
#include <zephyr/linker/kobject-data.ld>
201201

202202
#ifdef __MWDT_LINKER_CMD__
203203
/* TODO: add mwdt specific RAM C++ sections */
204204
#else
205-
#include <linker/cplusplus-ram.ld>
205+
#include <zephyr/linker/cplusplus-ram.ld>
206206
#endif /* __MWDT_LINKER_CMD__ */
207207

208208
/* Located in generated directory. This file is populated by the
@@ -237,7 +237,7 @@ SECTIONS {
237237
*/
238238
#include <snippets-sections.ld>
239239

240-
#include <linker/debug-sections.ld>
240+
#include <zephyr/linker/debug-sections.ld>
241241

242242
SECTION_PROLOGUE(.ARC.attributes, 0,) {
243243
KEEP(*(.ARC.attributes))

‎include/zephyr/arch/arm/aarch32/cortex_a_r/scripts/linker.ld‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
* Linker script for the Cortex-A and Cortex-R platforms.
1212
*/
1313

14-
#include <linker/sections.h>
14+
#include <zephyr/linker/sections.h>
1515
#include <zephyr/devicetree.h>
1616

17-
#include <linker/devicetree_regions.h>
18-
#include <linker/linker-defs.h>
19-
#include <linker/linker-tool.h>
17+
#include <zephyr/linker/devicetree_regions.h>
18+
#include <zephyr/linker/linker-defs.h>
19+
#include <zephyr/linker/linker-tool.h>
2020

2121
/* physical address of RAM */
2222
#ifdef CONFIG_XIP
@@ -89,7 +89,7 @@ ENTRY(CONFIG_KERNEL_ENTRY)
8989

9090
SECTIONS
9191
{
92-
#include <linker/rel-sections.ld>
92+
#include <zephyr/linker/rel-sections.ld>
9393

9494
/*
9595
* .plt and .iplt are here according to 'arm-zephyr-elf-ld --verbose',
@@ -138,7 +138,7 @@ SECTIONS
138138
z_mapped_start = .;
139139
#endif
140140

141-
#include <linker/kobject-text.ld>
141+
#include <zephyr/linker/kobject-text.ld>
142142

143143
*(.text)
144144
*(".text.*")
@@ -185,9 +185,9 @@ SECTIONS
185185
__rodata_region_start = .;
186186
} GROUP_LINK_IN(ROMABLE_REGION)
187187

188-
#include <linker/common-rom.ld>
189-
#include <linker/thread-local-storage.ld>
190-
#include <linker/cplusplus-rom.ld>
188+
#include <zephyr/linker/common-rom.ld>
189+
#include <zephyr/linker/thread-local-storage.ld>
190+
#include <zephyr/linker/cplusplus-rom.ld>
191191

192192
SECTION_PROLOGUE(_RODATA_SECTION_NAME,,)
193193
{
@@ -200,7 +200,7 @@ SECTIONS
200200
*/
201201
#include <snippets-rodata.ld>
202202

203-
#include <linker/kobject-rom.ld>
203+
#include <zephyr/linker/kobject-rom.ld>
204204

205205
/*
206206
* For XIP images, in order to avoid the situation when __data_rom_start
@@ -293,7 +293,7 @@ SECTIONS
293293
__bss_end = ALIGN(4);
294294
} GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
295295

296-
#include <linker/common-noinit.ld>
296+
#include <zephyr/linker/common-noinit.ld>
297297

298298
SECTION_DATA_PROLOGUE(_DATA_SECTION_NAME,,)
299299
{
@@ -319,9 +319,9 @@ SECTIONS
319319

320320
__data_region_load_start = LOADADDR(_DATA_SECTION_NAME);
321321

322-
#include <linker/common-ram.ld>
323-
#include <linker/kobject-data.ld>
324-
#include <linker/cplusplus-ram.ld>
322+
#include <zephyr/linker/common-ram.ld>
323+
#include <zephyr/linker/kobject-data.ld>
324+
#include <zephyr/linker/cplusplus-ram.ld>
325325

326326
/* Located in generated directory. This file is populated by the
327327
* zephyr_linker_sources() Cmake function.
@@ -374,7 +374,7 @@ GROUP_END(OCM)
374374
*/
375375
#include <snippets-sections.ld>
376376

377-
#include <linker/debug-sections.ld>
377+
#include <zephyr/linker/debug-sections.ld>
378378

379379
SECTION_PROLOGUE(.ARM.attributes, 0,)
380380
{

0 commit comments

Comments
 (0)