diff options
Diffstat (limited to 'include/arch')
| -rw-r--r-- | include/arch/aarch32/arch.h | 2 | ||||
| -rw-r--r-- | include/arch/aarch32/arch_helpers.h | 3 | ||||
| -rw-r--r-- | include/arch/aarch32/asm_macros.S | 4 | ||||
| -rw-r--r-- | include/arch/aarch32/console_macros.S | 2 | ||||
| -rw-r--r-- | include/arch/aarch32/smccc_helpers.h | 6 | ||||
| -rw-r--r-- | include/arch/aarch64/arch.h | 2 | ||||
| -rw-r--r-- | include/arch/aarch64/arch_helpers.h | 3 | ||||
| -rw-r--r-- | include/arch/aarch64/asm_macros.S | 4 | ||||
| -rw-r--r-- | include/arch/aarch64/console_macros.S | 2 | ||||
| -rw-r--r-- | include/arch/aarch64/smccc_helpers.h | 6 |
10 files changed, 20 insertions, 14 deletions
diff --git a/include/arch/aarch32/arch.h b/include/arch/aarch32/arch.h index 8260c5491..cbe272c23 100644 --- a/include/arch/aarch32/arch.h +++ b/include/arch/aarch32/arch.h @@ -7,7 +7,7 @@ #ifndef ARCH_H #define ARCH_H -#include <utils_def.h> +#include <lib/utils_def.h> /******************************************************************************* * MIDR bit definitions diff --git a/include/arch/aarch32/arch_helpers.h b/include/arch/aarch32/arch_helpers.h index a6fe14fb8..c2773c139 100644 --- a/include/arch/aarch32/arch_helpers.h +++ b/include/arch/aarch32/arch_helpers.h @@ -7,11 +7,12 @@ #ifndef ARCH_HELPERS_H #define ARCH_HELPERS_H -#include <arch.h> #include <cdefs.h> #include <stdint.h> #include <string.h> +#include <arch.h> + /********************************************************************** * Macros which create inline functions to read or write CPU system * registers diff --git a/include/arch/aarch32/asm_macros.S b/include/arch/aarch32/asm_macros.S index c54f75c2d..8408804fb 100644 --- a/include/arch/aarch32/asm_macros.S +++ b/include/arch/aarch32/asm_macros.S @@ -7,8 +7,8 @@ #define ASM_MACROS_S #include <arch.h> -#include <asm_macros_common.S> -#include <spinlock.h> +#include <common/asm_macros_common.S> +#include <lib/spinlock.h> /* * TLBI instruction with type specifier that implements the workaround for diff --git a/include/arch/aarch32/console_macros.S b/include/arch/aarch32/console_macros.S index ba6e7d050..ed5088d5a 100644 --- a/include/arch/aarch32/console_macros.S +++ b/include/arch/aarch32/console_macros.S @@ -6,7 +6,7 @@ #ifndef CONSOLE_MACROS_S #define CONSOLE_MACROS_S -#include <console.h> +#include <drivers/console.h> /* * This macro encapsulates the common setup that has to be done at the end of diff --git a/include/arch/aarch32/smccc_helpers.h b/include/arch/aarch32/smccc_helpers.h index 67952ec50..d3e5e59c5 100644 --- a/include/arch/aarch32/smccc_helpers.h +++ b/include/arch/aarch32/smccc_helpers.h @@ -7,7 +7,7 @@ #ifndef SMCCC_HELPERS_H #define SMCCC_HELPERS_H -#include <smccc.h> +#include <lib/smccc.h> /* These are offsets to registers in smc_ctx_t */ #define SMC_CTX_GPREG_R0 U(0x0) @@ -25,9 +25,11 @@ #define SMC_CTX_SIZE U(0x90) #ifndef __ASSEMBLY__ -#include <cassert.h> + #include <stdint.h> +#include <lib/cassert.h> + /* * The generic structure to save arguments and callee saved registers during * an SMC. Also this structure is used to store the result return values after diff --git a/include/arch/aarch64/arch.h b/include/arch/aarch64/arch.h index 72a14dcfa..8a44d83f0 100644 --- a/include/arch/aarch64/arch.h +++ b/include/arch/aarch64/arch.h @@ -7,7 +7,7 @@ #ifndef ARCH_H #define ARCH_H -#include <utils_def.h> +#include <lib/utils_def.h> /******************************************************************************* * MIDR bit definitions diff --git a/include/arch/aarch64/arch_helpers.h b/include/arch/aarch64/arch_helpers.h index 7222b9dc7..b912b4223 100644 --- a/include/arch/aarch64/arch_helpers.h +++ b/include/arch/aarch64/arch_helpers.h @@ -7,12 +7,13 @@ #ifndef ARCH_HELPERS_H #define ARCH_HELPERS_H -#include <arch.h> #include <cdefs.h> #include <stdbool.h> #include <stdint.h> #include <string.h> +#include <arch.h> + /********************************************************************** * Macros which create inline functions to read or write CPU system * registers diff --git a/include/arch/aarch64/asm_macros.S b/include/arch/aarch64/asm_macros.S index dea302137..387be4ca3 100644 --- a/include/arch/aarch64/asm_macros.S +++ b/include/arch/aarch64/asm_macros.S @@ -7,8 +7,8 @@ #define ASM_MACROS_S #include <arch.h> -#include <asm_macros_common.S> -#include <spinlock.h> +#include <common/asm_macros_common.S> +#include <lib/spinlock.h> /* * TLBI instruction with type specifier that implements the workaround for diff --git a/include/arch/aarch64/console_macros.S b/include/arch/aarch64/console_macros.S index 5c88d4f22..90ef42048 100644 --- a/include/arch/aarch64/console_macros.S +++ b/include/arch/aarch64/console_macros.S @@ -6,7 +6,7 @@ #ifndef CONSOLE_MACROS_S #define CONSOLE_MACROS_S -#include <console.h> +#include <drivers/console.h> /* * This macro encapsulates the common setup that has to be done at the end of diff --git a/include/arch/aarch64/smccc_helpers.h b/include/arch/aarch64/smccc_helpers.h index efab18b0c..e28697d7e 100644 --- a/include/arch/aarch64/smccc_helpers.h +++ b/include/arch/aarch64/smccc_helpers.h @@ -7,12 +7,14 @@ #ifndef SMCCC_HELPERS_H #define SMCCC_HELPERS_H -#include <smccc.h> +#include <lib/smccc.h> #ifndef __ASSEMBLY__ -#include <context.h> + #include <stdbool.h> +#include <context.h> + /* Convenience macros to return from SMC handler */ #define SMC_RET0(_h) { \ return (uint64_t) (_h); \ |