From aec9a8c4be9ddafee9d0748cde7c53c859c48c93 Mon Sep 17 00:00:00 2001 From: Carlo Caione Date: Sat, 9 Nov 2019 17:49:36 +0000 Subject: [PATCH] arch: arm: Move ARM code to AArch32 sub-directory Before introducing the code for ARM64 (AArch64) we need to relocate the current ARM code to a new AArch32 sub-directory. For now we can assume that no code is shared between ARM and ARM64. There are no functional changes. The code is moved to the new location and the file paths are fixed to reflect this change. Signed-off-by: Carlo Caione --- CODEOWNERS | 10 +++---- arch/arm/CMakeLists.txt | 25 +----------------- arch/arm/Kconfig | 2 +- arch/arm/aarch32.cmake | 26 +++++++++++++++++++ arch/arm/core/{ => aarch32}/CMakeLists.txt | 0 arch/arm/core/{ => aarch32}/Kconfig | 8 +++--- arch/arm/core/{ => aarch32}/__aeabi_atexit.c | 0 .../{ => aarch32}/cortex_m/CMakeLists.txt | 0 arch/arm/core/{ => aarch32}/cortex_m/Kconfig | 0 .../cortex_m/cmse/CMakeLists.txt | 0 .../cortex_m/cmse/arm_core_cmse.c | 2 +- arch/arm/core/{ => aarch32}/cortex_m/fault.c | 0 .../core/{ => aarch32}/cortex_m/irq_init.c | 2 +- .../{ => aarch32}/cortex_m/mpu/CMakeLists.txt | 0 .../core/{ => aarch32}/cortex_m/mpu/Kconfig | 0 .../{ => aarch32}/cortex_m/mpu/arm_core_mpu.c | 0 .../cortex_m/mpu/arm_core_mpu_dev.h | 0 .../core/{ => aarch32}/cortex_m/mpu/arm_mpu.c | 0 .../cortex_m/mpu/arm_mpu_v7_internal.h | 0 .../cortex_m/mpu/arm_mpu_v8_internal.h | 2 +- .../core/{ => aarch32}/cortex_m/mpu/nxp_mpu.c | 0 .../cortex_m/relay_vector_table.ld | 0 arch/arm/core/{ => aarch32}/cortex_m/reset.S | 0 arch/arm/core/{ => aarch32}/cortex_m/scb.c | 2 +- .../{ => aarch32}/cortex_m/thread_abort.c | 0 .../{ => aarch32}/cortex_m/tz/CMakeLists.txt | 0 .../core/{ => aarch32}/cortex_m/tz/Kconfig | 0 .../{ => aarch32}/cortex_m/tz/arm_core_tz.c | 6 ++--- .../cortex_m/tz/secure_entry_functions.ld | 0 .../{ => aarch32}/cortex_m/vector_table.S | 0 .../{ => aarch32}/cortex_m/vector_table.h | 0 .../cortex_m/vt_pointer_section.ld | 0 .../{ => aarch32}/cortex_r/CMakeLists.txt | 0 arch/arm/core/{ => aarch32}/cortex_r/Kconfig | 0 arch/arm/core/{ => aarch32}/cortex_r/fault.c | 0 arch/arm/core/{ => aarch32}/cortex_r/reboot.c | 0 arch/arm/core/{ => aarch32}/cortex_r/reset.S | 0 arch/arm/core/{ => aarch32}/cortex_r/stacks.c | 2 +- .../{ => aarch32}/cortex_r/vector_table.S | 0 .../{ => aarch32}/cortex_r/vector_table.h | 0 arch/arm/core/{ => aarch32}/cpu_idle.S | 0 arch/arm/core/{ => aarch32}/exc_exit.S | 0 arch/arm/core/{ => aarch32}/fatal.c | 0 arch/arm/core/{ => aarch32}/fault_s.S | 0 arch/arm/core/{ => aarch32}/irq_manage.c | 4 +-- arch/arm/core/{ => aarch32}/irq_offload.c | 0 arch/arm/core/{ => aarch32}/irq_relay.S | 0 arch/arm/core/{ => aarch32}/isr_wrapper.S | 0 arch/arm/core/{ => aarch32}/nmi.c | 0 arch/arm/core/{ => aarch32}/nmi_on_reset.S | 0 arch/arm/core/{ => aarch32}/prep_c.c | 2 +- arch/arm/core/{ => aarch32}/swap.c | 0 arch/arm/core/{ => aarch32}/swap_helper.S | 0 arch/arm/core/{ => aarch32}/thread.c | 0 arch/arm/core/{ => aarch32}/userspace.S | 0 arch/arm/core/{ => aarch32}/vector_table.ld | 0 .../arm/include/{ => aarch32}/cortex_m/cmse.h | 0 arch/arm/include/{ => aarch32}/cortex_m/exc.h | 4 +-- .../include/{ => aarch32}/cortex_m/stack.h | 2 +- arch/arm/include/{ => aarch32}/cortex_m/tz.h | 0 arch/arm/include/{ => aarch32}/cortex_r/exc.h | 0 .../include/{ => aarch32}/cortex_r/stack.h | 0 arch/arm/include/kernel_arch_data.h | 8 +++--- arch/common/timing_info_bench.c | 2 +- doc/guides/code-relocation.rst | 2 +- doc/guides/porting/arch.rst | 4 +-- doc/reference/usermode/memory_domain.rst | 2 +- drivers/timer/cortex_m_systick.c | 2 +- include/arch/arm/{ => aarch32}/arch.h | 26 +++++++++---------- include/arch/arm/{ => aarch32}/asm_inline.h | 2 +- .../arch/arm/{ => aarch32}/asm_inline_gcc.h | 2 +- .../arch/arm/{ => aarch32}/cortex_m/cmsis.h | 0 include/arch/arm/{ => aarch32}/cortex_m/cpu.h | 0 .../arm/{ => aarch32}/cortex_m/memory_map.h | 0 .../arm/{ => aarch32}/cortex_m/mpu/arm_mpu.h | 4 +-- .../{ => aarch32}/cortex_m/mpu/arm_mpu_v7m.h | 2 +- .../{ => aarch32}/cortex_m/mpu/arm_mpu_v8m.h | 2 +- .../arm/{ => aarch32}/cortex_m/mpu/nxp_mpu.h | 0 .../{ => aarch32}/cortex_m/scripts/linker.ld | 0 include/arch/arm/{ => aarch32}/cortex_r/cpu.h | 0 .../cortex_r/scripts/app_data_alignment.ld | 0 .../{ => aarch32}/cortex_r/scripts/linker.ld | 0 .../arch/arm/{ => aarch32}/cortex_r/sys_io.h | 0 include/arch/arm/{ => aarch32}/error.h | 4 +-- include/arch/arm/{ => aarch32}/exc.h | 0 include/arch/arm/{ => aarch32}/irq.h | 2 +- include/arch/arm/{ => aarch32}/misc.h | 0 include/arch/arm/{ => aarch32}/nmi.h | 0 include/arch/arm/{ => aarch32}/syscall.h | 2 +- include/arch/arm/{ => aarch32}/thread.h | 0 include/arch/cpu.h | 2 +- include/arch/syscall.h | 2 +- .../code_relocation/linker_arm_sram2.ld | 2 +- .../code_relocation/src/main.c | 2 +- soc/arm/arm/beetle/linker.ld | 2 +- soc/arm/arm/mps2/linker.ld | 2 +- soc/arm/arm/musca_a/linker.ld | 2 +- soc/arm/arm/musca_b1/linker.ld | 2 +- soc/arm/atmel_sam/sam3x/linker.ld | 2 +- soc/arm/atmel_sam/sam3x/soc.c | 2 +- soc/arm/atmel_sam/sam4s/linker.ld | 2 +- soc/arm/atmel_sam/sam4s/soc.c | 2 +- soc/arm/atmel_sam/same70/linker.ld | 2 +- soc/arm/atmel_sam/same70/soc.c | 2 +- soc/arm/atmel_sam0/common/soc_samd2x.c | 2 +- soc/arm/atmel_sam0/common/soc_samd5x.c | 2 +- soc/arm/atmel_sam0/samd20/linker.ld | 2 +- soc/arm/atmel_sam0/samd21/linker.ld | 2 +- soc/arm/atmel_sam0/samd51/linker.ld | 2 +- soc/arm/atmel_sam0/same51/linker.ld | 2 +- soc/arm/atmel_sam0/same53/linker.ld | 2 +- soc/arm/atmel_sam0/same54/linker.ld | 2 +- soc/arm/atmel_sam0/samr21/linker.ld | 2 +- soc/arm/common/cortex_m/arm_mpu_mem_cfg.h | 2 +- soc/arm/common/cortex_m/arm_mpu_regions.c | 2 +- soc/arm/cypress/psoc6/linker.ld | 2 +- soc/arm/cypress/psoc6/soc.c | 2 +- soc/arm/microchip_mec/mec1501/linker.ld | 2 +- soc/arm/microchip_mec/mec1501/soc.c | 2 +- soc/arm/microchip_mec/mec1701/linker.ld | 2 +- soc/arm/nordic_nrf/nrf51/linker.ld | 2 +- soc/arm/nordic_nrf/nrf52/linker.ld | 2 +- soc/arm/nordic_nrf/nrf52/soc.c | 2 +- soc/arm/nordic_nrf/nrf53/linker.ld | 2 +- soc/arm/nordic_nrf/nrf53/soc.c | 2 +- soc/arm/nordic_nrf/nrf91/linker.ld | 2 +- soc/arm/nordic_nrf/nrf91/soc.c | 2 +- soc/arm/nxp_imx/mcimx6x_m4/linker.ld | 2 +- soc/arm/nxp_imx/mcimx6x_m4/soc.c | 2 +- soc/arm/nxp_imx/mcimx7_m4/linker.ld | 2 +- soc/arm/nxp_imx/rt/linker.ld | 2 +- soc/arm/nxp_imx/rt/soc.c | 2 +- soc/arm/nxp_kinetis/k2x/linker.ld | 2 +- soc/arm/nxp_kinetis/k2x/soc.c | 2 +- soc/arm/nxp_kinetis/k6x/linker.ld | 2 +- soc/arm/nxp_kinetis/k6x/nxp_mpu_regions.c | 2 +- soc/arm/nxp_kinetis/k6x/soc.c | 2 +- soc/arm/nxp_kinetis/k8x/linker.ld | 2 +- soc/arm/nxp_kinetis/k8x/nxp_mpu_regions.c | 2 +- soc/arm/nxp_kinetis/ke1xf/linker.ld | 2 +- soc/arm/nxp_kinetis/ke1xf/nxp_mpu_regions.c | 2 +- soc/arm/nxp_kinetis/ke1xf/soc.c | 2 +- soc/arm/nxp_kinetis/kl2x/linker.ld | 2 +- soc/arm/nxp_kinetis/kv5x/linker.ld | 2 +- soc/arm/nxp_kinetis/kwx/linker.ld | 2 +- soc/arm/nxp_kinetis/kwx/soc_kw2xd.c | 2 +- soc/arm/nxp_lpc/lpc54xxx/linker.ld | 2 +- soc/arm/nxp_lpc/lpc54xxx/soc.c | 2 +- soc/arm/nxp_lpc/lpc55xxx/linker.ld | 2 +- soc/arm/nxp_lpc/lpc55xxx/soc.c | 2 +- soc/arm/silabs_exx32/common/soc.c | 2 +- soc/arm/silabs_exx32/efm32hg/linker.ld | 2 +- soc/arm/silabs_exx32/efm32pg12b/linker.ld | 2 +- soc/arm/silabs_exx32/efm32wg/linker.ld | 2 +- soc/arm/silabs_exx32/efr32fg1p/linker.ld | 2 +- soc/arm/silabs_exx32/efr32mg12p/linker.ld | 2 +- soc/arm/st_stm32/stm32f0/linker.ld | 2 +- soc/arm/st_stm32/stm32f0/soc.c | 2 +- soc/arm/st_stm32/stm32f1/linker.ld | 2 +- soc/arm/st_stm32/stm32f1/soc.c | 2 +- soc/arm/st_stm32/stm32f2/linker.ld | 2 +- soc/arm/st_stm32/stm32f2/soc.c | 2 +- soc/arm/st_stm32/stm32f3/linker.ld | 2 +- soc/arm/st_stm32/stm32f3/soc.c | 2 +- soc/arm/st_stm32/stm32f4/linker.ld | 2 +- soc/arm/st_stm32/stm32f4/soc.c | 2 +- soc/arm/st_stm32/stm32f7/linker.ld | 2 +- soc/arm/st_stm32/stm32f7/soc.c | 2 +- soc/arm/st_stm32/stm32g0/linker.ld | 2 +- soc/arm/st_stm32/stm32g0/soc.c | 2 +- soc/arm/st_stm32/stm32g4/linker.ld | 2 +- soc/arm/st_stm32/stm32g4/soc.c | 2 +- soc/arm/st_stm32/stm32h7/linker.ld | 2 +- soc/arm/st_stm32/stm32h7/soc_m4.c | 2 +- soc/arm/st_stm32/stm32h7/soc_m7.c | 2 +- soc/arm/st_stm32/stm32l0/linker.ld | 2 +- soc/arm/st_stm32/stm32l0/soc.c | 2 +- soc/arm/st_stm32/stm32l1/linker.ld | 2 +- soc/arm/st_stm32/stm32l1/soc.c | 2 +- soc/arm/st_stm32/stm32l4/linker.ld | 2 +- soc/arm/st_stm32/stm32l4/soc.c | 2 +- soc/arm/st_stm32/stm32mp1/linker.ld | 4 +-- soc/arm/st_stm32/stm32mp1/soc.c | 2 +- soc/arm/st_stm32/stm32wb/linker.ld | 2 +- soc/arm/st_stm32/stm32wb/soc.c | 2 +- soc/arm/ti_lm3s6965/linker.ld | 2 +- soc/arm/ti_lm3s6965/sys_arch_reboot.c | 2 +- soc/arm/ti_simplelink/cc13x2_cc26x2/linker.ld | 2 +- soc/arm/ti_simplelink/cc2650/linker.ld | 2 +- soc/arm/ti_simplelink/cc32xx/linker.ld | 2 +- soc/arm/ti_simplelink/msp432p4xx/linker.ld | 2 +- soc/arm/xilinx_zynqmp/linker.ld | 2 +- soc/riscv/openisa_rv32m1/linker.ld | 2 +- .../testsuite/include/test_asm_inline_gcc.h | 4 +-- .../arm/arm_interrupt/src/arm_interrupt.c | 2 +- .../src/arm_irq_vector_table.c | 2 +- .../arm/arm_runtime_nmi/src/arm_runtime_nmi.c | 2 +- .../arm/arm_thread_swap/src/arm_thread_arch.c | 2 +- .../src/arm_zero_latency_irqs.c | 2 +- .../float_disable/src/k_float_disable.c | 2 +- tests/kernel/gen_isr_table/src/main.c | 2 +- tests/kernel/interrupt/src/interrupt.h | 2 +- .../kernel/mem_protect/protection/src/main.c | 2 +- 203 files changed, 199 insertions(+), 196 deletions(-) create mode 100644 arch/arm/aarch32.cmake rename arch/arm/core/{ => aarch32}/CMakeLists.txt (100%) rename arch/arm/core/{ => aarch32}/Kconfig (97%) rename arch/arm/core/{ => aarch32}/__aeabi_atexit.c (100%) rename arch/arm/core/{ => aarch32}/cortex_m/CMakeLists.txt (100%) rename arch/arm/core/{ => aarch32}/cortex_m/Kconfig (100%) rename arch/arm/core/{ => aarch32}/cortex_m/cmse/CMakeLists.txt (100%) rename arch/arm/core/{ => aarch32}/cortex_m/cmse/arm_core_cmse.c (99%) rename arch/arm/core/{ => aarch32}/cortex_m/fault.c (100%) rename arch/arm/core/{ => aarch32}/cortex_m/irq_init.c (93%) rename arch/arm/core/{ => aarch32}/cortex_m/mpu/CMakeLists.txt (100%) rename arch/arm/core/{ => aarch32}/cortex_m/mpu/Kconfig (100%) rename arch/arm/core/{ => aarch32}/cortex_m/mpu/arm_core_mpu.c (100%) rename arch/arm/core/{ => aarch32}/cortex_m/mpu/arm_core_mpu_dev.h (100%) rename arch/arm/core/{ => aarch32}/cortex_m/mpu/arm_mpu.c (100%) rename arch/arm/core/{ => aarch32}/cortex_m/mpu/arm_mpu_v7_internal.h (100%) rename arch/arm/core/{ => aarch32}/cortex_m/mpu/arm_mpu_v8_internal.h (99%) rename arch/arm/core/{ => aarch32}/cortex_m/mpu/nxp_mpu.c (100%) rename arch/arm/core/{ => aarch32}/cortex_m/relay_vector_table.ld (100%) rename arch/arm/core/{ => aarch32}/cortex_m/reset.S (100%) rename arch/arm/core/{ => aarch32}/cortex_m/scb.c (93%) rename arch/arm/core/{ => aarch32}/cortex_m/thread_abort.c (100%) rename arch/arm/core/{ => aarch32}/cortex_m/tz/CMakeLists.txt (100%) rename arch/arm/core/{ => aarch32}/cortex_m/tz/Kconfig (100%) rename arch/arm/core/{ => aarch32}/cortex_m/tz/arm_core_tz.c (97%) rename arch/arm/core/{ => aarch32}/cortex_m/tz/secure_entry_functions.ld (100%) rename arch/arm/core/{ => aarch32}/cortex_m/vector_table.S (100%) rename arch/arm/core/{ => aarch32}/cortex_m/vector_table.h (100%) rename arch/arm/core/{ => aarch32}/cortex_m/vt_pointer_section.ld (100%) rename arch/arm/core/{ => aarch32}/cortex_r/CMakeLists.txt (100%) rename arch/arm/core/{ => aarch32}/cortex_r/Kconfig (100%) rename arch/arm/core/{ => aarch32}/cortex_r/fault.c (100%) rename arch/arm/core/{ => aarch32}/cortex_r/reboot.c (100%) rename arch/arm/core/{ => aarch32}/cortex_r/reset.S (100%) rename arch/arm/core/{ => aarch32}/cortex_r/stacks.c (96%) rename arch/arm/core/{ => aarch32}/cortex_r/vector_table.S (100%) rename arch/arm/core/{ => aarch32}/cortex_r/vector_table.h (100%) rename arch/arm/core/{ => aarch32}/cpu_idle.S (100%) rename arch/arm/core/{ => aarch32}/exc_exit.S (100%) rename arch/arm/core/{ => aarch32}/fatal.c (100%) rename arch/arm/core/{ => aarch32}/fault_s.S (100%) rename arch/arm/core/{ => aarch32}/irq_manage.c (98%) rename arch/arm/core/{ => aarch32}/irq_offload.c (100%) rename arch/arm/core/{ => aarch32}/irq_relay.S (100%) rename arch/arm/core/{ => aarch32}/isr_wrapper.S (100%) rename arch/arm/core/{ => aarch32}/nmi.c (100%) rename arch/arm/core/{ => aarch32}/nmi_on_reset.S (100%) rename arch/arm/core/{ => aarch32}/prep_c.c (99%) rename arch/arm/core/{ => aarch32}/swap.c (100%) rename arch/arm/core/{ => aarch32}/swap_helper.S (100%) rename arch/arm/core/{ => aarch32}/thread.c (100%) rename arch/arm/core/{ => aarch32}/userspace.S (100%) rename arch/arm/core/{ => aarch32}/vector_table.ld (100%) rename arch/arm/include/{ => aarch32}/cortex_m/cmse.h (100%) rename arch/arm/include/{ => aarch32}/cortex_m/exc.h (98%) rename arch/arm/include/{ => aarch32}/cortex_m/stack.h (97%) rename arch/arm/include/{ => aarch32}/cortex_m/tz.h (100%) rename arch/arm/include/{ => aarch32}/cortex_r/exc.h (100%) rename arch/arm/include/{ => aarch32}/cortex_r/stack.h (100%) rename include/arch/arm/{ => aarch32}/arch.h (93%) rename include/arch/arm/{ => aarch32}/asm_inline.h (91%) rename include/arch/arm/{ => aarch32}/asm_inline_gcc.h (98%) rename include/arch/arm/{ => aarch32}/cortex_m/cmsis.h (100%) rename include/arch/arm/{ => aarch32}/cortex_m/cpu.h (100%) rename include/arch/arm/{ => aarch32}/cortex_m/memory_map.h (100%) rename include/arch/arm/{ => aarch32}/cortex_m/mpu/arm_mpu.h (93%) rename include/arch/arm/{ => aarch32}/cortex_m/mpu/arm_mpu_v7m.h (99%) rename include/arch/arm/{ => aarch32}/cortex_m/mpu/arm_mpu_v8m.h (99%) rename include/arch/arm/{ => aarch32}/cortex_m/mpu/nxp_mpu.h (100%) rename include/arch/arm/{ => aarch32}/cortex_m/scripts/linker.ld (100%) rename include/arch/arm/{ => aarch32}/cortex_r/cpu.h (100%) rename include/arch/arm/{ => aarch32}/cortex_r/scripts/app_data_alignment.ld (100%) rename include/arch/arm/{ => aarch32}/cortex_r/scripts/linker.ld (100%) rename include/arch/arm/{ => aarch32}/cortex_r/sys_io.h (100%) rename include/arch/arm/{ => aarch32}/error.h (95%) rename include/arch/arm/{ => aarch32}/exc.h (100%) rename include/arch/arm/{ => aarch32}/irq.h (99%) rename include/arch/arm/{ => aarch32}/misc.h (100%) rename include/arch/arm/{ => aarch32}/nmi.h (100%) rename include/arch/arm/{ => aarch32}/syscall.h (99%) rename include/arch/arm/{ => aarch32}/thread.h (100%) diff --git a/CODEOWNERS b/CODEOWNERS index a54bbc7ecff..f4d6ad050df 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -16,9 +16,9 @@ /.known-issues/ @inakypg @nashif /arch/arc/ @vonhust @ruuddw /arch/arm/ @MaureenHelm @galak @ioannisg -/arch/arm/core/cortex_m/cmse/ @ioannisg -/arch/arm/include/cortex_m/cmse.h @ioannisg -/arch/arm/core/cortex_r/ @MaureenHelm @galak @ioannisg @bbolen +/arch/arm/core/aarch32/cortex_m/cmse/ @ioannisg +/arch/arm/include/aarch32/cortex_m/cmse.h @ioannisg +/arch/arm/core/aarch32/cortex_r/ @MaureenHelm @galak @ioannisg @bbolen @stephanosio /arch/common/ @andrewboie @ioannisg @andyross /soc/arc/snps_*/ @vonhust @ruuddw /soc/nios2/ @nashif @wentongwu @@ -245,8 +245,8 @@ /include/arch/arc/ @vonhust @ruuddw /include/arch/arc/arch.h @andrewboie /include/arch/arc/v2/irq.h @andrewboie -/include/arch/arm/ @MaureenHelm @galak @ioannisg -/include/arch/arm/irq.h @andrewboie +/include/arch/arm/aarch32/ @MaureenHelm @galak @ioannisg +/include/arch/arm/aarch32/irq.h @andrewboie /include/arch/nios2/ @andrewboie /include/arch/nios2/arch.h @andrewboie /include/arch/posix/ @aescolar diff --git a/arch/arm/CMakeLists.txt b/arch/arm/CMakeLists.txt index b869b036e0d..0798f8d9051 100644 --- a/arch/arm/CMakeLists.txt +++ b/arch/arm/CMakeLists.txt @@ -1,26 +1,3 @@ # SPDX-License-Identifier: Apache-2.0 -set(ARCH_FOR_cortex-m0 armv6s-m ) -set(ARCH_FOR_cortex-m0plus armv6s-m ) -set(ARCH_FOR_cortex-m3 armv7-m ) -set(ARCH_FOR_cortex-m4 armv7e-m ) -set(ARCH_FOR_cortex-m23 armv8-m.base ) -set(ARCH_FOR_cortex-m33 armv8-m.main+dsp) -set(ARCH_FOR_cortex-m33+nodsp armv8-m.main ) -set(ARCH_FOR_cortex-r4 armv7-r ) - -if(ARCH_FOR_${GCC_M_CPU}) - set(ARCH_FLAG -march=${ARCH_FOR_${GCC_M_CPU}}) -endif() - -zephyr_compile_options( - -mabi=aapcs - ${ARCH_FLAG} - ) - -zephyr_ld_options( - -mabi=aapcs - ${ARCH_FLAG} - ) - -add_subdirectory(core) +include(aarch32.cmake) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 07d01d39f92..dccf3783670 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -6,7 +6,7 @@ menu "ARM Options" depends on ARM -source "arch/arm/core/Kconfig" +source "arch/arm/core/aarch32/Kconfig" config ARCH default "arm" diff --git a/arch/arm/aarch32.cmake b/arch/arm/aarch32.cmake new file mode 100644 index 00000000000..642b7a8d19f --- /dev/null +++ b/arch/arm/aarch32.cmake @@ -0,0 +1,26 @@ +# SPDX-License-Identifier: Apache-2.0 + +set(ARCH_FOR_cortex-m0 armv6s-m ) +set(ARCH_FOR_cortex-m0plus armv6s-m ) +set(ARCH_FOR_cortex-m3 armv7-m ) +set(ARCH_FOR_cortex-m4 armv7e-m ) +set(ARCH_FOR_cortex-m23 armv8-m.base ) +set(ARCH_FOR_cortex-m33 armv8-m.main+dsp) +set(ARCH_FOR_cortex-m33+nodsp armv8-m.main ) +set(ARCH_FOR_cortex-r4 armv7-r ) + +if(ARCH_FOR_${GCC_M_CPU}) + set(ARCH_FLAG -march=${ARCH_FOR_${GCC_M_CPU}}) +endif() + +zephyr_compile_options( + -mabi=aapcs + ${ARCH_FLAG} + ) + +zephyr_ld_options( + -mabi=aapcs + ${ARCH_FLAG} + ) + +add_subdirectory(core/aarch32) diff --git a/arch/arm/core/CMakeLists.txt b/arch/arm/core/aarch32/CMakeLists.txt similarity index 100% rename from arch/arm/core/CMakeLists.txt rename to arch/arm/core/aarch32/CMakeLists.txt diff --git a/arch/arm/core/Kconfig b/arch/arm/core/aarch32/Kconfig similarity index 97% rename from arch/arm/core/Kconfig rename to arch/arm/core/aarch32/Kconfig index b964c8839bc..949415e7b85 100644 --- a/arch/arm/core/Kconfig +++ b/arch/arm/core/aarch32/Kconfig @@ -271,9 +271,9 @@ endchoice endmenu -source "arch/arm/core/cortex_m/Kconfig" -source "arch/arm/core/cortex_r/Kconfig" +source "arch/arm/core/aarch32/cortex_m/Kconfig" +source "arch/arm/core/aarch32/cortex_r/Kconfig" -source "arch/arm/core/cortex_m/mpu/Kconfig" +source "arch/arm/core/aarch32/cortex_m/mpu/Kconfig" -source "arch/arm/core/cortex_m/tz/Kconfig" +source "arch/arm/core/aarch32/cortex_m/tz/Kconfig" diff --git a/arch/arm/core/__aeabi_atexit.c b/arch/arm/core/aarch32/__aeabi_atexit.c similarity index 100% rename from arch/arm/core/__aeabi_atexit.c rename to arch/arm/core/aarch32/__aeabi_atexit.c diff --git a/arch/arm/core/cortex_m/CMakeLists.txt b/arch/arm/core/aarch32/cortex_m/CMakeLists.txt similarity index 100% rename from arch/arm/core/cortex_m/CMakeLists.txt rename to arch/arm/core/aarch32/cortex_m/CMakeLists.txt diff --git a/arch/arm/core/cortex_m/Kconfig b/arch/arm/core/aarch32/cortex_m/Kconfig similarity index 100% rename from arch/arm/core/cortex_m/Kconfig rename to arch/arm/core/aarch32/cortex_m/Kconfig diff --git a/arch/arm/core/cortex_m/cmse/CMakeLists.txt b/arch/arm/core/aarch32/cortex_m/cmse/CMakeLists.txt similarity index 100% rename from arch/arm/core/cortex_m/cmse/CMakeLists.txt rename to arch/arm/core/aarch32/cortex_m/cmse/CMakeLists.txt diff --git a/arch/arm/core/cortex_m/cmse/arm_core_cmse.c b/arch/arm/core/aarch32/cortex_m/cmse/arm_core_cmse.c similarity index 99% rename from arch/arm/core/cortex_m/cmse/arm_core_cmse.c rename to arch/arm/core/aarch32/cortex_m/cmse/arm_core_cmse.c index 83ff495e3c3..19ea839ac50 100644 --- a/arch/arm/core/cortex_m/cmse/arm_core_cmse.c +++ b/arch/arm/core/aarch32/cortex_m/cmse/arm_core_cmse.c @@ -5,7 +5,7 @@ */ #include -#include +#include int arm_cmse_mpu_region_get(u32_t addr) { diff --git a/arch/arm/core/cortex_m/fault.c b/arch/arm/core/aarch32/cortex_m/fault.c similarity index 100% rename from arch/arm/core/cortex_m/fault.c rename to arch/arm/core/aarch32/cortex_m/fault.c diff --git a/arch/arm/core/cortex_m/irq_init.c b/arch/arm/core/aarch32/cortex_m/irq_init.c similarity index 93% rename from arch/arm/core/cortex_m/irq_init.c rename to arch/arm/core/aarch32/cortex_m/irq_init.c index 339cb1670d6..25848937da7 100644 --- a/arch/arm/core/cortex_m/irq_init.c +++ b/arch/arm/core/aarch32/cortex_m/irq_init.c @@ -11,7 +11,7 @@ */ #include -#include +#include /** * diff --git a/arch/arm/core/cortex_m/mpu/CMakeLists.txt b/arch/arm/core/aarch32/cortex_m/mpu/CMakeLists.txt similarity index 100% rename from arch/arm/core/cortex_m/mpu/CMakeLists.txt rename to arch/arm/core/aarch32/cortex_m/mpu/CMakeLists.txt diff --git a/arch/arm/core/cortex_m/mpu/Kconfig b/arch/arm/core/aarch32/cortex_m/mpu/Kconfig similarity index 100% rename from arch/arm/core/cortex_m/mpu/Kconfig rename to arch/arm/core/aarch32/cortex_m/mpu/Kconfig diff --git a/arch/arm/core/cortex_m/mpu/arm_core_mpu.c b/arch/arm/core/aarch32/cortex_m/mpu/arm_core_mpu.c similarity index 100% rename from arch/arm/core/cortex_m/mpu/arm_core_mpu.c rename to arch/arm/core/aarch32/cortex_m/mpu/arm_core_mpu.c diff --git a/arch/arm/core/cortex_m/mpu/arm_core_mpu_dev.h b/arch/arm/core/aarch32/cortex_m/mpu/arm_core_mpu_dev.h similarity index 100% rename from arch/arm/core/cortex_m/mpu/arm_core_mpu_dev.h rename to arch/arm/core/aarch32/cortex_m/mpu/arm_core_mpu_dev.h diff --git a/arch/arm/core/cortex_m/mpu/arm_mpu.c b/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu.c similarity index 100% rename from arch/arm/core/cortex_m/mpu/arm_mpu.c rename to arch/arm/core/aarch32/cortex_m/mpu/arm_mpu.c diff --git a/arch/arm/core/cortex_m/mpu/arm_mpu_v7_internal.h b/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v7_internal.h similarity index 100% rename from arch/arm/core/cortex_m/mpu/arm_mpu_v7_internal.h rename to arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v7_internal.h diff --git a/arch/arm/core/cortex_m/mpu/arm_mpu_v8_internal.h b/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v8_internal.h similarity index 99% rename from arch/arm/core/cortex_m/mpu/arm_mpu_v8_internal.h rename to arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v8_internal.h index 31ddca6b309..ca88d61d267 100644 --- a/arch/arm/core/cortex_m/mpu/arm_mpu_v8_internal.h +++ b/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v8_internal.h @@ -8,7 +8,7 @@ #ifndef ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V8_INTERNAL_H_ #define ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V8_INTERNAL_H_ -#include +#include #define LOG_LEVEL CONFIG_MPU_LOG_LEVEL #include diff --git a/arch/arm/core/cortex_m/mpu/nxp_mpu.c b/arch/arm/core/aarch32/cortex_m/mpu/nxp_mpu.c similarity index 100% rename from arch/arm/core/cortex_m/mpu/nxp_mpu.c rename to arch/arm/core/aarch32/cortex_m/mpu/nxp_mpu.c diff --git a/arch/arm/core/cortex_m/relay_vector_table.ld b/arch/arm/core/aarch32/cortex_m/relay_vector_table.ld similarity index 100% rename from arch/arm/core/cortex_m/relay_vector_table.ld rename to arch/arm/core/aarch32/cortex_m/relay_vector_table.ld diff --git a/arch/arm/core/cortex_m/reset.S b/arch/arm/core/aarch32/cortex_m/reset.S similarity index 100% rename from arch/arm/core/cortex_m/reset.S rename to arch/arm/core/aarch32/cortex_m/reset.S diff --git a/arch/arm/core/cortex_m/scb.c b/arch/arm/core/aarch32/cortex_m/scb.c similarity index 93% rename from arch/arm/core/cortex_m/scb.c rename to arch/arm/core/aarch32/cortex_m/scb.c index e0e04ba6bf6..2e10437fdb0 100644 --- a/arch/arm/core/cortex_m/scb.c +++ b/arch/arm/core/aarch32/cortex_m/scb.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include /** * diff --git a/arch/arm/core/cortex_m/thread_abort.c b/arch/arm/core/aarch32/cortex_m/thread_abort.c similarity index 100% rename from arch/arm/core/cortex_m/thread_abort.c rename to arch/arm/core/aarch32/cortex_m/thread_abort.c diff --git a/arch/arm/core/cortex_m/tz/CMakeLists.txt b/arch/arm/core/aarch32/cortex_m/tz/CMakeLists.txt similarity index 100% rename from arch/arm/core/cortex_m/tz/CMakeLists.txt rename to arch/arm/core/aarch32/cortex_m/tz/CMakeLists.txt diff --git a/arch/arm/core/cortex_m/tz/Kconfig b/arch/arm/core/aarch32/cortex_m/tz/Kconfig similarity index 100% rename from arch/arm/core/cortex_m/tz/Kconfig rename to arch/arm/core/aarch32/cortex_m/tz/Kconfig diff --git a/arch/arm/core/cortex_m/tz/arm_core_tz.c b/arch/arm/core/aarch32/cortex_m/tz/arm_core_tz.c similarity index 97% rename from arch/arm/core/cortex_m/tz/arm_core_tz.c rename to arch/arm/core/aarch32/cortex_m/tz/arm_core_tz.c index 4c0da822ec2..125d9177779 100644 --- a/arch/arm/core/cortex_m/tz/arm_core_tz.c +++ b/arch/arm/core/aarch32/cortex_m/tz/arm_core_tz.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include -#include -#include +#include +#include +#include static void configure_nonsecure_vtor_offset(u32_t vtor_ns) { diff --git a/arch/arm/core/cortex_m/tz/secure_entry_functions.ld b/arch/arm/core/aarch32/cortex_m/tz/secure_entry_functions.ld similarity index 100% rename from arch/arm/core/cortex_m/tz/secure_entry_functions.ld rename to arch/arm/core/aarch32/cortex_m/tz/secure_entry_functions.ld diff --git a/arch/arm/core/cortex_m/vector_table.S b/arch/arm/core/aarch32/cortex_m/vector_table.S similarity index 100% rename from arch/arm/core/cortex_m/vector_table.S rename to arch/arm/core/aarch32/cortex_m/vector_table.S diff --git a/arch/arm/core/cortex_m/vector_table.h b/arch/arm/core/aarch32/cortex_m/vector_table.h similarity index 100% rename from arch/arm/core/cortex_m/vector_table.h rename to arch/arm/core/aarch32/cortex_m/vector_table.h diff --git a/arch/arm/core/cortex_m/vt_pointer_section.ld b/arch/arm/core/aarch32/cortex_m/vt_pointer_section.ld similarity index 100% rename from arch/arm/core/cortex_m/vt_pointer_section.ld rename to arch/arm/core/aarch32/cortex_m/vt_pointer_section.ld diff --git a/arch/arm/core/cortex_r/CMakeLists.txt b/arch/arm/core/aarch32/cortex_r/CMakeLists.txt similarity index 100% rename from arch/arm/core/cortex_r/CMakeLists.txt rename to arch/arm/core/aarch32/cortex_r/CMakeLists.txt diff --git a/arch/arm/core/cortex_r/Kconfig b/arch/arm/core/aarch32/cortex_r/Kconfig similarity index 100% rename from arch/arm/core/cortex_r/Kconfig rename to arch/arm/core/aarch32/cortex_r/Kconfig diff --git a/arch/arm/core/cortex_r/fault.c b/arch/arm/core/aarch32/cortex_r/fault.c similarity index 100% rename from arch/arm/core/cortex_r/fault.c rename to arch/arm/core/aarch32/cortex_r/fault.c diff --git a/arch/arm/core/cortex_r/reboot.c b/arch/arm/core/aarch32/cortex_r/reboot.c similarity index 100% rename from arch/arm/core/cortex_r/reboot.c rename to arch/arm/core/aarch32/cortex_r/reboot.c diff --git a/arch/arm/core/cortex_r/reset.S b/arch/arm/core/aarch32/cortex_r/reset.S similarity index 100% rename from arch/arm/core/cortex_r/reset.S rename to arch/arm/core/aarch32/cortex_r/reset.S diff --git a/arch/arm/core/cortex_r/stacks.c b/arch/arm/core/aarch32/cortex_r/stacks.c similarity index 96% rename from arch/arm/core/cortex_r/stacks.c rename to arch/arm/core/aarch32/cortex_r/stacks.c index 53da144c737..7badd3319f7 100644 --- a/arch/arm/core/cortex_r/stacks.c +++ b/arch/arm/core/aarch32/cortex_r/stacks.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include K_THREAD_STACK_DEFINE(z_arm_fiq_stack, CONFIG_ARMV7_FIQ_STACK_SIZE); diff --git a/arch/arm/core/cortex_r/vector_table.S b/arch/arm/core/aarch32/cortex_r/vector_table.S similarity index 100% rename from arch/arm/core/cortex_r/vector_table.S rename to arch/arm/core/aarch32/cortex_r/vector_table.S diff --git a/arch/arm/core/cortex_r/vector_table.h b/arch/arm/core/aarch32/cortex_r/vector_table.h similarity index 100% rename from arch/arm/core/cortex_r/vector_table.h rename to arch/arm/core/aarch32/cortex_r/vector_table.h diff --git a/arch/arm/core/cpu_idle.S b/arch/arm/core/aarch32/cpu_idle.S similarity index 100% rename from arch/arm/core/cpu_idle.S rename to arch/arm/core/aarch32/cpu_idle.S diff --git a/arch/arm/core/exc_exit.S b/arch/arm/core/aarch32/exc_exit.S similarity index 100% rename from arch/arm/core/exc_exit.S rename to arch/arm/core/aarch32/exc_exit.S diff --git a/arch/arm/core/fatal.c b/arch/arm/core/aarch32/fatal.c similarity index 100% rename from arch/arm/core/fatal.c rename to arch/arm/core/aarch32/fatal.c diff --git a/arch/arm/core/fault_s.S b/arch/arm/core/aarch32/fault_s.S similarity index 100% rename from arch/arm/core/fault_s.S rename to arch/arm/core/aarch32/fault_s.S diff --git a/arch/arm/core/irq_manage.c b/arch/arm/core/aarch32/irq_manage.c similarity index 98% rename from arch/arm/core/irq_manage.c rename to arch/arm/core/aarch32/irq_manage.c index 7da9676b157..b40de5aa55e 100644 --- a/arch/arm/core/irq_manage.c +++ b/arch/arm/core/aarch32/irq_manage.c @@ -17,7 +17,7 @@ #include #include #if defined(CONFIG_CPU_CORTEX_M) -#include +#include #elif defined(CONFIG_CPU_CORTEX_R) #include #include @@ -171,7 +171,7 @@ void _arch_isr_direct_pm(void) #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE) /* Lock all interrupts. irq_lock() will on this CPU only disable those * lower than BASEPRI, which is not what we want. See comments in - * arch/arm/core/isr_wrapper.S + * arch/arm/core/aarch32/isr_wrapper.S */ __asm__ volatile("cpsid i" : : : "memory"); #else diff --git a/arch/arm/core/irq_offload.c b/arch/arm/core/aarch32/irq_offload.c similarity index 100% rename from arch/arm/core/irq_offload.c rename to arch/arm/core/aarch32/irq_offload.c diff --git a/arch/arm/core/irq_relay.S b/arch/arm/core/aarch32/irq_relay.S similarity index 100% rename from arch/arm/core/irq_relay.S rename to arch/arm/core/aarch32/irq_relay.S diff --git a/arch/arm/core/isr_wrapper.S b/arch/arm/core/aarch32/isr_wrapper.S similarity index 100% rename from arch/arm/core/isr_wrapper.S rename to arch/arm/core/aarch32/isr_wrapper.S diff --git a/arch/arm/core/nmi.c b/arch/arm/core/aarch32/nmi.c similarity index 100% rename from arch/arm/core/nmi.c rename to arch/arm/core/aarch32/nmi.c diff --git a/arch/arm/core/nmi_on_reset.S b/arch/arm/core/aarch32/nmi_on_reset.S similarity index 100% rename from arch/arm/core/nmi_on_reset.S rename to arch/arm/core/aarch32/nmi_on_reset.S diff --git a/arch/arm/core/prep_c.c b/arch/arm/core/aarch32/prep_c.c similarity index 99% rename from arch/arm/core/prep_c.c rename to arch/arm/core/aarch32/prep_c.c index d62c14e7c99..f9d81c53b32 100644 --- a/arch/arm/core/prep_c.c +++ b/arch/arm/core/aarch32/prep_c.c @@ -21,7 +21,7 @@ #include #if defined(CONFIG_ARMV7_R) -#include +#include #endif #if defined(__GNUC__) diff --git a/arch/arm/core/swap.c b/arch/arm/core/aarch32/swap.c similarity index 100% rename from arch/arm/core/swap.c rename to arch/arm/core/aarch32/swap.c diff --git a/arch/arm/core/swap_helper.S b/arch/arm/core/aarch32/swap_helper.S similarity index 100% rename from arch/arm/core/swap_helper.S rename to arch/arm/core/aarch32/swap_helper.S diff --git a/arch/arm/core/thread.c b/arch/arm/core/aarch32/thread.c similarity index 100% rename from arch/arm/core/thread.c rename to arch/arm/core/aarch32/thread.c diff --git a/arch/arm/core/userspace.S b/arch/arm/core/aarch32/userspace.S similarity index 100% rename from arch/arm/core/userspace.S rename to arch/arm/core/aarch32/userspace.S diff --git a/arch/arm/core/vector_table.ld b/arch/arm/core/aarch32/vector_table.ld similarity index 100% rename from arch/arm/core/vector_table.ld rename to arch/arm/core/aarch32/vector_table.ld diff --git a/arch/arm/include/cortex_m/cmse.h b/arch/arm/include/aarch32/cortex_m/cmse.h similarity index 100% rename from arch/arm/include/cortex_m/cmse.h rename to arch/arm/include/aarch32/cortex_m/cmse.h diff --git a/arch/arm/include/cortex_m/exc.h b/arch/arm/include/aarch32/cortex_m/exc.h similarity index 98% rename from arch/arm/include/cortex_m/exc.h rename to arch/arm/include/aarch32/cortex_m/exc.h index 929c2816ff7..c8edbbc1fd0 100644 --- a/arch/arm/include/cortex_m/exc.h +++ b/arch/arm/include/aarch32/cortex_m/exc.h @@ -22,8 +22,8 @@ #else -#include -#include +#include +#include #include #ifdef __cplusplus diff --git a/arch/arm/include/cortex_m/stack.h b/arch/arm/include/aarch32/cortex_m/stack.h similarity index 97% rename from arch/arm/include/cortex_m/stack.h rename to arch/arm/include/aarch32/cortex_m/stack.h index 01b7644f9ea..c37ac9705e3 100644 --- a/arch/arm/include/cortex_m/stack.h +++ b/arch/arm/include/aarch32/cortex_m/stack.h @@ -20,7 +20,7 @@ #else -#include +#include #ifdef __cplusplus extern "C" { diff --git a/arch/arm/include/cortex_m/tz.h b/arch/arm/include/aarch32/cortex_m/tz.h similarity index 100% rename from arch/arm/include/cortex_m/tz.h rename to arch/arm/include/aarch32/cortex_m/tz.h diff --git a/arch/arm/include/cortex_r/exc.h b/arch/arm/include/aarch32/cortex_r/exc.h similarity index 100% rename from arch/arm/include/cortex_r/exc.h rename to arch/arm/include/aarch32/cortex_r/exc.h diff --git a/arch/arm/include/cortex_r/stack.h b/arch/arm/include/aarch32/cortex_r/stack.h similarity index 100% rename from arch/arm/include/cortex_r/stack.h rename to arch/arm/include/aarch32/cortex_r/stack.h diff --git a/arch/arm/include/kernel_arch_data.h b/arch/arm/include/kernel_arch_data.h index 4dbed96a722..600b4f4a7ec 100644 --- a/arch/arm/include/kernel_arch_data.h +++ b/arch/arm/include/kernel_arch_data.h @@ -30,11 +30,11 @@ #define STACK_ROUND_DOWN(x) ROUND_DOWN(x, STACK_ALIGN_SIZE) #ifdef CONFIG_CPU_CORTEX_M -#include -#include +#include +#include #elif defined(CONFIG_CPU_CORTEX_R) -#include -#include +#include +#include #endif #ifndef _ASMLANGUAGE diff --git a/arch/common/timing_info_bench.c b/arch/common/timing_info_bench.c index 1c89b87f503..2f28d0a54a6 100644 --- a/arch/common/timing_info_bench.c +++ b/arch/common/timing_info_bench.c @@ -38,7 +38,7 @@ u64_t arch_timing_value_swap_temp; #define SUBTRACT_CLOCK_CYCLES(val) (val) #elif CONFIG_ARM -#include +#include #define TIMING_INFO_PRE_READ() #define TIMING_INFO_OS_GET_TIME() (k_cycle_get_32()) #define TIMING_INFO_GET_TIMER_VALUE() (SysTick->VAL) diff --git a/doc/guides/code-relocation.rst b/doc/guides/code-relocation.rst index a92275aade9..8d9b2f13f27 100644 --- a/doc/guides/code-relocation.rst +++ b/doc/guides/code-relocation.rst @@ -99,4 +99,4 @@ A sample showcasing this feature is provided at This is an example of using the code relocation feature. This example will place .text, .data, .bss from 3 files to various parts in the SRAM -using a custom linker file derived from ``include/arch/arm/cortex_m/scripts/linker.ld`` +using a custom linker file derived from ``include/arch/arm/aarch32/cortex_m/scripts/linker.ld`` diff --git a/doc/guides/porting/arch.rst b/doc/guides/porting/arch.rst index 2e532d612c2..12a44eca60d 100644 --- a/doc/guides/porting/arch.rst +++ b/doc/guides/porting/arch.rst @@ -160,7 +160,7 @@ we strongly suggest that handlers at least print some debug information. The information helps figuring out what went wrong when hitting an exception that is a fault, like divide-by-zero or invalid memory access, or an interrupt that is not expected (:dfn:`spurious interrupt`). See the ARM implementation in -:zephyr_file:`arch/arm/core/cortex_m/fault.c` for an example. +:zephyr_file:`arch/arm/core/aarch32/cortex_m/fault.c` for an example. Thread Context Switching ************************ @@ -299,7 +299,7 @@ gracefully exits its entry point function. This means implementing an architecture-specific version of :cpp:func:`k_thread_abort`, and setting the Kconfig option :option:`CONFIG_ARCH_HAS_THREAD_ABORT` as needed for the architecture (e.g. see -:zephyr_file:`arch/arm//core/cortex_m/Kconfig`). +:zephyr_file:`arch/arm/core/aarch32/cortex_m/Kconfig`). Device Drivers ************** diff --git a/doc/reference/usermode/memory_domain.rst b/doc/reference/usermode/memory_domain.rst index 4ef6e78df31..be708c24e7d 100644 --- a/doc/reference/usermode/memory_domain.rst +++ b/doc/reference/usermode/memory_domain.rst @@ -440,7 +440,7 @@ dependent. The complete list of available partition attributes for a specific architecture is found in the architecture-specific include file -``include/arch//arch.h``, (for example, ``include/arch/arm/arch.h``.) +``include/arch//arch.h``, (for example, ``include/arch/arm/aarch32/arch.h``.) Some examples of partition attributes are: .. code-block:: c diff --git a/drivers/timer/cortex_m_systick.c b/drivers/timer/cortex_m_systick.c index f1ce312d138..7a428322488 100644 --- a/drivers/timer/cortex_m_systick.c +++ b/drivers/timer/cortex_m_systick.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include void z_arm_exc_exit(void); diff --git a/include/arch/arm/arch.h b/include/arch/arm/aarch32/arch.h similarity index 93% rename from include/arch/arm/arch.h rename to include/arch/arm/aarch32/arch.h index f19e7d65889..bdf15e2a381 100644 --- a/include/arch/arm/arch.h +++ b/include/arch/arm/aarch32/arch.h @@ -22,23 +22,23 @@ /* ARM GPRs are often designated by two different names */ #define sys_define_gpr_with_alias(name1, name2) union { u32_t name1, name2; } -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include -#include -#include +#include +#include #ifdef CONFIG_CPU_CORTEX_M -#include -#include +#include +#include #include #elif defined(CONFIG_CPU_CORTEX_R) -#include -#include +#include +#include #endif #ifdef __cplusplus @@ -245,10 +245,10 @@ extern "C" { /* Legacy case: retain containing extern "C" with C++ */ #ifdef CONFIG_ARM_MPU #ifdef CONFIG_CPU_HAS_ARM_MPU -#include +#include #endif /* CONFIG_CPU_HAS_ARM_MPU */ #ifdef CONFIG_CPU_HAS_NXP_MPU -#include +#include #endif /* CONFIG_CPU_HAS_NXP_MPU */ #endif /* CONFIG_ARM_MPU */ diff --git a/include/arch/arm/asm_inline.h b/include/arch/arm/aarch32/asm_inline.h similarity index 91% rename from include/arch/arm/asm_inline.h rename to include/arch/arm/aarch32/asm_inline.h index f6e943dd72f..e8c64eaa470 100644 --- a/include/arch/arm/asm_inline.h +++ b/include/arch/arm/aarch32/asm_inline.h @@ -15,7 +15,7 @@ */ #if defined(__GNUC__) -#include +#include #else #include #endif diff --git a/include/arch/arm/asm_inline_gcc.h b/include/arch/arm/aarch32/asm_inline_gcc.h similarity index 98% rename from include/arch/arm/asm_inline_gcc.h rename to include/arch/arm/aarch32/asm_inline_gcc.h index 4873c5776bf..958aa5026b6 100644 --- a/include/arch/arm/asm_inline_gcc.h +++ b/include/arch/arm/aarch32/asm_inline_gcc.h @@ -19,7 +19,7 @@ #ifndef _ASMLANGUAGE #include -#include +#include #include #ifdef __cplusplus diff --git a/include/arch/arm/cortex_m/cmsis.h b/include/arch/arm/aarch32/cortex_m/cmsis.h similarity index 100% rename from include/arch/arm/cortex_m/cmsis.h rename to include/arch/arm/aarch32/cortex_m/cmsis.h diff --git a/include/arch/arm/cortex_m/cpu.h b/include/arch/arm/aarch32/cortex_m/cpu.h similarity index 100% rename from include/arch/arm/cortex_m/cpu.h rename to include/arch/arm/aarch32/cortex_m/cpu.h diff --git a/include/arch/arm/cortex_m/memory_map.h b/include/arch/arm/aarch32/cortex_m/memory_map.h similarity index 100% rename from include/arch/arm/cortex_m/memory_map.h rename to include/arch/arm/aarch32/cortex_m/memory_map.h diff --git a/include/arch/arm/cortex_m/mpu/arm_mpu.h b/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu.h similarity index 93% rename from include/arch/arm/cortex_m/mpu/arm_mpu.h rename to include/arch/arm/aarch32/cortex_m/mpu/arm_mpu.h index 5001f06ab90..f87c190ba98 100644 --- a/include/arch/arm/cortex_m/mpu/arm_mpu.h +++ b/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu.h @@ -10,10 +10,10 @@ defined(CONFIG_CPU_CORTEX_M3) || \ defined(CONFIG_CPU_CORTEX_M4) || \ defined(CONFIG_CPU_CORTEX_M7) -#include +#include #elif defined(CONFIG_CPU_CORTEX_M23) || \ defined(CONFIG_CPU_CORTEX_M33) -#include +#include #else #error "Unsupported ARM CPU" #endif diff --git a/include/arch/arm/cortex_m/mpu/arm_mpu_v7m.h b/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu_v7m.h similarity index 99% rename from include/arch/arm/cortex_m/mpu/arm_mpu_v7m.h rename to include/arch/arm/aarch32/cortex_m/mpu/arm_mpu_v7m.h index 405c396e4a2..f9f29d1f4d2 100644 --- a/include/arch/arm/cortex_m/mpu/arm_mpu_v7m.h +++ b/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu_v7m.h @@ -7,7 +7,7 @@ #ifndef _ASMLANGUAGE -#include +#include /* Convenience macros to represent the ARMv7-M-specific * configuration for memory access permission and diff --git a/include/arch/arm/cortex_m/mpu/arm_mpu_v8m.h b/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu_v8m.h similarity index 99% rename from include/arch/arm/cortex_m/mpu/arm_mpu_v8m.h rename to include/arch/arm/aarch32/cortex_m/mpu/arm_mpu_v8m.h index 4bf5fc83208..7180d6a00d1 100644 --- a/include/arch/arm/cortex_m/mpu/arm_mpu_v8m.h +++ b/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu_v8m.h @@ -7,7 +7,7 @@ #ifndef _ASMLANGUAGE -#include +#include /* Convenience macros to represent the ARMv8-M-specific * configuration for memory access permission and diff --git a/include/arch/arm/cortex_m/mpu/nxp_mpu.h b/include/arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h similarity index 100% rename from include/arch/arm/cortex_m/mpu/nxp_mpu.h rename to include/arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h diff --git a/include/arch/arm/cortex_m/scripts/linker.ld b/include/arch/arm/aarch32/cortex_m/scripts/linker.ld similarity index 100% rename from include/arch/arm/cortex_m/scripts/linker.ld rename to include/arch/arm/aarch32/cortex_m/scripts/linker.ld diff --git a/include/arch/arm/cortex_r/cpu.h b/include/arch/arm/aarch32/cortex_r/cpu.h similarity index 100% rename from include/arch/arm/cortex_r/cpu.h rename to include/arch/arm/aarch32/cortex_r/cpu.h diff --git a/include/arch/arm/cortex_r/scripts/app_data_alignment.ld b/include/arch/arm/aarch32/cortex_r/scripts/app_data_alignment.ld similarity index 100% rename from include/arch/arm/cortex_r/scripts/app_data_alignment.ld rename to include/arch/arm/aarch32/cortex_r/scripts/app_data_alignment.ld diff --git a/include/arch/arm/cortex_r/scripts/linker.ld b/include/arch/arm/aarch32/cortex_r/scripts/linker.ld similarity index 100% rename from include/arch/arm/cortex_r/scripts/linker.ld rename to include/arch/arm/aarch32/cortex_r/scripts/linker.ld diff --git a/include/arch/arm/cortex_r/sys_io.h b/include/arch/arm/aarch32/cortex_r/sys_io.h similarity index 100% rename from include/arch/arm/cortex_r/sys_io.h rename to include/arch/arm/aarch32/cortex_r/sys_io.h diff --git a/include/arch/arm/error.h b/include/arch/arm/aarch32/error.h similarity index 95% rename from include/arch/arm/error.h rename to include/arch/arm/aarch32/error.h index fb4a2b23d9e..3c9046bc455 100644 --- a/include/arch/arm/error.h +++ b/include/arch/arm/aarch32/error.h @@ -14,8 +14,8 @@ #ifndef ZEPHYR_INCLUDE_ARCH_ARM_ERROR_H_ #define ZEPHYR_INCLUDE_ARCH_ARM_ERROR_H_ -#include -#include +#include +#include #include #ifdef __cplusplus diff --git a/include/arch/arm/exc.h b/include/arch/arm/aarch32/exc.h similarity index 100% rename from include/arch/arm/exc.h rename to include/arch/arm/aarch32/exc.h diff --git a/include/arch/arm/irq.h b/include/arch/arm/aarch32/irq.h similarity index 99% rename from include/arch/arm/irq.h rename to include/arch/arm/aarch32/irq.h index c7a911820ff..84be39d6aa5 100644 --- a/include/arch/arm/irq.h +++ b/include/arch/arm/aarch32/irq.h @@ -100,7 +100,7 @@ extern void _arch_isr_direct_pm(void); #define ARCH_ISR_DIRECT_HEADER() arch_isr_direct_header() #define ARCH_ISR_DIRECT_FOOTER(swap) arch_isr_direct_footer(swap) -/* arch/arm/core/exc_exit.S */ +/* arch/arm/core/aarch32/exc_exit.S */ extern void z_arm_int_exit(void); #ifdef CONFIG_TRACING diff --git a/include/arch/arm/misc.h b/include/arch/arm/aarch32/misc.h similarity index 100% rename from include/arch/arm/misc.h rename to include/arch/arm/aarch32/misc.h diff --git a/include/arch/arm/nmi.h b/include/arch/arm/aarch32/nmi.h similarity index 100% rename from include/arch/arm/nmi.h rename to include/arch/arm/aarch32/nmi.h diff --git a/include/arch/arm/syscall.h b/include/arch/arm/aarch32/syscall.h similarity index 99% rename from include/arch/arm/syscall.h rename to include/arch/arm/aarch32/syscall.h index daf9101dbb3..f98ce56ca09 100644 --- a/include/arch/arm/syscall.h +++ b/include/arch/arm/aarch32/syscall.h @@ -26,7 +26,7 @@ #include #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/arch/arm/thread.h b/include/arch/arm/aarch32/thread.h similarity index 100% rename from include/arch/arm/thread.h rename to include/arch/arm/aarch32/thread.h diff --git a/include/arch/cpu.h b/include/arch/cpu.h index 0b75d325f0f..0d1576ad0d9 100644 --- a/include/arch/cpu.h +++ b/include/arch/cpu.h @@ -14,7 +14,7 @@ #if defined(CONFIG_X86) #include #elif defined(CONFIG_ARM) -#include +#include #elif defined(CONFIG_ARC) #include #elif defined(CONFIG_NIOS2) diff --git a/include/arch/syscall.h b/include/arch/syscall.h index 6d2784627b0..33978d358b6 100644 --- a/include/arch/syscall.h +++ b/include/arch/syscall.h @@ -12,7 +12,7 @@ #if defined(CONFIG_X86) && !defined(CONFIG_X86_64) #include #elif defined(CONFIG_ARM) -#include +#include #elif defined(CONFIG_ARC) #include #endif diff --git a/samples/application_development/code_relocation/linker_arm_sram2.ld b/samples/application_development/code_relocation/linker_arm_sram2.ld index e1e1cbed3ad..6e3d3b3ff75 100644 --- a/samples/application_development/code_relocation/linker_arm_sram2.ld +++ b/samples/application_development/code_relocation/linker_arm_sram2.ld @@ -37,4 +37,4 @@ MEMORY #endif } -#include +#include diff --git a/samples/application_development/code_relocation/src/main.c b/samples/application_development/code_relocation/src/main.c index a167a8240e8..20476668b69 100644 --- a/samples/application_development/code_relocation/src/main.c +++ b/samples/application_development/code_relocation/src/main.c @@ -17,7 +17,7 @@ */ #ifdef CONFIG_ARM_MPU -#include +#include void disable_mpu_rasr_xn(void) { u32_t index; diff --git a/soc/arm/arm/beetle/linker.ld b/soc/arm/arm/beetle/linker.ld index b6ccb02793c..975945d6cb1 100644 --- a/soc/arm/arm/beetle/linker.ld +++ b/soc/arm/arm/beetle/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/arm/mps2/linker.ld b/soc/arm/arm/mps2/linker.ld index b6ccb02793c..975945d6cb1 100644 --- a/soc/arm/arm/mps2/linker.ld +++ b/soc/arm/arm/mps2/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/arm/musca_a/linker.ld b/soc/arm/arm/musca_a/linker.ld index b6ccb02793c..975945d6cb1 100644 --- a/soc/arm/arm/musca_a/linker.ld +++ b/soc/arm/arm/musca_a/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/arm/musca_b1/linker.ld b/soc/arm/arm/musca_b1/linker.ld index b6ccb02793c..975945d6cb1 100644 --- a/soc/arm/arm/musca_b1/linker.ld +++ b/soc/arm/arm/musca_b1/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/atmel_sam/sam3x/linker.ld b/soc/arm/atmel_sam/sam3x/linker.ld index b6ccb02793c..975945d6cb1 100644 --- a/soc/arm/atmel_sam/sam3x/linker.ld +++ b/soc/arm/atmel_sam/sam3x/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/atmel_sam/sam3x/soc.c b/soc/arm/atmel_sam/sam3x/soc.c index f71a2563a85..7c383d025e4 100644 --- a/soc/arm/atmel_sam/sam3x/soc.c +++ b/soc/arm/atmel_sam/sam3x/soc.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include /* * PLL clock = Main * (MULA + 1) / DIVA diff --git a/soc/arm/atmel_sam/sam4s/linker.ld b/soc/arm/atmel_sam/sam4s/linker.ld index b6ccb02793c..975945d6cb1 100644 --- a/soc/arm/atmel_sam/sam4s/linker.ld +++ b/soc/arm/atmel_sam/sam4s/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/atmel_sam/sam4s/soc.c b/soc/arm/atmel_sam/sam4s/soc.c index 99e75e3fa25..cfd29864aaf 100644 --- a/soc/arm/atmel_sam/sam4s/soc.c +++ b/soc/arm/atmel_sam/sam4s/soc.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include /** * @brief Setup various clock on SoC at boot time. diff --git a/soc/arm/atmel_sam/same70/linker.ld b/soc/arm/atmel_sam/same70/linker.ld index d5bd00e4e18..d6c9c438a3f 100644 --- a/soc/arm/atmel_sam/same70/linker.ld +++ b/soc/arm/atmel_sam/same70/linker.ld @@ -5,4 +5,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/atmel_sam/same70/soc.c b/soc/arm/atmel_sam/same70/soc.c index c6a521d92cf..62db692e6d6 100644 --- a/soc/arm/atmel_sam/same70/soc.c +++ b/soc/arm/atmel_sam/same70/soc.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL diff --git a/soc/arm/atmel_sam0/common/soc_samd2x.c b/soc/arm/atmel_sam0/common/soc_samd2x.c index 7532aaa5ab0..56356d3fcfb 100644 --- a/soc/arm/atmel_sam0/common/soc_samd2x.c +++ b/soc/arm/atmel_sam0/common/soc_samd2x.c @@ -10,7 +10,7 @@ */ #include -#include +#include #include #include #include diff --git a/soc/arm/atmel_sam0/common/soc_samd5x.c b/soc/arm/atmel_sam0/common/soc_samd5x.c index 35ff355a426..8eee2b3a869 100644 --- a/soc/arm/atmel_sam0/common/soc_samd5x.c +++ b/soc/arm/atmel_sam0/common/soc_samd5x.c @@ -10,7 +10,7 @@ */ #include -#include +#include #include #include #include diff --git a/soc/arm/atmel_sam0/samd20/linker.ld b/soc/arm/atmel_sam0/samd20/linker.ld index 89a90aa6810..7bd02d6ac5e 100644 --- a/soc/arm/atmel_sam0/samd20/linker.ld +++ b/soc/arm/atmel_sam0/samd20/linker.ld @@ -5,4 +5,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/atmel_sam0/samd21/linker.ld b/soc/arm/atmel_sam0/samd21/linker.ld index d78bc35a821..06d16129370 100644 --- a/soc/arm/atmel_sam0/samd21/linker.ld +++ b/soc/arm/atmel_sam0/samd21/linker.ld @@ -5,4 +5,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/atmel_sam0/samd51/linker.ld b/soc/arm/atmel_sam0/samd51/linker.ld index d78bc35a821..06d16129370 100644 --- a/soc/arm/atmel_sam0/samd51/linker.ld +++ b/soc/arm/atmel_sam0/samd51/linker.ld @@ -5,4 +5,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/atmel_sam0/same51/linker.ld b/soc/arm/atmel_sam0/same51/linker.ld index d78bc35a821..06d16129370 100644 --- a/soc/arm/atmel_sam0/same51/linker.ld +++ b/soc/arm/atmel_sam0/same51/linker.ld @@ -5,4 +5,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/atmel_sam0/same53/linker.ld b/soc/arm/atmel_sam0/same53/linker.ld index d78bc35a821..06d16129370 100644 --- a/soc/arm/atmel_sam0/same53/linker.ld +++ b/soc/arm/atmel_sam0/same53/linker.ld @@ -5,4 +5,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/atmel_sam0/same54/linker.ld b/soc/arm/atmel_sam0/same54/linker.ld index d78bc35a821..06d16129370 100644 --- a/soc/arm/atmel_sam0/same54/linker.ld +++ b/soc/arm/atmel_sam0/same54/linker.ld @@ -5,4 +5,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/atmel_sam0/samr21/linker.ld b/soc/arm/atmel_sam0/samr21/linker.ld index d78bc35a821..06d16129370 100644 --- a/soc/arm/atmel_sam0/samr21/linker.ld +++ b/soc/arm/atmel_sam0/samr21/linker.ld @@ -5,4 +5,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/common/cortex_m/arm_mpu_mem_cfg.h b/soc/arm/common/cortex_m/arm_mpu_mem_cfg.h index 4720423b417..fed99e05171 100644 --- a/soc/arm/common/cortex_m/arm_mpu_mem_cfg.h +++ b/soc/arm/common/cortex_m/arm_mpu_mem_cfg.h @@ -6,7 +6,7 @@ #ifndef _ARM_CORTEX_M_MPU_MEM_CFG_H_ #define _ARM_CORTEX_M_MPU_MEM_CFG_H_ -#include +#include #if !defined(CONFIG_ARMV8_M_BASELINE) && !defined(CONFIG_ARMV8_M_MAINLINE) diff --git a/soc/arm/common/cortex_m/arm_mpu_regions.c b/soc/arm/common/cortex_m/arm_mpu_regions.c index f9c7397b715..409546b49b0 100644 --- a/soc/arm/common/cortex_m/arm_mpu_regions.c +++ b/soc/arm/common/cortex_m/arm_mpu_regions.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include "arm_mpu_mem_cfg.h" diff --git a/soc/arm/cypress/psoc6/linker.ld b/soc/arm/cypress/psoc6/linker.ld index 3f80818061c..108fe940372 100644 --- a/soc/arm/cypress/psoc6/linker.ld +++ b/soc/arm/cypress/psoc6/linker.ld @@ -13,4 +13,4 @@ #include -#include +#include diff --git a/soc/arm/cypress/psoc6/soc.c b/soc/arm/cypress/psoc6/soc.c index a9f47970f86..562b33e1377 100644 --- a/soc/arm/cypress/psoc6/soc.c +++ b/soc/arm/cypress/psoc6/soc.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include "cy_syslib.h" #include "cy_gpio.h" diff --git a/soc/arm/microchip_mec/mec1501/linker.ld b/soc/arm/microchip_mec/mec1501/linker.ld index b6ccb02793c..975945d6cb1 100644 --- a/soc/arm/microchip_mec/mec1501/linker.ld +++ b/soc/arm/microchip_mec/mec1501/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/microchip_mec/mec1501/soc.c b/soc/arm/microchip_mec/mec1501/soc.c index e06ad836106..a603fdb1d99 100644 --- a/soc/arm/microchip_mec/mec1501/soc.c +++ b/soc/arm/microchip_mec/mec1501/soc.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include /* diff --git a/soc/arm/microchip_mec/mec1701/linker.ld b/soc/arm/microchip_mec/mec1701/linker.ld index b6ccb02793c..975945d6cb1 100644 --- a/soc/arm/microchip_mec/mec1701/linker.ld +++ b/soc/arm/microchip_mec/mec1701/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/nordic_nrf/nrf51/linker.ld b/soc/arm/nordic_nrf/nrf51/linker.ld index b6ccb02793c..975945d6cb1 100644 --- a/soc/arm/nordic_nrf/nrf51/linker.ld +++ b/soc/arm/nordic_nrf/nrf51/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/nordic_nrf/nrf52/linker.ld b/soc/arm/nordic_nrf/nrf52/linker.ld index b6ccb02793c..975945d6cb1 100644 --- a/soc/arm/nordic_nrf/nrf52/linker.ld +++ b/soc/arm/nordic_nrf/nrf52/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/nordic_nrf/nrf52/soc.c b/soc/arm/nordic_nrf/nrf52/soc.c index b32a45e69c0..9a59e72d965 100644 --- a/soc/arm/nordic_nrf/nrf52/soc.c +++ b/soc/arm/nordic_nrf/nrf52/soc.c @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include #include diff --git a/soc/arm/nordic_nrf/nrf53/linker.ld b/soc/arm/nordic_nrf/nrf53/linker.ld index b6ccb02793c..975945d6cb1 100644 --- a/soc/arm/nordic_nrf/nrf53/linker.ld +++ b/soc/arm/nordic_nrf/nrf53/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/nordic_nrf/nrf53/soc.c b/soc/arm/nordic_nrf/nrf53/soc.c index 353f1681f5f..250ba5e2a45 100644 --- a/soc/arm/nordic_nrf/nrf53/soc.c +++ b/soc/arm/nordic_nrf/nrf53/soc.c @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include diff --git a/soc/arm/nordic_nrf/nrf91/linker.ld b/soc/arm/nordic_nrf/nrf91/linker.ld index b6ccb02793c..975945d6cb1 100644 --- a/soc/arm/nordic_nrf/nrf91/linker.ld +++ b/soc/arm/nordic_nrf/nrf91/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/nordic_nrf/nrf91/soc.c b/soc/arm/nordic_nrf/nrf91/soc.c index 82838ae844b..f2ff3735fcd 100644 --- a/soc/arm/nordic_nrf/nrf91/soc.c +++ b/soc/arm/nordic_nrf/nrf91/soc.c @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include diff --git a/soc/arm/nxp_imx/mcimx6x_m4/linker.ld b/soc/arm/nxp_imx/mcimx6x_m4/linker.ld index 96d0aa4f9ed..f55ebd214f3 100644 --- a/soc/arm/nxp_imx/mcimx6x_m4/linker.ld +++ b/soc/arm/nxp_imx/mcimx6x_m4/linker.ld @@ -5,4 +5,4 @@ */ #include -#include +#include diff --git a/soc/arm/nxp_imx/mcimx6x_m4/soc.c b/soc/arm/nxp_imx/mcimx6x_m4/soc.c index d92fc7cd492..2a502cdfb95 100644 --- a/soc/arm/nxp_imx/mcimx6x_m4/soc.c +++ b/soc/arm/nxp_imx/mcimx6x_m4/soc.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include "wdog_imx.h" /* Initialize Resource Domain Controller. */ diff --git a/soc/arm/nxp_imx/mcimx7_m4/linker.ld b/soc/arm/nxp_imx/mcimx7_m4/linker.ld index ad3736715ad..3b1996f08cc 100644 --- a/soc/arm/nxp_imx/mcimx7_m4/linker.ld +++ b/soc/arm/nxp_imx/mcimx7_m4/linker.ld @@ -4,4 +4,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/nxp_imx/rt/linker.ld b/soc/arm/nxp_imx/rt/linker.ld index fd951b5eb86..01e4e28df4f 100644 --- a/soc/arm/nxp_imx/rt/linker.ld +++ b/soc/arm/nxp_imx/rt/linker.ld @@ -23,4 +23,4 @@ MEMORY #endif } -#include +#include diff --git a/soc/arm/nxp_imx/rt/soc.c b/soc/arm/nxp_imx/rt/soc.c index 0f43e0dad30..aebe68fbbdd 100644 --- a/soc/arm/nxp_imx/rt/soc.c +++ b/soc/arm/nxp_imx/rt/soc.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #if CONFIG_USB_DC_NXP_EHCI #include "usb_phy.h" diff --git a/soc/arm/nxp_kinetis/k2x/linker.ld b/soc/arm/nxp_kinetis/k2x/linker.ld index ed49c1db411..2ea1b4d0bc2 100644 --- a/soc/arm/nxp_kinetis/k2x/linker.ld +++ b/soc/arm/nxp_kinetis/k2x/linker.ld @@ -11,4 +11,4 @@ * This is the linker script for both standard images and XIP images. */ -#include +#include diff --git a/soc/arm/nxp_kinetis/k2x/soc.c b/soc/arm/nxp_kinetis/k2x/soc.c index 8746fc486a6..73e7b3f5102 100644 --- a/soc/arm/nxp_kinetis/k2x/soc.c +++ b/soc/arm/nxp_kinetis/k2x/soc.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #define PLLFLLSEL_MCGFLLCLK (0) #define PLLFLLSEL_MCGPLLCLK (1) diff --git a/soc/arm/nxp_kinetis/k6x/linker.ld b/soc/arm/nxp_kinetis/k6x/linker.ld index ed49c1db411..2ea1b4d0bc2 100644 --- a/soc/arm/nxp_kinetis/k6x/linker.ld +++ b/soc/arm/nxp_kinetis/k6x/linker.ld @@ -11,4 +11,4 @@ * This is the linker script for both standard images and XIP images. */ -#include +#include diff --git a/soc/arm/nxp_kinetis/k6x/nxp_mpu_regions.c b/soc/arm/nxp_kinetis/k6x/nxp_mpu_regions.c index 1a9be3a8736..926fb939b71 100644 --- a/soc/arm/nxp_kinetis/k6x/nxp_mpu_regions.c +++ b/soc/arm/nxp_kinetis/k6x/nxp_mpu_regions.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ #include -#include +#include static const struct nxp_mpu_region mpu_regions[] = { /* Region 0 */ diff --git a/soc/arm/nxp_kinetis/k6x/soc.c b/soc/arm/nxp_kinetis/k6x/soc.c index 6901fc0a166..72e8b02e454 100644 --- a/soc/arm/nxp_kinetis/k6x/soc.c +++ b/soc/arm/nxp_kinetis/k6x/soc.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #define PLLFLLSEL_MCGFLLCLK (0) #define PLLFLLSEL_MCGPLLCLK (1) diff --git a/soc/arm/nxp_kinetis/k8x/linker.ld b/soc/arm/nxp_kinetis/k8x/linker.ld index ed49c1db411..2ea1b4d0bc2 100644 --- a/soc/arm/nxp_kinetis/k8x/linker.ld +++ b/soc/arm/nxp_kinetis/k8x/linker.ld @@ -11,4 +11,4 @@ * This is the linker script for both standard images and XIP images. */ -#include +#include diff --git a/soc/arm/nxp_kinetis/k8x/nxp_mpu_regions.c b/soc/arm/nxp_kinetis/k8x/nxp_mpu_regions.c index 904c0c435a1..4407ce2ff55 100644 --- a/soc/arm/nxp_kinetis/k8x/nxp_mpu_regions.c +++ b/soc/arm/nxp_kinetis/k8x/nxp_mpu_regions.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ #include -#include +#include static const struct nxp_mpu_region mpu_regions[] = { /* Region 0 */ diff --git a/soc/arm/nxp_kinetis/ke1xf/linker.ld b/soc/arm/nxp_kinetis/ke1xf/linker.ld index ed49c1db411..2ea1b4d0bc2 100644 --- a/soc/arm/nxp_kinetis/ke1xf/linker.ld +++ b/soc/arm/nxp_kinetis/ke1xf/linker.ld @@ -11,4 +11,4 @@ * This is the linker script for both standard images and XIP images. */ -#include +#include diff --git a/soc/arm/nxp_kinetis/ke1xf/nxp_mpu_regions.c b/soc/arm/nxp_kinetis/ke1xf/nxp_mpu_regions.c index 904c0c435a1..4407ce2ff55 100644 --- a/soc/arm/nxp_kinetis/ke1xf/nxp_mpu_regions.c +++ b/soc/arm/nxp_kinetis/ke1xf/nxp_mpu_regions.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ #include -#include +#include static const struct nxp_mpu_region mpu_regions[] = { /* Region 0 */ diff --git a/soc/arm/nxp_kinetis/ke1xf/soc.c b/soc/arm/nxp_kinetis/ke1xf/soc.c index 9aaf8d75098..1a7f3bed51a 100644 --- a/soc/arm/nxp_kinetis/ke1xf/soc.c +++ b/soc/arm/nxp_kinetis/ke1xf/soc.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #define ASSERT_WITHIN_RANGE(val, min, max, str) \ BUILD_ASSERT_MSG(val >= min && val <= max, str) diff --git a/soc/arm/nxp_kinetis/kl2x/linker.ld b/soc/arm/nxp_kinetis/kl2x/linker.ld index ed49c1db411..2ea1b4d0bc2 100644 --- a/soc/arm/nxp_kinetis/kl2x/linker.ld +++ b/soc/arm/nxp_kinetis/kl2x/linker.ld @@ -11,4 +11,4 @@ * This is the linker script for both standard images and XIP images. */ -#include +#include diff --git a/soc/arm/nxp_kinetis/kv5x/linker.ld b/soc/arm/nxp_kinetis/kv5x/linker.ld index ed49c1db411..2ea1b4d0bc2 100644 --- a/soc/arm/nxp_kinetis/kv5x/linker.ld +++ b/soc/arm/nxp_kinetis/kv5x/linker.ld @@ -11,4 +11,4 @@ * This is the linker script for both standard images and XIP images. */ -#include +#include diff --git a/soc/arm/nxp_kinetis/kwx/linker.ld b/soc/arm/nxp_kinetis/kwx/linker.ld index ed49c1db411..2ea1b4d0bc2 100644 --- a/soc/arm/nxp_kinetis/kwx/linker.ld +++ b/soc/arm/nxp_kinetis/kwx/linker.ld @@ -11,4 +11,4 @@ * This is the linker script for both standard images and XIP images. */ -#include +#include diff --git a/soc/arm/nxp_kinetis/kwx/soc_kw2xd.c b/soc/arm/nxp_kinetis/kwx/soc_kw2xd.c index 6a881b4b3b5..7e434142216 100644 --- a/soc/arm/nxp_kinetis/kwx/soc_kw2xd.c +++ b/soc/arm/nxp_kinetis/kwx/soc_kw2xd.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #define PLLFLLSEL_MCGFLLCLK (0) #define PLLFLLSEL_MCGPLLCLK (1) diff --git a/soc/arm/nxp_lpc/lpc54xxx/linker.ld b/soc/arm/nxp_lpc/lpc54xxx/linker.ld index 47bbe42cf7d..47eee9652a0 100644 --- a/soc/arm/nxp_lpc/lpc54xxx/linker.ld +++ b/soc/arm/nxp_lpc/lpc54xxx/linker.ld @@ -13,4 +13,4 @@ #include -#include +#include diff --git a/soc/arm/nxp_lpc/lpc54xxx/soc.c b/soc/arm/nxp_lpc/lpc54xxx/soc.c index dbd4b1a13bb..93cb09d9828 100644 --- a/soc/arm/nxp_lpc/lpc54xxx/soc.c +++ b/soc/arm/nxp_lpc/lpc54xxx/soc.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/soc/arm/nxp_lpc/lpc55xxx/linker.ld b/soc/arm/nxp_lpc/lpc55xxx/linker.ld index 47bbe42cf7d..47eee9652a0 100644 --- a/soc/arm/nxp_lpc/lpc55xxx/linker.ld +++ b/soc/arm/nxp_lpc/lpc55xxx/linker.ld @@ -13,4 +13,4 @@ #include -#include +#include diff --git a/soc/arm/nxp_lpc/lpc55xxx/soc.c b/soc/arm/nxp_lpc/lpc55xxx/soc.c index 3799ca7addc..732d9fa792f 100644 --- a/soc/arm/nxp_lpc/lpc55xxx/soc.c +++ b/soc/arm/nxp_lpc/lpc55xxx/soc.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/soc/arm/silabs_exx32/common/soc.c b/soc/arm/silabs_exx32/common/soc.c index a0c48b7ccfd..f165ccce00f 100644 --- a/soc/arm/silabs_exx32/common/soc.c +++ b/soc/arm/silabs_exx32/common/soc.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include diff --git a/soc/arm/silabs_exx32/efm32hg/linker.ld b/soc/arm/silabs_exx32/efm32hg/linker.ld index 755234d6777..9cf70eaba72 100644 --- a/soc/arm/silabs_exx32/efm32hg/linker.ld +++ b/soc/arm/silabs_exx32/efm32hg/linker.ld @@ -13,4 +13,4 @@ #include -#include +#include diff --git a/soc/arm/silabs_exx32/efm32pg12b/linker.ld b/soc/arm/silabs_exx32/efm32pg12b/linker.ld index 6e9283bec25..22ea2d25e5c 100644 --- a/soc/arm/silabs_exx32/efm32pg12b/linker.ld +++ b/soc/arm/silabs_exx32/efm32pg12b/linker.ld @@ -13,4 +13,4 @@ #include -#include +#include diff --git a/soc/arm/silabs_exx32/efm32wg/linker.ld b/soc/arm/silabs_exx32/efm32wg/linker.ld index 5542d34df11..a447b3b7a6d 100644 --- a/soc/arm/silabs_exx32/efm32wg/linker.ld +++ b/soc/arm/silabs_exx32/efm32wg/linker.ld @@ -13,4 +13,4 @@ #include -#include +#include diff --git a/soc/arm/silabs_exx32/efr32fg1p/linker.ld b/soc/arm/silabs_exx32/efr32fg1p/linker.ld index 6e9283bec25..22ea2d25e5c 100644 --- a/soc/arm/silabs_exx32/efr32fg1p/linker.ld +++ b/soc/arm/silabs_exx32/efr32fg1p/linker.ld @@ -13,4 +13,4 @@ #include -#include +#include diff --git a/soc/arm/silabs_exx32/efr32mg12p/linker.ld b/soc/arm/silabs_exx32/efr32mg12p/linker.ld index 47dafd0af97..a7b5bb7222a 100644 --- a/soc/arm/silabs_exx32/efr32mg12p/linker.ld +++ b/soc/arm/silabs_exx32/efr32mg12p/linker.ld @@ -13,4 +13,4 @@ #include -#include +#include diff --git a/soc/arm/st_stm32/stm32f0/linker.ld b/soc/arm/st_stm32/stm32f0/linker.ld index ba0abaf5051..8be1f3a00fe 100644 --- a/soc/arm/st_stm32/stm32f0/linker.ld +++ b/soc/arm/st_stm32/stm32f0/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/st_stm32/stm32f0/soc.c b/soc/arm/st_stm32/stm32f0/soc.c index 1ddd24c178d..71c28b0d5df 100644 --- a/soc/arm/st_stm32/stm32f0/soc.c +++ b/soc/arm/st_stm32/stm32f0/soc.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/soc/arm/st_stm32/stm32f1/linker.ld b/soc/arm/st_stm32/stm32f1/linker.ld index ba0abaf5051..8be1f3a00fe 100644 --- a/soc/arm/st_stm32/stm32f1/linker.ld +++ b/soc/arm/st_stm32/stm32f1/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/st_stm32/stm32f1/soc.c b/soc/arm/st_stm32/stm32f1/soc.c index b3129561a35..b5740cef952 100644 --- a/soc/arm/st_stm32/stm32f1/soc.c +++ b/soc/arm/st_stm32/stm32f1/soc.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include /** * @brief Perform basic hardware initialization at boot. diff --git a/soc/arm/st_stm32/stm32f2/linker.ld b/soc/arm/st_stm32/stm32f2/linker.ld index 7bb1031a8b3..c6150677d63 100644 --- a/soc/arm/st_stm32/stm32f2/linker.ld +++ b/soc/arm/st_stm32/stm32f2/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/st_stm32/stm32f2/soc.c b/soc/arm/st_stm32/stm32f2/soc.c index 0f2e13729f2..75167d145b9 100644 --- a/soc/arm/st_stm32/stm32f2/soc.c +++ b/soc/arm/st_stm32/stm32f2/soc.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include diff --git a/soc/arm/st_stm32/stm32f3/linker.ld b/soc/arm/st_stm32/stm32f3/linker.ld index ba0abaf5051..8be1f3a00fe 100644 --- a/soc/arm/st_stm32/stm32f3/linker.ld +++ b/soc/arm/st_stm32/stm32f3/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/st_stm32/stm32f3/soc.c b/soc/arm/st_stm32/stm32f3/soc.c index 937d896d365..5fca00e19b9 100644 --- a/soc/arm/st_stm32/stm32f3/soc.c +++ b/soc/arm/st_stm32/stm32f3/soc.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include /** * @brief Perform basic hardware initialization at boot. diff --git a/soc/arm/st_stm32/stm32f4/linker.ld b/soc/arm/st_stm32/stm32f4/linker.ld index ba0abaf5051..8be1f3a00fe 100644 --- a/soc/arm/st_stm32/stm32f4/linker.ld +++ b/soc/arm/st_stm32/stm32f4/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/st_stm32/stm32f4/soc.c b/soc/arm/st_stm32/stm32f4/soc.c index bfd088aa2c9..f98e1a09e56 100644 --- a/soc/arm/st_stm32/stm32f4/soc.c +++ b/soc/arm/st_stm32/stm32f4/soc.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include /** * @brief Perform basic hardware initialization at boot. diff --git a/soc/arm/st_stm32/stm32f7/linker.ld b/soc/arm/st_stm32/stm32f7/linker.ld index 7aa7940e1b7..97450e241f2 100644 --- a/soc/arm/st_stm32/stm32f7/linker.ld +++ b/soc/arm/st_stm32/stm32f7/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/st_stm32/stm32f7/soc.c b/soc/arm/st_stm32/stm32f7/soc.c index 01f14d5ea26..f6c2e41e253 100644 --- a/soc/arm/st_stm32/stm32f7/soc.c +++ b/soc/arm/st_stm32/stm32f7/soc.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include /** * @brief Perform basic hardware initialization at boot. diff --git a/soc/arm/st_stm32/stm32g0/linker.ld b/soc/arm/st_stm32/stm32g0/linker.ld index 2a9e31923f7..350b18263ee 100644 --- a/soc/arm/st_stm32/stm32g0/linker.ld +++ b/soc/arm/st_stm32/stm32g0/linker.ld @@ -7,4 +7,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/st_stm32/stm32g0/soc.c b/soc/arm/st_stm32/stm32g0/soc.c index b67f5c7a1e0..ee8a176dcc6 100644 --- a/soc/arm/st_stm32/stm32g0/soc.c +++ b/soc/arm/st_stm32/stm32g0/soc.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/soc/arm/st_stm32/stm32g4/linker.ld b/soc/arm/st_stm32/stm32g4/linker.ld index 21cc003f6c9..36cb5a4a751 100644 --- a/soc/arm/st_stm32/stm32g4/linker.ld +++ b/soc/arm/st_stm32/stm32g4/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/st_stm32/stm32g4/soc.c b/soc/arm/st_stm32/stm32g4/soc.c index ea7d7c91682..c4ea84180f4 100644 --- a/soc/arm/st_stm32/stm32g4/soc.c +++ b/soc/arm/st_stm32/stm32g4/soc.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include /** * @brief Perform basic hardware initialization at boot. diff --git a/soc/arm/st_stm32/stm32h7/linker.ld b/soc/arm/st_stm32/stm32h7/linker.ld index 1445aadd441..3dce76c07a6 100644 --- a/soc/arm/st_stm32/stm32h7/linker.ld +++ b/soc/arm/st_stm32/stm32h7/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/st_stm32/stm32h7/soc_m4.c b/soc/arm/st_stm32/stm32h7/soc_m4.c index 2c2866f0cc5..e7be63b713b 100644 --- a/soc/arm/st_stm32/stm32h7/soc_m4.c +++ b/soc/arm/st_stm32/stm32h7/soc_m4.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #if defined(CONFIG_STM32H7_BOOT_CM4_CM7) void stm32h7_m4_boot_stop(void) diff --git a/soc/arm/st_stm32/stm32h7/soc_m7.c b/soc/arm/st_stm32/stm32h7/soc_m7.c index 09e9289767e..e4a0fdc29ec 100644 --- a/soc/arm/st_stm32/stm32h7/soc_m7.c +++ b/soc/arm/st_stm32/stm32h7/soc_m7.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #if defined(CONFIG_STM32H7_DUAL_CORE) static int stm32h7_m4_wakeup(struct device *arg) diff --git a/soc/arm/st_stm32/stm32l0/linker.ld b/soc/arm/st_stm32/stm32l0/linker.ld index d48fe8a53e6..4ac68d517d2 100644 --- a/soc/arm/st_stm32/stm32l0/linker.ld +++ b/soc/arm/st_stm32/stm32l0/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/st_stm32/stm32l0/soc.c b/soc/arm/st_stm32/stm32l0/soc.c index 6f1f4d77afc..c4fa72db1b3 100644 --- a/soc/arm/st_stm32/stm32l0/soc.c +++ b/soc/arm/st_stm32/stm32l0/soc.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/soc/arm/st_stm32/stm32l1/linker.ld b/soc/arm/st_stm32/stm32l1/linker.ld index 415bbe840fb..31da4dd9125 100644 --- a/soc/arm/st_stm32/stm32l1/linker.ld +++ b/soc/arm/st_stm32/stm32l1/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/st_stm32/stm32l1/soc.c b/soc/arm/st_stm32/stm32l1/soc.c index 6f5ea3dc233..257889a15b6 100644 --- a/soc/arm/st_stm32/stm32l1/soc.c +++ b/soc/arm/st_stm32/stm32l1/soc.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/soc/arm/st_stm32/stm32l4/linker.ld b/soc/arm/st_stm32/stm32l4/linker.ld index ba0abaf5051..8be1f3a00fe 100644 --- a/soc/arm/st_stm32/stm32l4/linker.ld +++ b/soc/arm/st_stm32/stm32l4/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/st_stm32/stm32l4/soc.c b/soc/arm/st_stm32/stm32l4/soc.c index e2e0d86b34e..e23f8ae2a87 100644 --- a/soc/arm/st_stm32/stm32l4/soc.c +++ b/soc/arm/st_stm32/stm32l4/soc.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include /** * @brief Perform basic hardware initialization at boot. diff --git a/soc/arm/st_stm32/stm32mp1/linker.ld b/soc/arm/st_stm32/stm32mp1/linker.ld index 2368faf92b9..63a58ccf38d 100644 --- a/soc/arm/st_stm32/stm32mp1/linker.ld +++ b/soc/arm/st_stm32/stm32mp1/linker.ld @@ -7,7 +7,7 @@ */ -#include +#include SECTIONS { @@ -20,4 +20,4 @@ SECTIONS KEEP(*(.resource_table*)) } GROUP_LINK_IN(ROMABLE_REGION) #endif -} \ No newline at end of file +} diff --git a/soc/arm/st_stm32/stm32mp1/soc.c b/soc/arm/st_stm32/stm32mp1/soc.c index b83d24b85b3..aea44c654d2 100644 --- a/soc/arm/st_stm32/stm32mp1/soc.c +++ b/soc/arm/st_stm32/stm32mp1/soc.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include /** * @brief Perform basic hardware initialization at boot. diff --git a/soc/arm/st_stm32/stm32wb/linker.ld b/soc/arm/st_stm32/stm32wb/linker.ld index 2d5b2b61758..c18f43acf14 100644 --- a/soc/arm/st_stm32/stm32wb/linker.ld +++ b/soc/arm/st_stm32/stm32wb/linker.ld @@ -11,4 +11,4 @@ #define RAM2_SIZE (20 * 1K) #define RAM2_ADDR 0x20038000 -#include +#include diff --git a/soc/arm/st_stm32/stm32wb/soc.c b/soc/arm/st_stm32/stm32wb/soc.c index 9c0956289ad..1609889455c 100644 --- a/soc/arm/st_stm32/stm32wb/soc.c +++ b/soc/arm/st_stm32/stm32wb/soc.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include /** * @brief Perform basic hardware initialization at boot. diff --git a/soc/arm/ti_lm3s6965/linker.ld b/soc/arm/ti_lm3s6965/linker.ld index b6ccb02793c..975945d6cb1 100644 --- a/soc/arm/ti_lm3s6965/linker.ld +++ b/soc/arm/ti_lm3s6965/linker.ld @@ -6,4 +6,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/ti_lm3s6965/sys_arch_reboot.c b/soc/arm/ti_lm3s6965/sys_arch_reboot.c index 0cd55f17cf1..abd11de415e 100644 --- a/soc/arm/ti_lm3s6965/sys_arch_reboot.c +++ b/soc/arm/ti_lm3s6965/sys_arch_reboot.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include /** * diff --git a/soc/arm/ti_simplelink/cc13x2_cc26x2/linker.ld b/soc/arm/ti_simplelink/cc13x2_cc26x2/linker.ld index a91ad2c6fe4..02da020e13b 100644 --- a/soc/arm/ti_simplelink/cc13x2_cc26x2/linker.ld +++ b/soc/arm/ti_simplelink/cc13x2_cc26x2/linker.ld @@ -5,4 +5,4 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include diff --git a/soc/arm/ti_simplelink/cc2650/linker.ld b/soc/arm/ti_simplelink/cc2650/linker.ld index 3929e3c5d6a..32599f57035 100644 --- a/soc/arm/ti_simplelink/cc2650/linker.ld +++ b/soc/arm/ti_simplelink/cc2650/linker.ld @@ -4,4 +4,4 @@ * linker.ld - Linker command/script file */ -#include +#include diff --git a/soc/arm/ti_simplelink/cc32xx/linker.ld b/soc/arm/ti_simplelink/cc32xx/linker.ld index ff17e92287e..63e7b28886c 100644 --- a/soc/arm/ti_simplelink/cc32xx/linker.ld +++ b/soc/arm/ti_simplelink/cc32xx/linker.ld @@ -5,4 +5,4 @@ * linker.ld - Linker command/script file */ -#include +#include diff --git a/soc/arm/ti_simplelink/msp432p4xx/linker.ld b/soc/arm/ti_simplelink/msp432p4xx/linker.ld index ff17e92287e..63e7b28886c 100644 --- a/soc/arm/ti_simplelink/msp432p4xx/linker.ld +++ b/soc/arm/ti_simplelink/msp432p4xx/linker.ld @@ -5,4 +5,4 @@ * linker.ld - Linker command/script file */ -#include +#include diff --git a/soc/arm/xilinx_zynqmp/linker.ld b/soc/arm/xilinx_zynqmp/linker.ld index 507494c0d42..bbf4673b6de 100644 --- a/soc/arm/xilinx_zynqmp/linker.ld +++ b/soc/arm/xilinx_zynqmp/linker.ld @@ -5,4 +5,4 @@ * */ -#include +#include diff --git a/soc/riscv/openisa_rv32m1/linker.ld b/soc/riscv/openisa_rv32m1/linker.ld index 1689093abd4..6c582b58892 100644 --- a/soc/riscv/openisa_rv32m1/linker.ld +++ b/soc/riscv/openisa_rv32m1/linker.ld @@ -5,7 +5,7 @@ * * This file is based on: * - * - include/arch/arm/cortex_m/scripts/linker.ld + * - include/arch/arm/aarch32/cortex_m/scripts/linker.ld * - include/arch/riscv/common/linker.ld * - include/arch/riscv/pulpino/linker.ld * diff --git a/subsys/testsuite/include/test_asm_inline_gcc.h b/subsys/testsuite/include/test_asm_inline_gcc.h index 37e2e7b19b2..eeb3304ed8f 100644 --- a/subsys/testsuite/include/test_asm_inline_gcc.h +++ b/subsys/testsuite/include/test_asm_inline_gcc.h @@ -24,14 +24,14 @@ static inline void timestamp_serialize(void) : "%eax", "%ebx", "%ecx", "%edx"); } #elif defined(CONFIG_CPU_CORTEX_M) -#include +#include static inline void timestamp_serialize(void) { /* isb is available in all Cortex-M */ __ISB(); } #elif defined(CONFIG_CPU_CORTEX_R) -#include +#include static inline void timestamp_serialize(void) { __ISB(); diff --git a/tests/arch/arm/arm_interrupt/src/arm_interrupt.c b/tests/arch/arm/arm_interrupt/src/arm_interrupt.c index b6b73ca7569..058d407205a 100644 --- a/tests/arch/arm/arm_interrupt/src/arm_interrupt.c +++ b/tests/arch/arm/arm_interrupt/src/arm_interrupt.c @@ -6,7 +6,7 @@ #include #include -#include +#include static volatile int test_flag; static volatile int expected_reason = -1; diff --git a/tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c b/tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c index 8d0c5ffc3ec..6c4732c1040 100644 --- a/tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c +++ b/tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include diff --git a/tests/arch/arm/arm_runtime_nmi/src/arm_runtime_nmi.c b/tests/arch/arm/arm_runtime_nmi/src/arm_runtime_nmi.c index 85cfd2fd419..e7f80bf57d3 100644 --- a/tests/arch/arm/arm_runtime_nmi/src/arm_runtime_nmi.c +++ b/tests/arch/arm/arm_runtime_nmi/src/arm_runtime_nmi.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c b/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c index 49d4ea2a85a..12adb06e402 100644 --- a/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c +++ b/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/tests/arch/arm/arm_zero_latency_irqs/src/arm_zero_latency_irqs.c b/tests/arch/arm/arm_zero_latency_irqs/src/arm_zero_latency_irqs.c index 52166e28a09..1463b385199 100644 --- a/tests/arch/arm/arm_zero_latency_irqs/src/arm_zero_latency_irqs.c +++ b/tests/arch/arm/arm_zero_latency_irqs/src/arm_zero_latency_irqs.c @@ -6,7 +6,7 @@ #include #include -#include +#include static volatile int test_flag; diff --git a/tests/kernel/fp_sharing/float_disable/src/k_float_disable.c b/tests/kernel/fp_sharing/float_disable/src/k_float_disable.c index 50f32e18e67..cbc44cd119e 100644 --- a/tests/kernel/fp_sharing/float_disable/src/k_float_disable.c +++ b/tests/kernel/fp_sharing/float_disable/src/k_float_disable.c @@ -151,7 +151,7 @@ void test_k_float_disable_syscall(void) #if defined(CONFIG_ARM) && defined(CONFIG_DYNAMIC_INTERRUPTS) #include -#include +#include struct k_thread sup_fp_thread; K_THREAD_STACK_DEFINE(sup_fp_thread_stack, STACKSIZE); diff --git a/tests/kernel/gen_isr_table/src/main.c b/tests/kernel/gen_isr_table/src/main.c index 57715f0c48c..7b0c8412368 100644 --- a/tests/kernel/gen_isr_table/src/main.c +++ b/tests/kernel/gen_isr_table/src/main.c @@ -45,7 +45,7 @@ extern u32_t _irq_vector_table[]; static volatile int trigger_check[TRIG_CHECK_SIZE]; #if defined(CONFIG_CPU_CORTEX_M) -#include +#include void trigger_irq(int irq) { diff --git a/tests/kernel/interrupt/src/interrupt.h b/tests/kernel/interrupt/src/interrupt.h index ba02873fe57..00e00bb99a9 100644 --- a/tests/kernel/interrupt/src/interrupt.h +++ b/tests/kernel/interrupt/src/interrupt.h @@ -10,7 +10,7 @@ #if defined(CONFIG_CPU_CORTEX_M) -#include +#include static u32_t get_available_nvic_line(u32_t initial_offset) { diff --git a/tests/kernel/mem_protect/protection/src/main.c b/tests/kernel/mem_protect/protection/src/main.c index e3057830d47..cd0109b3ecc 100644 --- a/tests/kernel/mem_protect/protection/src/main.c +++ b/tests/kernel/mem_protect/protection/src/main.c @@ -24,7 +24,7 @@ void k_sys_fatal_error_handler(unsigned int reason, const z_arch_esf_t *pEsf) } #ifdef CONFIG_CPU_CORTEX_M -#include +#include /* Must clear LSB of function address to access as data. */ #define FUNC_TO_PTR(x) (void *)((uintptr_t)(x) & ~0x1) /* Must set LSB of function address to call in Thumb mode. */