diff --git a/include/arch/arc/arch.h b/include/arch/arc/arch.h index 9ac0f37c875..4b6a7e02771 100644 --- a/include/arch/arc/arch.h +++ b/include/arch/arc/arch.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "v2/sys_io.h" #endif diff --git a/include/arch/arc/v2/addr_types.h b/include/arch/arc/v2/addr_types.h deleted file mode 100644 index 59fb0939704..00000000000 --- a/include/arch/arc/v2/addr_types.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2015 Wind River Systems, Inc. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/* @file ARC-v2 address types (virtual, physical, etc) definitions */ - -#ifndef ZEPHYR_INCLUDE_ARCH_ARC_V2_ADDR_TYPES_H_ -#define ZEPHYR_INCLUDE_ARCH_ARC_V2_ADDR_TYPES_H_ - -#ifndef _ASMLANGUAGE - typedef unsigned int paddr_t; - typedef unsigned int vaddr_t; -#endif - -#endif /* ZEPHYR_INCLUDE_ARCH_ARC_V2_ADDR_TYPES_H_ */ diff --git a/include/arch/arm/arch.h b/include/arch/arm/arch.h index 8156bfcc3c2..afe80ffabb9 100644 --- a/include/arch/arm/arch.h +++ b/include/arch/arm/arch.h @@ -29,8 +29,8 @@ #include #include #include -#include #include +#include #include #include #endif diff --git a/include/arch/arm/cortex_m/addr_types.h b/include/arch/arm/cortex_m/addr_types.h deleted file mode 100644 index 4e3da6fde4e..00000000000 --- a/include/arch/arm/cortex_m/addr_types.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2015 Wind River Systems, Inc. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/* @file Cortex-M address types (virtual, physical, etc) definitions */ - -#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_ADDR_TYPES_H_ -#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_ADDR_TYPES_H_ - -#ifndef _ASMLANGUAGE - typedef unsigned int paddr_t; - typedef unsigned int vaddr_t; -#endif - -#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_ADDR_TYPES_H_ */ diff --git a/include/arch/x86/addr_types.h b/include/arch/common/addr_types.h similarity index 92% rename from include/arch/x86/addr_types.h rename to include/arch/common/addr_types.h index b8e295e5005..898fd058fb0 100644 --- a/include/arch/x86/addr_types.h +++ b/include/arch/common/addr_types.h @@ -9,7 +9,9 @@ #ifndef ZEPHYR_INCLUDE_ARCH_X86_ADDR_TYPES_H_ #define ZEPHYR_INCLUDE_ARCH_X86_ADDR_TYPES_H_ +#ifndef _ASMLANGUAGE typedef unsigned int paddr_t; typedef unsigned int vaddr_t; +#endif #endif /* ZEPHYR_INCLUDE_ARCH_X86_ADDR_TYPES_H_ */ diff --git a/include/arch/nios2/arch.h b/include/arch/nios2/arch.h index d2f70f84c9b..279175c8fb2 100644 --- a/include/arch/nios2/arch.h +++ b/include/arch/nios2/arch.h @@ -16,6 +16,7 @@ #include #include +#include #include #include "nios2.h" #include @@ -39,9 +40,6 @@ extern "C" { #include #include -/* physical/virtual address types required by the kernel */ -typedef unsigned int paddr_t; -typedef unsigned int vaddr_t; /** * Configure a static interrupt. diff --git a/include/arch/x86/arch.h b/include/arch/x86/arch.h index ff769bbf5af..2f6b5720131 100644 --- a/include/arch/x86/arch.h +++ b/include/arch/x86/arch.h @@ -25,7 +25,7 @@ #ifndef _ASMLANGUAGE #include -#include +#include #include #endif diff --git a/include/arch/xtensa/addr_types.h b/include/arch/xtensa/addr_types.h deleted file mode 100644 index 4363da1cab6..00000000000 --- a/include/arch/xtensa/addr_types.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2016 Cadence Design Systems, Inc. - * SPDX-License-Identifier: Apache-2.0 - */ - -#ifndef ZEPHYR_INCLUDE_ARCH_XTENSA_ADDR_TYPES_H_ -#define ZEPHYR_INCLUDE_ARCH_XTENSA_ADDR_TYPES_H_ - -#ifndef _ASMLANGUAGE -typedef unsigned int paddr_t; -typedef unsigned int vaddr_t; -#endif - -#endif /* ZEPHYR_INCLUDE_ARCH_XTENSA_ADDR_TYPES_H_ */ - diff --git a/include/arch/xtensa/arch.h b/include/arch/xtensa/arch.h index fce205c5a7f..8cd2a43d879 100644 --- a/include/arch/xtensa/arch.h +++ b/include/arch/xtensa/arch.h @@ -27,6 +27,7 @@ extern "C" { #include #include #include +#include #define STACK_ALIGN 16