diff options
author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-12-14 00:18:21 +0000 |
---|---|---|
committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2019-01-04 10:43:17 +0000 |
commit | 09d40e0e08283a249e7dce0e106c07c5141f9b7e (patch) | |
tree | 46e7af7b5be2738948b359b2a07078e4cf1bbec1 /include/services | |
parent | f5478dedf9e096d9539362b38ceb096b940ba3e2 (diff) |
Sanitise includes across codebase
Enforce full include path for includes. Deprecate old paths.
The following folders inside include/lib have been left unchanged:
- include/lib/cpus/${ARCH}
- include/lib/el3_runtime/${ARCH}
The reason for this change is that having a global namespace for
includes isn't a good idea. It defeats one of the advantages of having
folders and it introduces problems that are sometimes subtle (because
you may not know the header you are actually including if there are two
of them).
For example, this patch had to be created because two headers were
called the same way: e0ea0928d5b7 ("Fix gpio includes of mt8173 platform
to avoid collision."). More recently, this patch has had similar
problems: 46f9b2c3a282 ("drivers: add tzc380 support").
This problem was introduced in commit 4ecca33988b9 ("Move include and
source files to logical locations"). At that time, there weren't too
many headers so it wasn't a real issue. However, time has shown that
this creates problems.
Platforms that want to preserve the way they include headers may add the
removed paths to PLAT_INCLUDES, but this is discouraged.
Change-Id: I39dc53ed98f9e297a5966e723d1936d6ccf2fc8f
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'include/services')
-rw-r--r-- | include/services/mm_svc.h | 2 | ||||
-rw-r--r-- | include/services/sdei.h | 4 | ||||
-rw-r--r-- | include/services/secure_partition.h | 3 | ||||
-rw-r--r-- | include/services/sp_res_desc.h | 3 | ||||
-rw-r--r-- | include/services/sp_res_desc_def.h | 2 | ||||
-rw-r--r-- | include/services/spci_svc.h | 4 | ||||
-rw-r--r-- | include/services/spm_svc.h | 2 | ||||
-rw-r--r-- | include/services/sprt_svc.h | 4 |
8 files changed, 13 insertions, 11 deletions
diff --git a/include/services/mm_svc.h b/include/services/mm_svc.h index e2ce90fd..c81e9048 100644 --- a/include/services/mm_svc.h +++ b/include/services/mm_svc.h @@ -9,7 +9,7 @@ #if SPM_DEPRECATED -#include <utils_def.h> +#include <lib/utils_def.h> #define MM_VERSION_MAJOR U(1) #define MM_VERSION_MAJOR_SHIFT 16 diff --git a/include/services/sdei.h b/include/services/sdei.h index 4d0fd3fd..ae8c7e42 100644 --- a/include/services/sdei.h +++ b/include/services/sdei.h @@ -7,8 +7,8 @@ #ifndef SDEI_H #define SDEI_H -#include <spinlock.h> -#include <utils_def.h> +#include <lib/spinlock.h> +#include <lib/utils_def.h> /* Range 0xC4000020 - 0xC400003F reserved for SDE 64bit smc calls */ #define SDEI_VERSION 0xC4000020U diff --git a/include/services/secure_partition.h b/include/services/secure_partition.h index 0ae6cf99..47f63684 100644 --- a/include/services/secure_partition.h +++ b/include/services/secure_partition.h @@ -10,7 +10,8 @@ #if SPM_DEPRECATED #include <stdint.h> -#include <utils_def.h> + +#include <lib/utils_def.h> /* * Flags used by the secure_partition_mp_info structure to describe the diff --git a/include/services/sp_res_desc.h b/include/services/sp_res_desc.h index dc002212..b8be72ee 100644 --- a/include/services/sp_res_desc.h +++ b/include/services/sp_res_desc.h @@ -8,7 +8,8 @@ #define SPM_RES_DESC_H #include <stdint.h> -#include <sp_res_desc_def.h> + +#include <services/sp_res_desc_def.h> /******************************************************************************* * Attribute Section diff --git a/include/services/sp_res_desc_def.h b/include/services/sp_res_desc_def.h index 68df297a..5a3c50d7 100644 --- a/include/services/sp_res_desc_def.h +++ b/include/services/sp_res_desc_def.h @@ -7,7 +7,7 @@ #ifndef SPM_RES_DESC_DEFS_H #define SPM_RES_DESC_DEFS_H -#include <utils_def.h> +#include <lib/utils_def.h> /******************************************************************************* * Attribute Section diff --git a/include/services/spci_svc.h b/include/services/spci_svc.h index eae4fb7f..b82cf1e3 100644 --- a/include/services/spci_svc.h +++ b/include/services/spci_svc.h @@ -7,8 +7,8 @@ #ifndef SPCI_SVC_H #define SPCI_SVC_H -#include <smccc.h> -#include <utils_def.h> +#include <lib/smccc.h> +#include <lib/utils_def.h> /* SPCI_VERSION helpers */ diff --git a/include/services/spm_svc.h b/include/services/spm_svc.h index 763b24ea..fcb409b2 100644 --- a/include/services/spm_svc.h +++ b/include/services/spm_svc.h @@ -9,7 +9,7 @@ #if SPM_DEPRECATED -#include <utils_def.h> +#include <lib/utils_def.h> #define SPM_VERSION_MAJOR U(0) #define SPM_VERSION_MAJOR_SHIFT 16 diff --git a/include/services/sprt_svc.h b/include/services/sprt_svc.h index b6b51dd4..bd695e58 100644 --- a/include/services/sprt_svc.h +++ b/include/services/sprt_svc.h @@ -7,8 +7,8 @@ #ifndef SPRT_SVC_H #define SPRT_SVC_H -#include <smccc.h> -#include <utils_def.h> +#include <lib/smccc.h> +#include <lib/utils_def.h> /* SPRT_VERSION helpers */ |