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/bl1 | |
| 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/bl1')
| -rw-r--r-- | include/bl1/bl1.h | 5 | ||||
| -rw-r--r-- | include/bl1/tbbr/tbbr_img_desc.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/bl1/bl1.h b/include/bl1/bl1.h index 39b8d1ed..7b5d8757 100644 --- a/include/bl1/bl1.h +++ b/include/bl1/bl1.h @@ -7,7 +7,7 @@ #ifndef BL1_H #define BL1_H -#include <bl_common.h> +#include <common/bl_common.h> /* * Defines for BL1 SMC function ids. @@ -62,7 +62,8 @@ ((_fid >= FWU_SMC_FID_START) && (_fid <= FWU_SMC_FID_END)) #ifndef __ASSEMBLY__ -#include <cassert.h> + +#include <lib/cassert.h> struct entry_point_info; diff --git a/include/bl1/tbbr/tbbr_img_desc.h b/include/bl1/tbbr/tbbr_img_desc.h index bb36eb50..db15cdbf 100644 --- a/include/bl1/tbbr/tbbr_img_desc.h +++ b/include/bl1/tbbr/tbbr_img_desc.h @@ -7,7 +7,7 @@ #ifndef TBBR_IMG_DESC_H #define TBBR_IMG_DESC_H -#include <bl_common.h> +#include <common/bl_common.h> extern image_desc_t bl1_tbbr_image_descs[]; |