diff options
Diffstat (limited to 'bl32/sp_min')
| -rw-r--r-- | bl32/sp_min/aarch32/entrypoint.S | 6 | ||||
| -rw-r--r-- | bl32/sp_min/sp_min.ld.S | 7 | ||||
| -rw-r--r-- | bl32/sp_min/sp_min_main.c | 32 |
3 files changed, 24 insertions, 21 deletions
diff --git a/bl32/sp_min/aarch32/entrypoint.S b/bl32/sp_min/aarch32/entrypoint.S index d6853cc40..2ffef6a2e 100644 --- a/bl32/sp_min/aarch32/entrypoint.S +++ b/bl32/sp_min/aarch32/entrypoint.S @@ -6,13 +6,13 @@ #include <arch.h> #include <asm_macros.S> -#include <bl_common.h> +#include <common/bl_common.h> +#include <common/runtime_svc.h> #include <context.h> #include <el3_common_macros.S> -#include <runtime_svc.h> +#include <lib/xlat_tables/xlat_tables_defs.h> #include <smccc_helpers.h> #include <smccc_macros.S> -#include <xlat_tables_defs.h> .globl sp_min_vector_table .globl sp_min_entrypoint diff --git a/bl32/sp_min/sp_min.ld.S b/bl32/sp_min/sp_min.ld.S index ce6c954ec..ba9d34212 100644 --- a/bl32/sp_min/sp_min.ld.S +++ b/bl32/sp_min/sp_min.ld.S @@ -5,7 +5,8 @@ */ #include <platform_def.h> -#include <xlat_tables_defs.h> + +#include <lib/xlat_tables/xlat_tables_defs.h> OUTPUT_FORMAT(elf32-littlearm) OUTPUT_ARCH(arm) @@ -62,7 +63,7 @@ SECTIONS /* Place pubsub sections for events */ . = ALIGN(8); -#include <pubsub_events.h> +#include <lib/el3_runtime/pubsub_events.h> . = ALIGN(PAGE_SIZE); __RODATA_END__ = .; @@ -91,7 +92,7 @@ SECTIONS /* Place pubsub sections for events */ . = ALIGN(8); -#include <pubsub_events.h> +#include <lib/el3_runtime/pubsub_events.h> *(.vectors) __RO_END_UNALIGNED__ = .; diff --git a/bl32/sp_min/sp_min_main.c b/bl32/sp_min/sp_min_main.c index a12a83bcf..3cb19901f 100644 --- a/bl32/sp_min/sp_min_main.c +++ b/bl32/sp_min/sp_min_main.c @@ -4,26 +4,28 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <assert.h> +#include <stddef.h> +#include <stdint.h> +#include <string.h> + +#include <platform_def.h> + #include <arch.h> #include <arch_helpers.h> -#include <assert.h> -#include <bl_common.h> -#include <console.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <common/runtime_svc.h> #include <context.h> -#include <context_mgmt.h> -#include <debug.h> -#include <platform.h> -#include <platform_def.h> +#include <drivers/console.h> +#include <lib/el3_runtime/context_mgmt.h> +#include <lib/psci/psci.h> +#include <lib/utils.h> +#include <plat/common/platform.h> #include <platform_sp_min.h> -#include <psci.h> -#include <runtime_svc.h> +#include <services/std_svc.h> #include <smccc_helpers.h> -#include <stddef.h> -#include <stdint.h> -#include <std_svc.h> -#include <stdint.h> -#include <string.h> -#include <utils.h> + #include "sp_min_private.h" /* Pointers to per-core cpu contexts */ |