Skip to content

Commit 4b91c2d

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

Some content is hidden

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

92 files changed

+263
-263
lines changed

‎arch/arc/core/cpu_idle.S

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
* CPU power management routines.
1212
*/
1313

14-
#include <kernel_structs.h>
14+
#include <zephyr/kernel_structs.h>
1515
#include <offsets_short.h>
16-
#include <toolchain.h>
17-
#include <linker/sections.h>
18-
#include <arch/cpu.h>
19-
#include <arch/arc/asm-compat/assembler.h>
16+
#include <zephyr/toolchain.h>
17+
#include <zephyr/linker/sections.h>
18+
#include <zephyr/arch/cpu.h>
19+
#include <zephyr/arch/arc/asm-compat/assembler.h>
2020

2121
GTEXT(arch_cpu_idle)
2222
GTEXT(arch_cpu_atomic_idle)

‎arch/arc/core/fast_irq.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
* See isr_wrapper.S for details.
1414
*/
1515

16-
#include <kernel_structs.h>
16+
#include <zephyr/kernel_structs.h>
1717
#include <offsets_short.h>
18-
#include <toolchain.h>
19-
#include <linker/sections.h>
20-
#include <arch/cpu.h>
18+
#include <zephyr/toolchain.h>
19+
#include <zephyr/linker/sections.h>
20+
#include <zephyr/arch/cpu.h>
2121
#include <swap_macros.h>
2222

2323
GTEXT(_firq_enter)

‎arch/arc/core/fault_s.S

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
* Fault handlers for ARCv2 processors.
1313
*/
1414

15-
#include <toolchain.h>
16-
#include <linker/sections.h>
17-
#include <arch/cpu.h>
15+
#include <zephyr/toolchain.h>
16+
#include <zephyr/linker/sections.h>
17+
#include <zephyr/arch/cpu.h>
1818
#include <swap_macros.h>
19-
#include <syscall.h>
20-
#include <arch/arc/asm-compat/assembler.h>
19+
#include <zephyr/syscall.h>
20+
#include <zephyr/arch/arc/asm-compat/assembler.h>
2121

2222
GTEXT(_Fault)
2323
GTEXT(__reset)

‎arch/arc/core/isr_wrapper.S

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
*/
1515

1616
#include <offsets_short.h>
17-
#include <toolchain.h>
18-
#include <linker/sections.h>
19-
#include <sw_isr_table.h>
20-
#include <kernel_structs.h>
21-
#include <arch/cpu.h>
17+
#include <zephyr/toolchain.h>
18+
#include <zephyr/linker/sections.h>
19+
#include <zephyr/sw_isr_table.h>
20+
#include <zephyr/kernel_structs.h>
21+
#include <zephyr/arch/cpu.h>
2222
#include <swap_macros.h>
23-
#include <arch/arc/asm-compat/assembler.h>
23+
#include <zephyr/arch/arc/asm-compat/assembler.h>
2424

2525
GTEXT(_isr_wrapper)
2626
GTEXT(_isr_demux)

‎arch/arc/core/regular_irq.S

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
* See isr_wrapper.S for details.
1515
*/
1616

17-
#include <kernel_structs.h>
17+
#include <zephyr/kernel_structs.h>
1818
#include <offsets_short.h>
19-
#include <toolchain.h>
20-
#include <linker/sections.h>
21-
#include <arch/cpu.h>
19+
#include <zephyr/toolchain.h>
20+
#include <zephyr/linker/sections.h>
21+
#include <zephyr/arch/cpu.h>
2222
#include <swap_macros.h>
23-
#include <arch/arc/asm-compat/assembler.h>
23+
#include <zephyr/arch/arc/asm-compat/assembler.h>
2424

2525
GTEXT(_rirq_enter)
2626
GTEXT(_rirq_exit)

‎arch/arc/core/reset.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
* Reset handler that prepares the system for running C code.
1212
*/
1313

14-
#include <toolchain.h>
15-
#include <linker/sections.h>
16-
#include <arch/cpu.h>
14+
#include <zephyr/toolchain.h>
15+
#include <zephyr/linker/sections.h>
16+
#include <zephyr/arch/cpu.h>
1717
#include <swap_macros.h>
18-
#include <arch/arc/asm-compat/assembler.h>
18+
#include <zephyr/arch/arc/asm-compat/assembler.h>
1919

2020
GDATA(z_interrupt_stacks)
2121
GDATA(z_main_stack)

‎arch/arc/core/secureshield/arc_secure.S

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
6-
#include <toolchain.h>
7-
#include <linker/sections.h>
8-
#include <arch/cpu.h>
6+
#include <zephyr/toolchain.h>
7+
#include <zephyr/linker/sections.h>
8+
#include <zephyr/arch/cpu.h>
99

1010
.macro clear_scratch_regs
1111
mov r1, 0

‎arch/arc/core/switch.S

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
* See isr_wrapper.S for details.
1515
*/
1616

