diff options
author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2019-01-11 13:12:58 +0000 |
---|---|---|
committer | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2019-01-25 08:23:20 +0000 |
commit | 09a00ef98c6108fec75dafcc7dbdddacb2ee2e91 (patch) | |
tree | 77b585708a4fd850f0dac3a3f0fcaf34576fa8c9 /spm | |
parent | 9e550b6f75f064b53d74a4ad3c8672332d87451c (diff) | |
download | tf-a-tests-09a00ef98c6108fec75dafcc7dbdddacb2ee2e91.tar.gz |
Sanitise includes of include/drivers across codebase
Enforce full include path for includes.
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 with the same name).
Change-Id: I45e912b16c9fff81f50840dad7e7f90ed6637b2a
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'spm')
-rw-r--r-- | spm/cactus/cactus.mk | 2 | ||||
-rw-r--r-- | spm/cactus/cactus_main.c | 4 | ||||
-rw-r--r-- | spm/ivy/ivy.mk | 2 | ||||
-rw-r--r-- | spm/ivy/ivy_main.c | 4 |
4 files changed, 4 insertions, 8 deletions
diff --git a/spm/cactus/cactus.mk b/spm/cactus/cactus.mk index 03d809d10..056b4a7af 100644 --- a/spm/cactus/cactus.mk +++ b/spm/cactus/cactus.mk @@ -12,8 +12,6 @@ CACTUS_INCLUDES := \ -Iinclude \ -Iinclude/common \ -Iinclude/common/${ARCH} \ - -Iinclude/drivers \ - -Iinclude/drivers/arm \ -Iinclude/lib \ -Iinclude/lib/${ARCH} \ -Iinclude/lib/stdlib \ diff --git a/spm/cactus/cactus_main.c b/spm/cactus/cactus_main.c index a062ef011..4580f23eb 100644 --- a/spm/cactus/cactus_main.c +++ b/spm/cactus/cactus_main.c @@ -6,10 +6,10 @@ #include <assert.h> #include <cactus_def.h> -#include <console.h> #include <debug.h> +#include <drivers/arm/pl011.h> +#include <drivers/console.h> #include <errno.h> -#include <pl011.h> #include <plat_arm.h> #include <platform_def.h> #include <sp_helpers.h> diff --git a/spm/ivy/ivy.mk b/spm/ivy/ivy.mk index c7726f4fd..244d20969 100644 --- a/spm/ivy/ivy.mk +++ b/spm/ivy/ivy.mk @@ -12,8 +12,6 @@ IVY_INCLUDES := \ -Iinclude \ -Iinclude/common \ -Iinclude/common/${ARCH} \ - -Iinclude/drivers \ - -Iinclude/drivers/arm \ -Iinclude/lib \ -Iinclude/lib/${ARCH} \ -Iinclude/lib/stdlib \ diff --git a/spm/ivy/ivy_main.c b/spm/ivy/ivy_main.c index 1f1c5e4db..8542150ba 100644 --- a/spm/ivy/ivy_main.c +++ b/spm/ivy/ivy_main.c @@ -5,11 +5,11 @@ */ #include <assert.h> -#include <console.h> #include <debug.h> +#include <drivers/console.h> +#include <drivers/arm/pl011.h> #include <errno.h> #include <ivy_def.h> -#include <pl011.h> #include <plat_arm.h> #include <platform_def.h> #include <sp_helpers.h> |