diff options
Diffstat (limited to 'include/common')
| -rw-r--r-- | include/common/bl_common.h | 10 | ||||
| -rw-r--r-- | include/common/debug.h | 6 | ||||
| -rw-r--r-- | include/common/desc_image_load.h | 2 | ||||
| -rw-r--r-- | include/common/ep_info.h | 7 | ||||
| -rw-r--r-- | include/common/param_header.h | 3 | ||||
| -rw-r--r-- | include/common/runtime_svc.h | 6 | ||||
| -rw-r--r-- | include/common/tbbr/tbbr_img_def.h | 2 |
7 files changed, 20 insertions, 16 deletions
diff --git a/include/common/bl_common.h b/include/common/bl_common.h index 56c89fcc..c12b08bb 100644 --- a/include/common/bl_common.h +++ b/include/common/bl_common.h @@ -7,9 +7,9 @@ #ifndef BL_COMMON_H #define BL_COMMON_H -#include <ep_info.h> -#include <param_header.h> -#include <utils_def.h> +#include <common/ep_info.h> +#include <common/param_header.h> +#include <lib/utils_def.h> #define UP U(1) #define DOWN U(0) @@ -58,11 +58,11 @@ #define SERROR_AARCH32 U(0xf) #ifndef __ASSEMBLY__ -#include <cassert.h> + #include <stddef.h> #include <stdint.h> -#include <utils_def.h> /* To retain compatibility */ +#include <lib/cassert.h> /* * Declarations of linker defined symbols to help determine memory layout of diff --git a/include/common/debug.h b/include/common/debug.h index a14a66e8..f8faf683 100644 --- a/include/common/debug.h +++ b/include/common/debug.h @@ -7,7 +7,7 @@ #ifndef DEBUG_H #define DEBUG_H -#include <utils_def.h> +#include <lib/utils_def.h> /* * The log output macros print output to the console. These macros produce @@ -28,12 +28,14 @@ #define LOG_LEVEL_VERBOSE U(50) #ifndef __ASSEMBLY__ + #include <cdefs.h> -#include <console.h> #include <stdarg.h> #include <stdbool.h> #include <stdio.h> +#include <drivers/console.h> + /* * Define Log Markers corresponding to each log level which will * be embedded in the format string and is expected by tf_log() to determine diff --git a/include/common/desc_image_load.h b/include/common/desc_image_load.h index 62548951..f2f26ea9 100644 --- a/include/common/desc_image_load.h +++ b/include/common/desc_image_load.h @@ -6,7 +6,7 @@ #ifndef DESC_IMAGE_LOAD_H #define DESC_IMAGE_LOAD_H -#include <bl_common.h> +#include <common/bl_common.h> /* Following structure is used to store BL ep/image info. */ typedef struct bl_mem_params_node { diff --git a/include/common/ep_info.h b/include/common/ep_info.h index 0f67687e..a09d03ba 100644 --- a/include/common/ep_info.h +++ b/include/common/ep_info.h @@ -7,8 +7,8 @@ #ifndef EP_INFO_H #define EP_INFO_H -#include <param_header.h> -#include <utils_def.h> +#include <common/param_header.h> +#include <lib/utils_def.h> #define SECURE U(0x0) #define NON_SECURE U(0x1) @@ -64,9 +64,10 @@ #ifndef __ASSEMBLY__ -#include <cassert.h> #include <stdint.h> +#include <lib/cassert.h> + typedef struct aapcs64_params { u_register_t arg0; u_register_t arg1; diff --git a/include/common/param_header.h b/include/common/param_header.h index e9717cbc..0c1503f1 100644 --- a/include/common/param_header.h +++ b/include/common/param_header.h @@ -8,7 +8,8 @@ #define PARAM_HEADER_H #include <stdbool.h> -#include <utils_def.h> + +#include <lib/utils_def.h> /* Param header types */ #define PARAM_EP U(0x01) diff --git a/include/common/runtime_svc.h b/include/common/runtime_svc.h index e32c2870..59bf158b 100644 --- a/include/common/runtime_svc.h +++ b/include/common/runtime_svc.h @@ -7,10 +7,10 @@ #ifndef RUNTIME_SVC_H #define RUNTIME_SVC_H -#include <bl_common.h> /* to include exception types */ -#include <cassert.h> +#include <common/bl_common.h> /* to include exception types */ +#include <lib/cassert.h> +#include <lib/utils_def.h> #include <smccc_helpers.h> /* to include SMCCC definitions */ -#include <utils_def.h> /******************************************************************************* * Structure definition, typedefs & constants for the runtime service framework diff --git a/include/common/tbbr/tbbr_img_def.h b/include/common/tbbr/tbbr_img_def.h index bd8f5dc5..672886de 100644 --- a/include/common/tbbr/tbbr_img_def.h +++ b/include/common/tbbr/tbbr_img_def.h @@ -7,7 +7,7 @@ #ifndef TBBR_IMG_DEF_H #define TBBR_IMG_DEF_H -#include <utils_def.h> +#include <lib/utils_def.h> /* Firmware Image Package */ #define FIP_IMAGE_ID U(0) |