17-
#include <kernel_structs.h>
17+
#include <zephyr/kernel_structs.h>
1818
#include <offsets_short.h>
19-
#include <toolchain.h>
20-
#include <linker/sections.h>
21-
#include <arch/cpu.h>
19+
#include <zephyr/toolchain.h>
20+
#include <zephyr/linker/sections.h>
21+
#include <zephyr/arch/cpu.h>
2222
#include <v2/irq.h>
2323
#include <swap_macros.h>
24-
#include <arch/arc/asm-compat/assembler.h>
24+
#include <zephyr/arch/arc/asm-compat/assembler.h>
2525

2626
GTEXT(z_arc_switch)
2727

‎arch/arc/core/thread_entry_wrapper.S

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
* Wrapper for z_thread_entry routine when called from the initial context.
1212
*/
1313

14-
#include <toolchain.h>
15-
#include <linker/sections.h>
14+
#include <zephyr/toolchain.h>
15+
#include <zephyr/linker/sections.h>
1616
#include <v2/irq.h>
17-
#include <arch/arc/asm-compat/assembler.h>
17+
#include <zephyr/arch/arc/asm-compat/assembler.h>
1818

1919
GTEXT(z_thread_entry_wrapper)
2020
GTEXT(z_thread_entry_wrapper1)

‎arch/arc/core/userspace.S

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
*/
66

77
#include <offsets_short.h>
8-
#include <toolchain.h>
9-
#include <linker/sections.h>
10-
#include <kernel_structs.h>
11-
#include <arch/cpu.h>
12-
#include <syscall.h>
8+
#include <zephyr/toolchain.h>
9+
#include <zephyr/linker/sections.h>
10+
#include <zephyr/kernel_structs.h>
11+
#include <zephyr/arch/cpu.h>
12+
#include <zephyr/syscall.h>
1313
#include <swap_macros.h>
1414
#include <v2/irq.h>
1515

‎arch/arm/core/aarch32/cortex_a_r/__aeabi_read_tp.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <toolchain.h>
7+
#include <zephyr/toolchain.h>
88

99
_ASM_FILE_PROLOGUE
1010

‎arch/arm/core/aarch32/cortex_a_r/exc.S

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
* depending on the application exception handler implementation.
2424
*/
2525

26-
#include <toolchain.h>
27-
#include <linker/sections.h>
26+
#include <zephyr/toolchain.h>
27+
#include <zephyr/linker/sections.h>
2828
#include <offsets_short.h>
29-
#include <arch/cpu.h>
29+
#include <zephyr/arch/cpu.h>
3030

3131
_ASM_FILE_PROLOGUE
3232

‎arch/arm/core/aarch32/cortex_a_r/exc_exit.S

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
* not wrapped around by _isr_wrapper()).
1515
*/
1616

17-
#include <toolchain.h>
18-
#include <linker/sections.h>
17+
#include <zephyr/toolchain.h>
18+
#include <zephyr/linker/sections.h>
1919
#include <offsets_short.h>
20-
#include <arch/cpu.h>
20+
#include <zephyr/arch/cpu.h>
2121

2222
_ASM_FILE_PROLOGUE
2323

‎arch/arm/core/aarch32/cortex_a_r/reset.S

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
* Reset handler that prepares the system for running C code.
1313
*/
1414

15-
#include <toolchain.h>
16-
#include <linker/sections.h>
17-
#include <arch/cpu.h>
15+
#include <zephyr/toolchain.h>
16+
#include <zephyr/linker/sections.h>
17+
#include <zephyr/arch/cpu.h>
1818
#include <offsets_short.h>
1919
#include <aarch32/cortex_a_r/tcm.h>
2020
#include "vector_table.h"

‎arch/arm/core/aarch32/cortex_a_r/vector_table.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
* @brief Populated vector table in ROM
1111
*/
1212

13-
#include <toolchain.h>
14-
#include <linker/sections.h>
13+
#include <zephyr/toolchain.h>
14+
#include <zephyr/linker/sections.h>
1515
#include "vector_table.h"
1616

1717
_ASM_FILE_PROLOGUE

‎arch/arm/core/aarch32/cortex_m/__aeabi_read_tp.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <toolchain.h>
7+
#include <zephyr/toolchain.h>
88

99
_ASM_FILE_PROLOGUE
1010

‎arch/arm/core/aarch32/cortex_m/exc_exit.S

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
* wrapped around by _isr_wrapper()).
1414
*/
1515

16-
#include <toolchain.h>
17-
#include <linker/sections.h>
16+
#include <zephyr/toolchain.h>
17+
#include <zephyr/linker/sections.h>
1818
#include <offsets_short.h>
19-
#include <arch/cpu.h>
19+
#include <zephyr/arch/cpu.h>
2020

2121
_ASM_FILE_PROLOGUE
2222

‎arch/arm/core/aarch32/cortex_m/fault_s.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
* Fault handlers for ARM Cortex-M processors.
1313
*/
1414

