aboutsummaryrefslogtreecommitdiff
path: root/fwu
diff options
context:
space:
mode:
authorAntonio Nino Diaz <antonio.ninodiaz@arm.com>2019-01-11 13:12:58 +0000
committerSandrine Bailleux <sandrine.bailleux@arm.com>2019-01-25 08:23:20 +0000
commit09a00ef98c6108fec75dafcc7dbdddacb2ee2e91 (patch)
tree77b585708a4fd850f0dac3a3f0fcaf34576fa8c9 /fwu
parent9e550b6f75f064b53d74a4ad3c8672332d87451c (diff)
downloadtf-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 'fwu')
-rw-r--r--fwu/ns_bl1u/ns_bl1u.mk4
-rw-r--r--fwu/ns_bl1u/ns_bl1u_main.c2
-rw-r--r--fwu/ns_bl1u/ns_bl1u_tests.c2
-rw-r--r--fwu/ns_bl2u/ns_bl2u.mk4
4 files changed, 4 insertions, 8 deletions
diff --git a/fwu/ns_bl1u/ns_bl1u.mk b/fwu/ns_bl1u/ns_bl1u.mk
index d5c78069..edc77bef 100644
--- a/fwu/ns_bl1u/ns_bl1u.mk
+++ b/fwu/ns_bl1u/ns_bl1u.mk
@@ -10,11 +10,9 @@ include lib/compiler-rt/compiler-rt.mk
NS_BL1U_INCLUDES := \
-I${AUTOGEN_DIR} \
-Itftf/framework/include \
+ -Iinclude \
-Iinclude/common \
-Iinclude/common/${ARCH} \
- -Iinclude/drivers \
- -Iinclude/drivers/arm \
- -Iinclude/drivers/io \
-Iinclude/lib \
-Iinclude/lib/${ARCH} \
-Iinclude/lib/stdlib \
diff --git a/fwu/ns_bl1u/ns_bl1u_main.c b/fwu/ns_bl1u/ns_bl1u_main.c
index 4a15e860..55cea903 100644
--- a/fwu/ns_bl1u/ns_bl1u_main.c
+++ b/fwu/ns_bl1u/ns_bl1u_main.c
@@ -8,9 +8,9 @@
#include <assert.h>
#include <bl1.h>
#include <debug.h>
+#include <drivers/io/io_fip.h>
#include <errno.h>
#include <image_loader.h>
-#include <io_fip.h>
#include <io_storage.h>
#include <mmio.h>
#include <nvm.h>
diff --git a/fwu/ns_bl1u/ns_bl1u_tests.c b/fwu/ns_bl1u/ns_bl1u_tests.c
index 16ae2591..c5e18378 100644
--- a/fwu/ns_bl1u/ns_bl1u_tests.c
+++ b/fwu/ns_bl1u/ns_bl1u_tests.c
@@ -11,8 +11,8 @@
#include <bl1.h>
#include <debug.h>
+#include <drivers/io/io_fip.h>
#include <errno.h>
-#include <io_fip.h>
#include <platform_def.h>
#include <smccc.h>
#include <status.h>
diff --git a/fwu/ns_bl2u/ns_bl2u.mk b/fwu/ns_bl2u/ns_bl2u.mk
index abd5ac55..8c3924d3 100644
--- a/fwu/ns_bl2u/ns_bl2u.mk
+++ b/fwu/ns_bl2u/ns_bl2u.mk
@@ -10,11 +10,9 @@ include lib/compiler-rt/compiler-rt.mk
NS_BL2U_INCLUDES := \
-I${AUTOGEN_DIR} \
-Itftf/framework/include \
+ -Iinclude \
-Iinclude/common \
-Iinclude/common/${ARCH} \
- -Iinclude/drivers \
- -Iinclude/drivers/arm \
- -Iinclude/drivers/io \
-Iinclude/lib \
-Iinclude/lib/${ARCH} \
-Iinclude/lib/stdlib \