diff options
Diffstat (limited to 'common')
-rw-r--r-- | common/aarch64/debug.S | 2 | ||||
-rw-r--r-- | common/aarch64/early_exceptions.S | 2 | ||||
-rw-r--r-- | common/backtrace/backtrace.c | 7 | ||||
-rw-r--r-- | common/bl_common.c | 19 | ||||
-rw-r--r-- | common/desc_image_load.c | 7 | ||||
-rw-r--r-- | common/fdt_wrappers.c | 8 | ||||
-rw-r--r-- | common/image_decompress.c | 9 | ||||
-rw-r--r-- | common/runtime_svc.c | 5 | ||||
-rw-r--r-- | common/tf_log.c | 7 |
9 files changed, 37 insertions, 29 deletions
diff --git a/common/aarch64/debug.S b/common/aarch64/debug.S index 4478d0d0..da740ef2 100644 --- a/common/aarch64/debug.S +++ b/common/aarch64/debug.S @@ -6,7 +6,7 @@ #include <arch.h> #include <asm_macros.S> -#include <debug.h> +#include <common/debug.h> .globl asm_print_str .globl asm_print_hex diff --git a/common/aarch64/early_exceptions.S b/common/aarch64/early_exceptions.S index ba94f6cb..36a87246 100644 --- a/common/aarch64/early_exceptions.S +++ b/common/aarch64/early_exceptions.S @@ -5,7 +5,7 @@ */ #include <asm_macros.S> -#include <bl_common.h> +#include <common/bl_common.h> /* ----------------------------------------------------------------------------- * Very simple stackless exception handlers used by BL2 and BL31 stages. diff --git a/common/backtrace/backtrace.c b/common/backtrace/backtrace.c index a91d0657..bf60a08a 100644 --- a/common/backtrace/backtrace.c +++ b/common/backtrace/backtrace.c @@ -4,13 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <console.h> -#include <debug.h> #include <stdbool.h> #include <stdint.h> +#include <arch_helpers.h> +#include <common/debug.h> +#include <drivers/console.h> + /* Maximum number of entries in the backtrace to display */ #define UNWIND_LIMIT 20U diff --git a/common/bl_common.c b/common/bl_common.c index d12a17cf..b2d22c19 100644 --- a/common/bl_common.c +++ b/common/bl_common.c @@ -4,18 +4,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch.h> -#include <arch_helpers.h> #include <assert.h> -#include <auth_mod.h> -#include <bl_common.h> -#include <debug.h> #include <errno.h> -#include <io_storage.h> -#include <platform.h> #include <string.h> -#include <utils.h> -#include <xlat_tables_defs.h> + +#include <arch.h> +#include <arch_helpers.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <drivers/auth/auth_mod.h> +#include <drivers/io/io_storage.h> +#include <lib/utils.h> +#include <lib/xlat_tables/xlat_tables_defs.h> +#include <plat/common/platform.h> #if TRUSTED_BOARD_BOOT # ifdef DYN_DISABLE_AUTH diff --git a/common/desc_image_load.c b/common/desc_image_load.c index b07fba33..ada02f8d 100644 --- a/common/desc_image_load.c +++ b/common/desc_image_load.c @@ -4,12 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> -#include <desc_image_load.h> - +#include <arch_helpers.h> +#include <common/bl_common.h> +#include <common/desc_image_load.h> static bl_load_info_t bl_load_info; static bl_params_t next_bl_params; diff --git a/common/fdt_wrappers.c b/common/fdt_wrappers.c index 31dafb2e..e67fdb00 100644 --- a/common/fdt_wrappers.c +++ b/common/fdt_wrappers.c @@ -7,11 +7,13 @@ /* Helper functions to offer easier navigation of Device Tree Blob */ #include <assert.h> -#include <debug.h> -#include <fdt_wrappers.h> -#include <libfdt.h> #include <string.h> +#include <libfdt.h> + +#include <common/debug.h> +#include <common/fdt_wrappers.h> + /* * Read cells from a given property of the given node. At most 2 cells of the * property are read, and pointer is updated. Returns 0 on success, and -1 upon diff --git a/common/image_decompress.c b/common/image_decompress.c index 7bd02b1d..a4586ae6 100644 --- a/common/image_decompress.c +++ b/common/image_decompress.c @@ -4,13 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> -#include <debug.h> -#include <image_decompress.h> #include <stdint.h> +#include <arch_helpers.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <common/image_decompress.h> + static uintptr_t decompressor_buf_base; static uint32_t decompressor_buf_size; static decompressor_t *decompressor; diff --git a/common/runtime_svc.c b/common/runtime_svc.c index c30c0ecb..09ce787d 100644 --- a/common/runtime_svc.c +++ b/common/runtime_svc.c @@ -5,11 +5,12 @@ */ #include <assert.h> -#include <debug.h> #include <errno.h> -#include <runtime_svc.h> #include <string.h> +#include <common/debug.h> +#include <common/runtime_svc.h> + /******************************************************************************* * The 'rt_svc_descs' array holds the runtime service descriptors exported by * services by placing them in the 'rt_svc_descs' linker section. diff --git a/common/tf_log.c b/common/tf_log.c index 07021856..3e174dda 100644 --- a/common/tf_log.c +++ b/common/tf_log.c @@ -4,9 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <stdarg.h> #include <assert.h> -#include <debug.h> -#include <platform.h> +#include <stdio.h> + +#include <common/debug.h> +#include <plat/common/platform.h> /* Set the default maximum log level to the `LOG_LEVEL` build flag */ static unsigned int max_log_level = LOG_LEVEL; |