15-
#include <toolchain.h>
16-
#include <linker/sections.h>
15+
#include <zephyr/toolchain.h>
16+
#include <zephyr/linker/sections.h>
1717

1818
_ASM_FILE_PROLOGUE
1919

‎arch/arm/core/aarch32/cortex_m/reset.S

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
* Reset handler that prepares the system for running C code.
1212
*/
1313

14-
#include <toolchain.h>
15-
#include <linker/sections.h>
16-
#include <arch/cpu.h>
14+
#include <zephyr/toolchain.h>
15+
#include <zephyr/linker/sections.h>
16+
#include <zephyr/arch/cpu.h>
1717
#include "vector_table.h"
1818

1919
_ASM_FILE_PROLOGUE

‎arch/arm/core/aarch32/cortex_m/vector_table.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
* rest should not be triggered until the kernel is ready to handle them.
1818
*/
1919

20-
#include <toolchain.h>
21-
#include <linker/sections.h>
20+
#include <zephyr/toolchain.h>
21+
#include <zephyr/linker/sections.h>
2222
#include "vector_table.h"
2323

2424
_ASM_FILE_PROLOGUE

‎arch/arm/core/aarch32/cpu_idle.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
*
1111
*/
1212

13-
#include <toolchain.h>
14-
#include <linker/sections.h>
13+
#include <zephyr/toolchain.h>
14+
#include <zephyr/linker/sections.h>
1515

1616
_ASM_FILE_PROLOGUE
1717

‎arch/arm/core/aarch32/irq_relay.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
* Note: Currently support mcuboot only.
2222
* */
2323

24-
#include <toolchain.h>
25-
#include <linker/sections.h>
24+
#include <zephyr/toolchain.h>
25+
#include <zephyr/linker/sections.h>
2626

2727
_ASM_FILE_PROLOGUE
2828

‎arch/arm/core/aarch32/isr_wrapper.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
*/
1818
.eabi_attribute Tag_ABI_align_preserved, 1
1919

20-
#include <toolchain.h>
21-
#include <linker/sections.h>
20+
#include <zephyr/toolchain.h>
21+
#include <zephyr/linker/sections.h>
2222
#include <offsets_short.h>
23-
#include <arch/cpu.h>
24-
#include <sw_isr_table.h>
23+
#include <zephyr/arch/cpu.h>
24+
#include <zephyr/sw_isr_table.h>
2525

2626

2727
_ASM_FILE_PROLOGUE

‎arch/arm/core/aarch32/nmi_on_reset.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
* rebooting might trigger the exact same problem over and over.
1616
*/
1717

18-
#include <toolchain.h>
19-
#include <linker/sections.h>
18+
#include <zephyr/toolchain.h>
19+
#include <zephyr/linker/sections.h>
2020

2121
_ASM_FILE_PROLOGUE
2222

‎arch/arm/core/aarch32/swap_helper.S

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
* on ARM Cortex-A, Cortex-M and Cortex-R CPUs.
1515
*/
1616

17-
#include <toolchain.h>
18-
#include <linker/sections.h>
17+
#include <zephyr/toolchain.h>
18+
#include <zephyr/linker/sections.h>
1919
#include <offsets_short.h>
20-
#include <arch/cpu.h>
21-
#include <syscall.h>
22-
#include <kernel.h>
20+
#include <zephyr/arch/cpu.h>
21+
#include <zephyr/syscall.h>
22+
#include <zephyr/kernel.h>
2323

2424
#if defined(CONFIG_CPU_CORTEX_M)
25-
#include <arch/arm/aarch32/cortex_m/cpu.h>
25+
#include <zephyr/arch/arm/aarch32/cortex_m/cpu.h>
2626
#endif
2727
_ASM_FILE_PROLOGUE
2828

‎arch/arm/core/aarch32/userspace.S

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
*
88
*/
99

10-
#include <toolchain.h>
11-
#include <linker/sections.h>
10+
#include <zephyr/toolchain.h>
11+
#include <zephyr/linker/sections.h>
1212
#include <offsets_short.h>
13-
#include <syscall.h>
13+
#include <zephyr/syscall.h>
1414

15-
#include <arch/arm/aarch32/exc.h>
15+
#include <zephyr/arch/arm/aarch32/exc.h>
1616

1717
#if defined(CONFIG_ARMV7_R)
18-
#include <arch/cpu.h>
18+
#include <zephyr/arch/cpu.h>
1919
#endif
2020

2121
_ASM_FILE_PROLOGUE

‎arch/arm64/core/cpu_idle.S

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
* ARM64 Cortex-A power management
99
*/
1010

11-
#include <toolchain.h>
12-
#include <linker/sections.h>
13-
#include <arch/cpu.h>
11+
#include <zephyr/toolchain.h>
12+
#include <zephyr/linker/sections.h>
13+
#include <zephyr/arch/cpu.h>
1414

1515
_ASM_FILE_PROLOGUE
1616

0 commit comments

Comments
 (0)