diff options
Diffstat (limited to 'bl1')
| -rw-r--r-- | bl1/aarch32/bl1_context_mgmt.c | 10 | ||||
| -rw-r--r-- | bl1/aarch32/bl1_entrypoint.S | 2 | ||||
| -rw-r--r-- | bl1/aarch32/bl1_exceptions.S | 6 | ||||
| -rw-r--r-- | bl1/aarch64/bl1_context_mgmt.c | 10 | ||||
| -rw-r--r-- | bl1/aarch64/bl1_exceptions.S | 4 | ||||
| -rw-r--r-- | bl1/bl1.ld.S | 3 | ||||
| -rw-r--r-- | bl1/bl1_fwu.c | 23 | ||||
| -rw-r--r-- | bl1/bl1_main.c | 25 | ||||
| -rw-r--r-- | bl1/bl1_private.h | 3 | ||||
| -rw-r--r-- | bl1/tbbr/tbbr_img_desc.c | 7 |
10 files changed, 53 insertions, 40 deletions
diff --git a/bl1/aarch32/bl1_context_mgmt.c b/bl1/aarch32/bl1_context_mgmt.c index d1fd3ca0..005d046c 100644 --- a/bl1/aarch32/bl1_context_mgmt.c +++ b/bl1/aarch32/bl1_context_mgmt.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> + +#include <arch_helpers.h> #include <context.h> -#include <context_mgmt.h> -#include <debug.h> -#include <platform.h> +#include <common/debug.h> +#include <lib/el3_runtime/context_mgmt.h> +#include <plat/common/platform.h> #include <smccc_helpers.h> + #include "../bl1_private.h" /* diff --git a/bl1/aarch32/bl1_entrypoint.S b/bl1/aarch32/bl1_entrypoint.S index 16b26b9f..3f0cbaf4 100644 --- a/bl1/aarch32/bl1_entrypoint.S +++ b/bl1/aarch32/bl1_entrypoint.S @@ -6,7 +6,7 @@ #include <arch.h> #include <asm_macros.S> -#include <bl_common.h> +#include <common/bl_common.h> #include <context.h> #include <el3_common_macros.S> #include <smccc_helpers.h> diff --git a/bl1/aarch32/bl1_exceptions.S b/bl1/aarch32/bl1_exceptions.S index 9b001a96..6728278f 100644 --- a/bl1/aarch32/bl1_exceptions.S +++ b/bl1/aarch32/bl1_exceptions.S @@ -6,12 +6,12 @@ #include <arch.h> #include <asm_macros.S> -#include <bl1.h> -#include <bl_common.h> +#include <bl1/bl1.h> +#include <common/bl_common.h> #include <context.h> +#include <lib/xlat_tables/xlat_tables.h> #include <smccc_helpers.h> #include <smccc_macros.S> -#include <xlat_tables.h> .globl bl1_aarch32_smc_handler diff --git a/bl1/aarch64/bl1_context_mgmt.c b/bl1/aarch64/bl1_context_mgmt.c index 9bfb3094..03263190 100644 --- a/bl1/aarch64/bl1_context_mgmt.c +++ b/bl1/aarch64/bl1_context_mgmt.c @@ -4,12 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> + +#include <arch_helpers.h> #include <context.h> -#include <context_mgmt.h> -#include <debug.h> -#include <platform.h> +#include <common/debug.h> +#include <lib/el3_runtime/context_mgmt.h> +#include <plat/common/platform.h> + #include "../bl1_private.h" /* diff --git a/bl1/aarch64/bl1_exceptions.S b/bl1/aarch64/bl1_exceptions.S index cf8a6a79..19a0ac27 100644 --- a/bl1/aarch64/bl1_exceptions.S +++ b/bl1/aarch64/bl1_exceptions.S @@ -6,8 +6,8 @@ #include <arch.h> #include <asm_macros.S> -#include <bl1.h> -#include <bl_common.h> +#include <bl1/bl1.h> +#include <common/bl_common.h> #include <context.h> /* ----------------------------------------------------------------------------- diff --git a/bl1/bl1.ld.S b/bl1/bl1.ld.S index fabe3ef6..c4f6b99f 100644 --- a/bl1/bl1.ld.S +++ b/bl1/bl1.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(PLATFORM_LINKER_FORMAT) OUTPUT_ARCH(PLATFORM_LINKER_ARCH) diff --git a/bl1/bl1_fwu.c b/bl1/bl1_fwu.c index 0fbdf515..57a86aea 100644 --- a/bl1/bl1_fwu.c +++ b/bl1/bl1_fwu.c @@ -4,20 +4,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <auth_mod.h> -#include <bl1.h> -#include <bl_common.h> -#include <context.h> -#include <context_mgmt.h> -#include <debug.h> #include <errno.h> -#include <platform.h> +#include <string.h> + #include <platform_def.h> + +#include <arch_helpers.h> +#include <bl1/bl1.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <context.h> +#include <drivers/auth/auth_mod.h> +#include <lib/el3_runtime/context_mgmt.h> +#include <lib/utils.h> +#include <plat/common/platform.h> #include <smccc_helpers.h> -#include <string.h> -#include <utils.h> + #include "bl1_private.h" /* diff --git a/bl1/bl1_main.c b/bl1/bl1_main.c index ca436955..d2c2b417 100644 --- a/bl1/bl1_main.c +++ b/bl1/bl1_main.c @@ -4,20 +4,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch.h> -#include <arch_helpers.h> #include <assert.h> -#include <auth_mod.h> -#include <bl1.h> -#include <bl_common.h> -#include <console.h> -#include <debug.h> -#include <errata_report.h> -#include <platform.h> + #include <platform_def.h> + +#include <arch.h> +#include <arch_helpers.h> +#include <bl1/bl1.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <drivers/auth/auth_mod.h> +#include <drivers/console.h> +#include <lib/cpus/errata_report.h> +#include <lib/utils.h> +#include <plat/common/platform.h> #include <smccc_helpers.h> -#include <utils.h> -#include <uuid.h> +#include <tools_share/uuid.h> + #include "bl1_private.h" /* BL1 Service UUID */ diff --git a/bl1/bl1_private.h b/bl1/bl1_private.h index ed815853..bdbf80f3 100644 --- a/bl1/bl1_private.h +++ b/bl1/bl1_private.h @@ -8,7 +8,8 @@ #define BL1_PRIVATE_H #include <stdint.h> -#include <utils_def.h> + +#include <lib/utils_def.h> /******************************************************************************* * Declarations of linker defined symbols which will tell us where BL1 lives diff --git a/bl1/tbbr/tbbr_img_desc.c b/bl1/tbbr/tbbr_img_desc.c index 2581d90d..e8df73d4 100644 --- a/bl1/tbbr/tbbr_img_desc.c +++ b/bl1/tbbr/tbbr_img_desc.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <bl1.h> -#include <bl_common.h> #include <platform_def.h> -#include <tbbr/tbbr_img_desc.h> + +#include <bl1/bl1.h> +#include <bl1/tbbr/tbbr_img_desc.h> +#include <common/bl_common.h> image_desc_t bl1_tbbr_image_descs[] = { { |