|
17 | 17 | #define ZEPHYR_INCLUDE_ARCH_ARC_ARCH_H_ |
18 | 18 |
|
19 | 19 | #include <zephyr/devicetree.h> |
20 | | -#include <sw_isr_table.h> |
21 | | -#include <arch/common/ffs.h> |
22 | | -#include <arch/arc/thread.h> |
23 | | -#include <arch/common/sys_bitops.h> |
| 20 | +#include <zephyr/sw_isr_table.h> |
| 21 | +#include <zephyr/arch/common/ffs.h> |
| 22 | +#include <zephyr/arch/arc/thread.h> |
| 23 | +#include <zephyr/arch/common/sys_bitops.h> |
24 | 24 | #include "sys-io-common.h" |
25 | 25 |
|
26 | | -#include <arch/arc/v2/exc.h> |
27 | | -#include <arch/arc/v2/irq.h> |
28 | | -#include <arch/arc/v2/misc.h> |
29 | | -#include <arch/arc/v2/aux_regs.h> |
30 | | -#include <arch/arc/v2/arcv2_irq_unit.h> |
31 | | -#include <arch/arc/v2/asm_inline.h> |
32 | | -#include <arch/arc/arc_addr_types.h> |
33 | | -#include <arch/arc/v2/error.h> |
| 26 | +#include <zephyr/arch/arc/v2/exc.h> |
| 27 | +#include <zephyr/arch/arc/v2/irq.h> |
| 28 | +#include <zephyr/arch/arc/v2/misc.h> |
| 29 | +#include <zephyr/arch/arc/v2/aux_regs.h> |
| 30 | +#include <zephyr/arch/arc/v2/arcv2_irq_unit.h> |
| 31 | +#include <zephyr/arch/arc/v2/asm_inline.h> |
| 32 | +#include <zephyr/arch/arc/arc_addr_types.h> |
| 33 | +#include <zephyr/arch/arc/v2/error.h> |
34 | 34 |
|
35 | 35 | #ifdef CONFIG_ARC_CONNECT |
36 | | -#include <arch/arc/v2/arc_connect.h> |
| 36 | +#include <zephyr/arch/arc/v2/arc_connect.h> |
37 | 37 | #endif |
38 | 38 |
|
39 | 39 | #ifdef CONFIG_ISA_ARCV2 |
40 | 40 | #include "v2/sys_io.h" |
41 | 41 | #ifdef CONFIG_ARC_HAS_SECURE |
42 | | -#include <arch/arc/v2/secureshield/arc_secure.h> |
| 42 | +#include <zephyr/arch/arc/v2/secureshield/arc_secure.h> |
43 | 43 | #endif |
44 | 44 | #endif |
45 | 45 |
|
@@ -239,7 +239,7 @@ BUILD_ASSERT(CONFIG_PRIVILEGED_STACK_SIZE % Z_ARC_MPU_ALIGN == 0, |
239 | 239 | #ifdef CONFIG_ARC_MPU |
240 | 240 |
|
241 | 241 | /* Legacy case: retain containing extern "C" with C++ */ |
242 | | -#include <arch/arc/v2/mpu/arc_mpu.h> |
| 242 | +#include <zephyr/arch/arc/v2/mpu/arc_mpu.h> |
243 | 243 |
|
244 | 244 | #define K_MEM_PARTITION_P_NA_U_NA AUX_MPU_ATTR_N |
245 | 245 | #define K_MEM_PARTITION_P_RW_U_RW (AUX_MPU_ATTR_UW | AUX_MPU_ATTR_UR | \ |
|
0 commit comments