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 /services/spd/tlkd | |
parent | f5478dedf9e096d9539362b38ceb096b940ba3e2 (diff) | |
download | trusted-firmware-a-09d40e0e08283a249e7dce0e106c07c5141f9b7e.tar.gz |
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 'services/spd/tlkd')
-rw-r--r-- | services/spd/tlkd/tlkd_common.c | 8 | ||||
-rw-r--r-- | services/spd/tlkd/tlkd_main.c | 16 | ||||
-rw-r--r-- | services/spd/tlkd/tlkd_pm.c | 11 | ||||
-rw-r--r-- | services/spd/tlkd/tlkd_private.h | 10 |
4 files changed, 26 insertions, 19 deletions
diff --git a/services/spd/tlkd/tlkd_common.c b/services/spd/tlkd/tlkd_common.c index 6fec91bca7..2f0194eb2f 100644 --- a/services/spd/tlkd/tlkd_common.c +++ b/services/spd/tlkd/tlkd_common.c @@ -4,11 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> -#include <context_mgmt.h> #include <string.h> + +#include <arch_helpers.h> +#include <common/bl_common.h> +#include <lib/el3_runtime/context_mgmt.h> + #include "tlkd_private.h" #define AT_MASK 3 diff --git a/services/spd/tlkd/tlkd_main.c b/services/spd/tlkd/tlkd_main.c index cee7ef865d..ffe3319ec6 100644 --- a/services/spd/tlkd/tlkd_main.c +++ b/services/spd/tlkd/tlkd_main.c @@ -15,16 +15,18 @@ ******************************************************************************/ #include <arch_helpers.h> #include <assert.h> -#include <bl31.h> -#include <bl_common.h> -#include <context_mgmt.h> -#include <debug.h> #include <errno.h> -#include <platform.h> -#include <runtime_svc.h> #include <stddef.h> + +#include <bl31/bl31.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <common/runtime_svc.h> +#include <lib/el3_runtime/context_mgmt.h> +#include <plat/common/platform.h> +#include <tools_share/uuid.h> + #include <tlk.h> -#include <uuid.h> #include "tlkd_private.h" extern const spd_pm_ops_t tlkd_pm_ops; diff --git a/services/spd/tlkd/tlkd_pm.c b/services/spd/tlkd/tlkd_pm.c index 2cd2fbbe79..de34bf6b51 100644 --- a/services/spd/tlkd/tlkd_pm.c +++ b/services/spd/tlkd/tlkd_pm.c @@ -4,12 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> -#include <context_mgmt.h> -#include <debug.h> -#include <psci.h> + +#include <arch_helpers.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <lib/el3_runtime/context_mgmt.h> +#include <lib/psci/psci.h> #include <tlk.h> #include "tlkd_private.h" diff --git a/services/spd/tlkd/tlkd_private.h b/services/spd/tlkd/tlkd_private.h index 525cc3aec2..53f9e20c30 100644 --- a/services/spd/tlkd/tlkd_private.h +++ b/services/spd/tlkd/tlkd_private.h @@ -7,11 +7,12 @@ #ifndef TLKD_PRIVATE_H #define TLKD_PRIVATE_H +#include <platform_def.h> + #include <arch.h> +#include <bl31/interrupt_mgmt.h> #include <context.h> -#include <interrupt_mgmt.h> -#include <platform_def.h> -#include <psci.h> +#include <lib/psci/psci.h> /* * This flag is used by the TLKD to determine if the SP is servicing a yielding @@ -72,9 +73,10 @@ #ifndef __ASSEMBLY__ -#include <cassert.h> #include <stdint.h> +#include <lib/cassert.h> + /* AArch64 callee saved general purpose register context structure. */ DEFINE_REG_STRUCT(c_rt_regs, TLKD_C_RT_CTX_ENTRIES); |