diff options
Diffstat (limited to 'bl31/aarch64')
-rw-r--r-- | bl31/aarch64/bl31_entrypoint.S | 11 | ||||
-rw-r--r-- | bl31/aarch64/crash_reporting.S | 10 | ||||
-rw-r--r-- | bl31/aarch64/ea_delegate.S | 4 | ||||
-rw-r--r-- | bl31/aarch64/runtime_exceptions.S | 13 |
4 files changed, 21 insertions, 17 deletions
diff --git a/bl31/aarch64/bl31_entrypoint.S b/bl31/aarch64/bl31_entrypoint.S index 7c116a2e..c41773b8 100644 --- a/bl31/aarch64/bl31_entrypoint.S +++ b/bl31/aarch64/bl31_entrypoint.S @@ -4,13 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <platform_def.h> + #include <arch.h> -#include <bl_common.h> +#include <common/bl_common.h> #include <el3_common_macros.S> -#include <platform_def.h> -#include <pmf_asm_macros.S> -#include <runtime_instr.h> -#include <xlat_mmu_helpers.h> +#include <lib/pmf/pmf_asm_macros.S> +#include <lib/runtime_instr.h> +#include <lib/xlat_tables/xlat_mmu_helpers.h> .globl bl31_entrypoint .globl bl31_warm_entrypoint diff --git a/bl31/aarch64/crash_reporting.S b/bl31/aarch64/crash_reporting.S index 0986a0a1..b3f59796 100644 --- a/bl31/aarch64/crash_reporting.S +++ b/bl31/aarch64/crash_reporting.S @@ -3,13 +3,15 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + +#include <plat_macros.S> +#include <platform_def.h> + #include <arch.h> #include <asm_macros.S> #include <context.h> -#include <cpu_data.h> -#include <plat_macros.S> -#include <platform_def.h> -#include <utils_def.h> +#include <lib/el3_runtime/cpu_data.h> +#include <lib/utils_def.h> .globl report_unhandled_exception .globl report_unhandled_interrupt diff --git a/bl31/aarch64/ea_delegate.S b/bl31/aarch64/ea_delegate.S index 9d7c5e8a..0c8cfa8f 100644 --- a/bl31/aarch64/ea_delegate.S +++ b/bl31/aarch64/ea_delegate.S @@ -8,9 +8,9 @@ #include <assert_macros.S> #include <asm_macros.S> #include <assert_macros.S> +#include <bl31/ea_handle.h> #include <context.h> -#include <ea_handle.h> -#include <ras_arch.h> +#include <lib/extensions/ras_arch.h> .globl handle_lower_el_ea_esb diff --git a/bl31/aarch64/runtime_exceptions.S b/bl31/aarch64/runtime_exceptions.S index ab61e8cc..e7abd503 100644 --- a/bl31/aarch64/runtime_exceptions.S +++ b/bl31/aarch64/runtime_exceptions.S @@ -4,15 +4,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <platform_def.h> + #include <arch.h> #include <asm_macros.S> +#include <bl31/ea_handle.h> +#include <bl31/interrupt_mgmt.h> +#include <common/runtime_svc.h> #include <context.h> -#include <cpu_data.h> -#include <ea_handle.h> -#include <interrupt_mgmt.h> -#include <platform_def.h> -#include <runtime_svc.h> -#include <smccc.h> +#include <lib/el3_runtime/cpu_data.h> +#include <lib/smccc.h> .globl runtime_exceptions |