aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorAntonio Nino Diaz <antonio.ninodiaz@arm.com>2018-12-14 00:18:21 +0000
committerAntonio Nino Diaz <antonio.ninodiaz@arm.com>2019-01-04 10:43:17 +0000
commit09d40e0e08283a249e7dce0e106c07c5141f9b7e (patch)
tree46e7af7b5be2738948b359b2a07078e4cf1bbec1 /drivers/staging
parentf5478dedf9e096d9539362b38ceb096b940ba3e2 (diff)
downloadtrusted-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 'drivers/staging')
-rw-r--r--drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c4
-rw-r--r--drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c6
-rw-r--r--drivers/staging/renesas/rcar/ddr/dram_sub_func.c5
-rw-r--r--drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.c4
-rw-r--r--drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c4
-rw-r--r--drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c4
-rw-r--r--drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.c4
-rw-r--r--drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.c4
-rw-r--r--drivers/staging/renesas/rcar/pfc/pfc_init.c6
-rw-r--r--drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.c4
-rw-r--r--drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.c4
-rw-r--r--drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.c5
-rw-r--r--drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.c4
-rw-r--r--drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.c4
-rw-r--r--drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.c4
-rw-r--r--drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.c4
-rw-r--r--drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.c4
-rw-r--r--drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c4
-rw-r--r--drivers/staging/renesas/rcar/qos/qos_init.c6
19 files changed, 59 insertions, 25 deletions
diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c
index 716d15d18d..74677f64c3 100644
--- a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c
+++ b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c
@@ -4,9 +4,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-
#include <stdint.h>
-#include <debug.h>
+
+#include <common/debug.h>
#include "boot_init_dram_regdef_e3.h"
#include "ddr_init_e3.h"
diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c b/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c
index d7291315f6..841eeb4732 100644
--- a/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c
+++ b/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c
@@ -7,8 +7,10 @@
#include <stdint.h>
#include <string.h>
#include <stdio.h>
-#include <mmio.h>
-#include <debug.h>
+
+#include <common/debug.h>
+#include <lib/mmio.h>
+
#include "ddr_regdef.h"
#include "init_dram_tbl_h3.h"
#include "init_dram_tbl_m3.h"
diff --git a/drivers/staging/renesas/rcar/ddr/dram_sub_func.c b/drivers/staging/renesas/rcar/ddr/dram_sub_func.c
index 4bf6942e03..82aa7f84d0 100644
--- a/drivers/staging/renesas/rcar/ddr/dram_sub_func.c
+++ b/drivers/staging/renesas/rcar/ddr/dram_sub_func.c
@@ -4,8 +4,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#include <mmio.h>
-#include <debug.h>
+#include <common/debug.h>
+#include <lib/mmio.h>
+
#include "dram_sub_func.h"
#define PRR (0xFFF00044U)
diff --git a/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.c b/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.c
index d75aa7c346..47fa837b3f 100644
--- a/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.c
+++ b/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.c
@@ -5,7 +5,9 @@
*/
#include <stdint.h> /* for uint32_t */
-#include <mmio.h>
+
+#include <lib/mmio.h>
+
#include "pfc_init_e3.h"
#include "rcar_def.h"
diff --git a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c b/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c
index 1c38f0600d..f31d99e569 100644
--- a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c
+++ b/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c
@@ -4,9 +4,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#include <stdint.h> /* for uint32_t */
-#include <mmio.h>
+#include <stdint.h>
+#include <lib/mmio.h>
/* GPIO base address */
#define GPIO_BASE (0xE6050000U)
diff --git a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c b/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c
index 3ed0cd3e41..e53235a20e 100644
--- a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c
+++ b/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c
@@ -5,7 +5,9 @@
*/
#include <stdint.h> /* for uint32_t */
-#include <mmio.h>
+
+#include <lib/mmio.h>
+
#include "pfc_init_h3_v2.h"
#include "rcar_def.h"
diff --git a/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.c b/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.c
index 911ee8cc9c..f7e66f2458 100644
--- a/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.c
+++ b/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.c
@@ -5,7 +5,9 @@
*/
#include <stdint.h> /* for uint32_t */
-#include <mmio.h>
+
+#include <lib/mmio.h>
+
#include "pfc_init_m3.h"
#include "rcar_def.h"
#include "rcar_private.h"
diff --git a/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.c b/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.c
index a2b6b34a10..e6b8a4f284 100644
--- a/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.c
+++ b/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.c
@@ -5,7 +5,9 @@
*/
#include <stdint.h> /* for uint32_t */
-#include <mmio.h>
+
+#include <lib/mmio.h>
+
#include "pfc_init_m3n.h"
#include "rcar_def.h"
diff --git a/drivers/staging/renesas/rcar/pfc/pfc_init.c b/drivers/staging/renesas/rcar/pfc/pfc_init.c
index fceff3dddc..f20e8b0b55 100644
--- a/drivers/staging/renesas/rcar/pfc/pfc_init.c
+++ b/drivers/staging/renesas/rcar/pfc/pfc_init.c
@@ -5,8 +5,10 @@
*/
#include <stdint.h>
-#include <debug.h>
-#include <mmio.h>
+
+#include <common/debug.h>
+#include <lib/mmio.h>
+
#include "rcar_def.h"
#if RCAR_LSI == RCAR_AUTO
#include "H3/pfc_init_h3_v1.h"
diff --git a/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.c b/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.c
index efe0c754d3..593fefb624 100644
--- a/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.c
+++ b/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.c
@@ -5,7 +5,9 @@
*/
#include <stdint.h>
-#include <debug.h>
+
+#include <common/debug.h>
+
#include "../qos_common.h"
#include "../qos_reg.h"
#include "qos_init_e3_v10.h"
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.c b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.c
index fd81187c88..21aa3df039 100644
--- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.c
+++ b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.c
@@ -5,7 +5,9 @@
*/
#include <stdint.h>
-#include <debug.h>
+
+#include <common/debug.h>
+
#include "../qos_common.h"
#include "qos_init_h3_v10.h"
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.c b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.c
index 1f65600506..5b7348ce0a 100644
--- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.c
+++ b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.c
@@ -5,8 +5,11 @@
*/
#include <stdint.h>
-#include <debug.h>
+
+#include <common/debug.h>
+
#include <rcar_def.h>
+
#include "../qos_common.h"
#include "qos_init_h3_v11.h"
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.c b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.c
index 6922360655..f27a7dce64 100644
--- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.c
+++ b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.c
@@ -5,7 +5,9 @@
*/
#include <stdint.h>
-#include <debug.h>
+
+#include <common/debug.h>
+
#include "../qos_common.h"
#include "../qos_reg.h"
#include "qos_init_h3_v20.h"
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.c b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.c
index 5986a39483..b3e65df940 100644
--- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.c
+++ b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.c
@@ -5,7 +5,9 @@
*/
#include <stdint.h>
-#include <debug.h>
+
+#include <common/debug.h>
+
#include "../qos_common.h"
#include "../qos_reg.h"
#include "qos_init_h3_v30.h"
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.c b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.c
index 58c37160ed..e4909b9c1d 100644
--- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.c
+++ b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.c
@@ -5,7 +5,9 @@
*/
#include <stdint.h>
-#include <debug.h>
+
+#include <common/debug.h>
+
#include "../qos_common.h"
#include "../qos_reg.h"
#include "qos_init_h3n_v30.h"
diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.c b/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.c
index a0d1e14733..c0846d2e25 100644
--- a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.c
+++ b/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.c
@@ -5,7 +5,9 @@
*/
#include <stdint.h>
-#include <debug.h>
+
+#include <common/debug.h>
+
#include "../qos_common.h"
#include "qos_init_m3_v10.h"
diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.c b/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.c
index fc0d2cce1e..3186cf68f9 100644
--- a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.c
+++ b/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.c
@@ -5,7 +5,9 @@
*/
#include <stdint.h>
-#include <debug.h>
+
+#include <common/debug.h>
+
#include "../qos_common.h"
#include "../qos_reg.h"
#include "qos_init_m3_v11.h"
diff --git a/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c b/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c
index e9d66761ed..0be68c3cd6 100644
--- a/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c
+++ b/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c
@@ -5,7 +5,9 @@
*/
#include <stdint.h>
-#include <debug.h>
+
+#include <common/debug.h>
+
#include "../qos_common.h"
#include "../qos_reg.h"
#include "qos_init_m3n_v10.h"
diff --git a/drivers/staging/renesas/rcar/qos/qos_init.c b/drivers/staging/renesas/rcar/qos/qos_init.c
index 54c880309c..1d1bcd59f1 100644
--- a/drivers/staging/renesas/rcar/qos/qos_init.c
+++ b/drivers/staging/renesas/rcar/qos/qos_init.c
@@ -5,8 +5,10 @@
*/
#include <stdint.h>
-#include <debug.h>
-#include <mmio.h>
+
+#include <common/debug.h>
+#include <lib/mmio.h>
+
#include "qos_init.h"
#include "qos_common.h"
#if RCAR_LSI == RCAR_AUTO