aboutsummaryrefslogtreecommitdiff
path: root/drivers
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 /drivers
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 'drivers')
-rw-r--r--drivers/arm/gic/arm_gic_v2.c2
-rw-r--r--drivers/arm/gic/arm_gic_v2v3.c6
-rw-r--r--drivers/arm/gic/gic_common.c4
-rw-r--r--drivers/arm/gic/gic_v2.c6
-rw-r--r--drivers/arm/gic/gic_v3.c6
-rw-r--r--drivers/arm/pl011/aarch32/pl011_console.S5
-rw-r--r--drivers/arm/pl011/aarch64/pl011_console.S5
-rw-r--r--drivers/arm/sp805/sp805.c2
-rw-r--r--drivers/arm/timer/sp804.c6
-rw-r--r--drivers/arm/timer/system_timer.c6
-rw-r--r--drivers/io/io_fip.c4
-rw-r--r--drivers/io/io_memmap.c2
-rw-r--r--drivers/io/io_storage.c2
-rw-r--r--drivers/io/vexpress_nor/io_vexpress_nor_internal.h4
14 files changed, 31 insertions, 29 deletions
diff --git a/drivers/arm/gic/arm_gic_v2.c b/drivers/arm/gic/arm_gic_v2.c
index 025d48d3..82666263 100644
--- a/drivers/arm/gic/arm_gic_v2.c
+++ b/drivers/arm/gic/arm_gic_v2.c
@@ -8,7 +8,7 @@
#include <arch_helpers.h>
#include <assert.h>
#include <debug.h>
-#include <gic_v2.h>
+#include <drivers/arm/gic_v2.h>
void arm_gic_enable_interrupts_local(void)
{
diff --git a/drivers/arm/gic/arm_gic_v2v3.c b/drivers/arm/gic/arm_gic_v2v3.c
index 576c6112..a3f84d07 100644
--- a/drivers/arm/gic/arm_gic_v2v3.c
+++ b/drivers/arm/gic/arm_gic_v2v3.c
@@ -8,9 +8,9 @@
#include <arch_helpers.h>
#include <assert.h>
#include <debug.h>
-#include <gic_common.h>
-#include <gic_v2.h>
-#include <gic_v3.h>
+#include <drivers/arm/gic_common.h>
+#include <drivers/arm/gic_v2.h>
+#include <drivers/arm/gic_v3.h>
/* Record whether a GICv3 was detected on the system */
static unsigned int gicv3_detected;
diff --git a/drivers/arm/gic/gic_common.c b/drivers/arm/gic/gic_common.c
index 207ee15a..d9c9fcee 100644
--- a/drivers/arm/gic/gic_common.c
+++ b/drivers/arm/gic/gic_common.c
@@ -7,8 +7,8 @@
#include <arch.h>
#include <arch_helpers.h>
#include <assert.h>
-#include <gic_common.h>
-#include <gic_v3.h>
+#include <drivers/arm/gic_common.h>
+#include <drivers/arm/gic_v3.h>
#include <mmio.h>
/*******************************************************************************
diff --git a/drivers/arm/gic/gic_v2.c b/drivers/arm/gic/gic_v2.c
index 48ee29e2..7904ed12 100644
--- a/drivers/arm/gic/gic_v2.c
+++ b/drivers/arm/gic/gic_v2.c
@@ -6,10 +6,10 @@
#include <arch.h>
#include <arch_helpers.h>
-#include <arm_gic.h>
#include <assert.h>
-#include <gic_common.h>
-#include <gic_v2.h>
+#include <drivers/arm/arm_gic.h>
+#include <drivers/arm/gic_common.h>
+#include <drivers/arm/gic_v2.h>
#include <mmio.h>
#include <platform.h>
diff --git a/drivers/arm/gic/gic_v3.c b/drivers/arm/gic/gic_v3.c
index 76b08639..5a777cb3 100644
--- a/drivers/arm/gic/gic_v3.c
+++ b/drivers/arm/gic/gic_v3.c
@@ -6,11 +6,11 @@
#include <arch.h>
#include <arch_helpers.h>
-#include <arm_gic.h>
#include <assert.h>
#include <debug.h>
-#include <gic_common.h>
-#include <gic_v3.h>
+#include <drivers/arm/arm_gic.h>
+#include <drivers/arm/gic_common.h>
+#include <drivers/arm/gic_v3.h>
#include <mmio.h>
#include <platform.h>
diff --git a/drivers/arm/pl011/aarch32/pl011_console.S b/drivers/arm/pl011/aarch32/pl011_console.S
index 96da6f92..4c7bfe7f 100644
--- a/drivers/arm/pl011/aarch32/pl011_console.S
+++ b/drivers/arm/pl011/aarch32/pl011_console.S
@@ -3,10 +3,11 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*/
+
#include <arch.h>
#include <asm_macros.S>
-#include <console.h>
-#include <pl011.h>
+#include <drivers/arm/pl011.h>
+#include <drivers/console.h>
.globl console_init
.globl console_putc
diff --git a/drivers/arm/pl011/aarch64/pl011_console.S b/drivers/arm/pl011/aarch64/pl011_console.S
index d87982a6..4e7ad2d5 100644
--- a/drivers/arm/pl011/aarch64/pl011_console.S
+++ b/drivers/arm/pl011/aarch64/pl011_console.S
@@ -3,10 +3,11 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*/
+
#include <arch.h>
#include <asm_macros.S>
-#include <console.h>
-#include <pl011.h>
+#include <drivers/arm/pl011.h>
+#include <drivers/console.h>
.globl console_init
.globl console_putc
diff --git a/drivers/arm/sp805/sp805.c b/drivers/arm/sp805/sp805.c
index 72a668d2..2318c40d 100644
--- a/drivers/arm/sp805/sp805.c
+++ b/drivers/arm/sp805/sp805.c
@@ -6,9 +6,9 @@
#include <assert.h>
#include <debug.h>
+#include <drivers/arm/sp805.h>
#include <mmio.h>
#include <platform_def.h>
-#include <sp805.h>
#include <stdint.h>
static inline uint32_t sp805_read_wdog_load(unsigned long base)
diff --git a/drivers/arm/timer/sp804.c b/drivers/arm/timer/sp804.c
index de88cda2..dba8af67 100644
--- a/drivers/arm/timer/sp804.c
+++ b/drivers/arm/timer/sp804.c
@@ -6,11 +6,11 @@
#include <arch.h>
#include <arch_helpers.h>
-#include <arm_gic.h>
#include <assert.h>
-#include <gic_v2.h>
+#include <drivers/arm/arm_gic.h>
+#include <drivers/arm/gic_v2.h>
+#include <drivers/arm/sp804.h>
#include <mmio.h>
-#include <sp804.h>
static unsigned int sp804_freq;
static uintptr_t sp804_base;
diff --git a/drivers/arm/timer/system_timer.c b/drivers/arm/timer/system_timer.c
index 6cc3cef3..e1f8fb07 100644
--- a/drivers/arm/timer/system_timer.c
+++ b/drivers/arm/timer/system_timer.c
@@ -6,13 +6,13 @@
#include <arch.h>
#include <arch_helpers.h>
-#include <arm_gic.h>
#include <assert.h>
+#include <drivers/arm/arm_gic.h>
+#include <drivers/arm/gic_v2.h>
+#include <drivers/arm/system_timer.h>
#include <debug.h>
-#include <gic_v2.h>
#include <irq.h>
#include <mmio.h>
-#include <system_timer.h>
static uintptr_t g_systimer_base;
diff --git a/drivers/io/io_fip.c b/drivers/io/io_fip.c
index 8b5af6ec..6f272d94 100644
--- a/drivers/io/io_fip.c
+++ b/drivers/io/io_fip.c
@@ -6,11 +6,11 @@
#include <assert.h>
#include <debug.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_fip.h>
#include <errno.h>
#include <firmware_image_package.h>
#include <image_loader.h>
-#include <io_driver.h>
-#include <io_fip.h>
#include <io_storage.h>
#include <platform.h>
#include <platform_def.h>
diff --git a/drivers/io/io_memmap.c b/drivers/io/io_memmap.c
index 3f4b2dbb..231040bf 100644
--- a/drivers/io/io_memmap.c
+++ b/drivers/io/io_memmap.c
@@ -6,7 +6,7 @@
#include <assert.h>
#include <debug.h>
-#include <io_driver.h>
+#include <drivers/io/io_driver.h>
#include <io_storage.h>
#include <string.h>
diff --git a/drivers/io/io_storage.c b/drivers/io/io_storage.c
index 57dc7614..9a45da2d 100644
--- a/drivers/io/io_storage.c
+++ b/drivers/io/io_storage.c
@@ -5,7 +5,7 @@
*/
#include <assert.h>
-#include <io_driver.h>
+#include <drivers/io/io_driver.h>
#include <io_storage.h>
#include <platform_def.h>
#include <stddef.h>
diff --git a/drivers/io/vexpress_nor/io_vexpress_nor_internal.h b/drivers/io/vexpress_nor/io_vexpress_nor_internal.h
index e06d492e..328be069 100644
--- a/drivers/io/vexpress_nor/io_vexpress_nor_internal.h
+++ b/drivers/io/vexpress_nor/io_vexpress_nor_internal.h
@@ -7,8 +7,8 @@
#ifndef __IO_VEXPRESS_NOR_INTERNAL_H__
#define __IO_VEXPRESS_NOR_INTERNAL_H__
-#include <io_driver.h>
-#include <io_nor_flash.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_nor_flash.h>
#include <io_storage.h>
#define IS_FLASH_ADDRESS_BLOCK_ALIGNED(fp, addr) \