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>
diff --git a/tftf/framework/debug.c b/tftf/framework/debug.c
index 0927ed4..66fc03b 100644
--- a/tftf/framework/debug.c
+++ b/tftf/framework/debug.c
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#include <console.h>
#include <debug.h>
+#include <drivers/console.h>
void __attribute__((__noreturn__)) do_panic(const char *file, int line)
{
diff --git a/tftf/framework/framework.mk b/tftf/framework/framework.mk
index 81061d4..4e5dc2e 100644
--- a/tftf/framework/framework.mk
+++ b/tftf/framework/framework.mk
@@ -12,11 +12,9 @@
TFTF_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/extensions \
diff --git a/tftf/framework/main.c b/tftf/framework/main.c
index 02b5438..7f987c0 100644
--- a/tftf/framework/main.c
+++ b/tftf/framework/main.c
@@ -5,9 +5,9 @@
*/
#include <arch_helpers.h>
-#include <arm_gic.h>
#include <assert.h>
#include <debug.h>
+#include <drivers/arm/arm_gic.h>
#include <irq.h>
#include <mmio.h>
#include <nvm.h>
diff --git a/tftf/framework/timer/timer_framework.c b/tftf/framework/timer/timer_framework.c
index 0b0a7a5..38106cf 100644
--- a/tftf/framework/timer/timer_framework.c
+++ b/tftf/framework/timer/timer_framework.c
@@ -6,8 +6,8 @@
#include <arch.h>
#include <arch_helpers.h>
-#include <arm_gic.h>
#include <debug.h>
+#include <drivers/arm/arm_gic.h>
#include <errno.h>
#include <irq.h>
#include <mmio.h>