Make use of user/system includes more consistent

Make codebase consistent in its use of #include "" syntax for
user includes and #include <> syntax for system includes.

Fixes ARM-software/tf-issues#65

Change-Id: If2f7c4885173b1fd05ac2cde5f1c8a07000c7a33

diff --git a/Makefile b/Makefile
index aa9b0a1dc47e373ea69de8ee15df0c46d97e7809..23ab0101abc4c8a868b40d44823fc37ee2dcbda9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -145,7 +145,6 @@ INCLUDES            +=      -Iinclude/bl1                   \
                                -Iinclude/lib/aarch64           \
                                -Iinclude/stdlib                \
                                -Iinclude/stdlib/sys            \
-                               -Iservices/std_svc/psci         \
                                -Iplat/${PLAT}                  \
                                ${PLAT_INCLUDES}                \
                                ${SPD_INCLUDES}

diff --git a/bl2/bl2_main.c b/bl2/bl2_main.c
index 1deebc83526f5e0d7ce9a4cd67fdf46d18231dd6..cb0519a60e9ce38584a2e33c522c1927bd8550db 100644 (file)
--- a/bl2/bl2_main.c
+++ b/bl2/bl2_main.c
@@ -37,7 +37,7 @@
 #include <semihosting.h>
 #include <bl_common.h>
 #include <bl2.h>
-#include "debug.h"
+#include <debug.h>
 
 /*******************************************************************************
  * The only thing to do in BL2 is to load further images and pass control to

diff --git a/bl31/aarch64/bl31_entrypoint.S b/bl31/aarch64/bl31_entrypoint.S
index d35b50a598bd05916c21b09f3e829227ad1b2306..c04bc181b665a0150777c83a4d2aa9f112360b1e 100644 (file)
--- a/bl31/aarch64/bl31_entrypoint.S
+++ b/bl31/aarch64/bl31_entrypoint.S
@@ -31,8 +31,8 @@
 #include <bl_common.h>
 #include <platform.h>
 #include <arch.h>
-#include "cm_macros.S"
 #include <asm_macros.S>
+#include <cm_macros.S>
 
 
        .globl  bl31_entrypoint

diff --git a/bl31/aarch64/runtime_exceptions.S b/bl31/aarch64/runtime_exceptions.S
index d00c1d7b504975f3b453ed08afb4c6b3f42345a6..b89a76897a71d340df9e39b2d56312f1151c8c12 100644 (file)
--- a/bl31/aarch64/runtime_exceptions.S
+++ b/bl31/aarch64/runtime_exceptions.S
@@ -32,8 +32,8 @@
 #include <runtime_svc.h>
 #include <platform.h>
 #include <context.h>
-#include "asm_macros.S"
-#include "cm_macros.S"
+#include <asm_macros.S>
+#include <cm_macros.S>
 
        .globl  runtime_exceptions
        .globl  el3_exit

diff --git a/common/bl_common.c b/common/bl_common.c
index b03165ba341ed8df1df203659b98f10026ff3e4c..acdcc1fa468f05014d571414de8149a2f7f3cfa5 100644 (file)
--- a/common/bl_common.c
+++ b/common/bl_common.c
@@ -37,8 +37,8 @@
 #include <platform.h>
 #include <semihosting.h>
 #include <bl_common.h>
-#include "io_storage.h"
-#include "debug.h"
+#include <io_storage.h>
+#include <debug.h>
 
 unsigned long page_align(unsigned long value, unsigned dir)
 {

diff --git a/drivers/arm/tzc400/tzc400.c b/drivers/arm/tzc400/tzc400.c
index b88e34a9a568b65b6562832d04ec63b412e7e7e6..ec6adeef28ba937d73260a840539b28e12930538 100644 (file)
--- a/drivers/arm/tzc400/tzc400.c
+++ b/drivers/arm/tzc400/tzc400.c
@@ -29,10 +29,10 @@
  */
 
 #include <assert.h>
-#include "arch_helpers.h"
-#include "tzc400.h"
-#include "mmio.h"
-#include "debug.h"
+#include <arch_helpers.h>
+#include <tzc400.h>
+#include <mmio.h>
+#include <debug.h>
 
 static uint32_t tzc_read_build_config(uint64_t base)
 {

diff --git a/drivers/io/io_fip.c b/drivers/io/io_fip.c
index 1eb76faaa5c88f0d21eca6c71af9726e610990ff..3a5d2204e9858013df70cea287a67db122669bb5 100644 (file)
--- a/drivers/io/io_fip.c
+++ b/drivers/io/io_fip.c
@@ -33,12 +33,12 @@
 #include <errno.h>
 #include <string.h>
 #include <assert.h>
-#include "platform.h"
-#include "firmware_image_package.h"
-#include "io_storage.h"
-#include "io_driver.h"
-#include "io_fip.h"
-#include "debug.h"
+#include <platform.h>
+#include <firmware_image_package.h>
+#include <io_storage.h>
+#include <io_driver.h>
+#include <io_fip.h>
+#include <debug.h>
 
 /* Useful for printing UUIDs when debugging.*/
 #define PRINT_UUID2(x)                                                         \

diff --git a/drivers/io/io_memmap.c b/drivers/io/io_memmap.c
index 40b8e9abcaedffba540e1e05d2e2f5506238cc9c..5685be19edcadf918e93b02a03163d9e4a82da68 100644 (file)
--- a/drivers/io/io_memmap.c
+++ b/drivers/io/io_memmap.c
@@ -30,9 +30,9 @@
 
 #include <assert.h>
 #include <string.h>
-#include "io_storage.h"
-#include "io_driver.h"
-#include "debug.h"
+#include <io_storage.h>
+#include <io_driver.h>
+#include <debug.h>
 
 /* As we need to be able to keep state for seek, only one file can be open
  * at a time. Make this a structure and point to the entity->info. When we

diff --git a/drivers/io/io_semihosting.c b/drivers/io/io_semihosting.c
index 14ec687c665cd1921ce89bd7691e64d62d5b9496..c8013bc8b4e590e4b6fea69c5c7b9e3c61955ffc 100644 (file)
--- a/drivers/io/io_semihosting.c
+++ b/drivers/io/io_semihosting.c
@@ -29,9 +29,9 @@
  */
 
 #include <assert.h>
-#include "io_storage.h"
-#include "io_driver.h"
-#include "semihosting.h"
+#include <io_storage.h>
+#include <io_driver.h>
+#include <semihosting.h>
 
 
 

diff --git a/include/drivers/io_driver.h b/include/drivers/io_driver.h
index 82dbbf129cca822523dd51987081c69eabd6ff69..5e3d1327ed652b8307a76f4d047172d5b2c98334 100644 (file)
--- a/include/drivers/io_driver.h
+++ b/include/drivers/io_driver.h
@@ -31,7 +31,7 @@
 #ifndef __IO_DRIVER_H__
 #define __IO_DRIVER_H__
 
-#include "platform.h"   /* For MAX_IO_DEVICES */
+#include <platform.h>   /* For MAX_IO_DEVICES */
 
 
 /* Generic IO entity structure,representing an accessible IO construct on the

diff --git a/lib/io_storage.c b/lib/io_storage.c
index aeb8edbbbef209b113f9c4887dada8b920b34743..cd9c2bdf90d93f802489a91513ffc9a36e13946f 100644 (file)
--- a/lib/io_storage.c
+++ b/lib/io_storage.c
@@ -31,8 +31,8 @@
 
 #include <stddef.h>
 #include <assert.h>
-#include "io_storage.h"
-#include "io_driver.h"
+#include <io_storage.h>
+#include <io_driver.h>
 
 
 #define MAX_DEVICES(plat_data)                                         \

diff --git a/plat/fvp/aarch64/plat_common.c b/plat/fvp/aarch64/plat_common.c
index dd362f0d32c9911074c6bced6329a0744f527e9a..338141c91685c475469bc88944fa8e6de9b598e5 100644 (file)
--- a/plat/fvp/aarch64/plat_common.c
+++ b/plat/fvp/aarch64/plat_common.c
@@ -30,7 +30,7 @@
 
 #include <assert.h>
 #include <arch_helpers.h>
-#include "debug.h"
+#include <debug.h>
 #include <platform.h>
 #include <xlat_tables.h>
 

diff --git a/plat/fvp/plat_io_storage.c b/plat/fvp/plat_io_storage.c
index 3c34f15af57a124f281adc532608de227c313dd2..d44a71d624277efb090562d0eece42b3cc63e380 100644 (file)
--- a/plat/fvp/plat_io_storage.c
+++ b/plat/fvp/plat_io_storage.c
@@ -30,14 +30,14 @@
 
 #include <assert.h>
 #include <string.h>
-#include "platform.h"
-#include "io_storage.h"
-#include "io_driver.h"
-#include "io_semihosting.h"
-#include "semihosting.h"       /* For FOPEN_MODE_... */
-#include "io_fip.h"
-#include "io_memmap.h"
-#include "debug.h"
+#include <platform.h>
+#include <io_storage.h>
+#include <io_driver.h>
+#include <io_semihosting.h>
+#include <semihosting.h>       /* For FOPEN_MODE_... */
+#include <io_fip.h>
+#include <io_memmap.h>
+#include <debug.h>
 
 /* IO devices */
 static struct io_plat_data io_data;

diff --git a/plat/fvp/plat_security.c b/plat/fvp/plat_security.c
index a60eca3dd5b219c5715538decd59a88679796368..042eb8160864500f310d2cdd4d56a956c2c1f41d 100644 (file)
--- a/plat/fvp/plat_security.c
+++ b/plat/fvp/plat_security.c
@@ -29,9 +29,9 @@
  */
 
 #include <assert.h>
-#include "platform.h"
-#include "tzc400.h"
-#include "debug.h"
+#include <platform.h>
+#include <tzc400.h>
+#include <debug.h>
 
 /* Used to improve readability for configuring regions. */
 #define FILTER_SHIFT(filter)   (1 << filter)

diff --git a/plat/fvp/platform.h b/plat/fvp/platform.h
index 01b995b82fe18bbbdb79da31bbbda0c33054b3f6..2024a9bc643671b24a251f349ab84f6d586b6fe6 100644 (file)
--- a/plat/fvp/platform.h
+++ b/plat/fvp/platform.h
@@ -35,7 +35,7 @@
 #include <mmio.h>
 #include <psci.h>
 #include <bl_common.h>
-#include "io_storage.h"
+#include <io_storage.h>
 
 
 /*******************************************************************************

diff --git a/services/spd/tspd/tspd.mk b/services/spd/tspd/tspd.mk
index 532e168d0098192c9f25235d41fd542822f24512..02446a3a9bec60229a6a2a28d898be6826fdc0da 100644 (file)
--- a/services/spd/tspd/tspd.mk
+++ b/services/spd/tspd/tspd.mk
@@ -29,8 +29,7 @@
 #
 
 TSPD_DIR               :=      services/spd/tspd
-SPD_INCLUDES           :=      -Iinclude/bl32/payloads \
-                               -I${TSPD_DIR}
+SPD_INCLUDES           :=      -Iinclude/bl32/payloads
 
 SPD_SOURCES            :=      tspd_common.c           \
                                tspd_main.c             \

diff --git a/services/spd/tspd/tspd_common.c b/services/spd/tspd/tspd_common.c
index b8065430d822d6e9ea4346febcc8f58a0c286abd..fcc276562b6f22e79a6e94e485f136784ff8bb5b 100644 (file)
--- a/services/spd/tspd/tspd_common.c
+++ b/services/spd/tspd/tspd_common.c
@@ -37,7 +37,7 @@
 #include <bl_common.h>
 #include <runtime_svc.h>
 #include <context_mgmt.h>
-#include <tspd_private.h>
+#include "tspd_private.h"
 
 /*******************************************************************************
  * Given a secure payload entrypoint, register width, cpu id & pointer to a

diff --git a/services/spd/tspd/tspd_helpers.S b/services/spd/tspd/tspd_helpers.S
index 27fbb5ae4368ae54092c91134fb0bf27634d5e55..f9a32aa09935af060f8f20bf28efe866cf5685d4 100644 (file)
--- a/services/spd/tspd/tspd_helpers.S
+++ b/services/spd/tspd/tspd_helpers.S
@@ -29,9 +29,9 @@
  */
 
 #include <context.h>
-#include <tspd_private.h>
 #include <asm_macros.S>
 #include <cm_macros.S>
+#include "tspd_private.h"
 
        .global tspd_enter_sp
        /* ---------------------------------------------

diff --git a/services/spd/tspd/tspd_main.c b/services/spd/tspd/tspd_main.c
index 543266e92783331d21e800ac9b2f107dc7f9ad4b..90fa0941e40fabadd8a8749c264c1a7afcd42157 100644 (file)
--- a/services/spd/tspd/tspd_main.c
+++ b/services/spd/tspd/tspd_main.c
@@ -49,9 +49,9 @@
 #include <bl31.h>
 #include <tsp.h>
 #include <psci.h>
-#include <tspd_private.h>
 #include <debug.h>
 #include <uuid.h>
+#include "tspd_private.h"
 
 /*******************************************************************************
  * Single structure to hold information about the various entry points into the

diff --git a/services/spd/tspd/tspd_pm.c b/services/spd/tspd/tspd_pm.c
index 4ebafc755acc0dc68668237e547ffd8e15e4e206..6a07aa2b16db9b477b40055ed07efd5a2d48e8c2 100644 (file)
--- a/services/spd/tspd/tspd_pm.c
+++ b/services/spd/tspd/tspd_pm.c
@@ -39,8 +39,8 @@
 #include <bl31.h>
 #include <bl32.h>
 #include <psci.h>
-#include <tspd_private.h>
 #include <debug.h>
+#include "tspd_private.h"
 
 /*******************************************************************************
  * The target cpu is being turned on. Allow the TSPD/TSP to perform any actions

diff --git a/services/std_svc/psci/psci_afflvl_off.c b/services/std_svc/psci/psci_afflvl_off.c
index f6bd40c89ba458e4fd2af972d65e3117e53bde9c..0598f424502f71efebd0492d5db08d8f8d6c8b56 100644 (file)
--- a/services/std_svc/psci/psci_afflvl_off.c
+++ b/services/std_svc/psci/psci_afflvl_off.c
@@ -36,7 +36,7 @@
 #include <console.h>
 #include <platform.h>
 #include <psci.h>
-#include <psci_private.h>
+#include "psci_private.h"
 
 typedef int (*afflvl_off_handler)(unsigned long, aff_map_node *);
 

diff --git a/services/std_svc/psci/psci_afflvl_on.c b/services/std_svc/psci/psci_afflvl_on.c
index 0878f21946222105d7c1126c906cda4a18789bcf..700a4e9736fb32ae2a91192f48d680107c44e5b0 100644 (file)
--- a/services/std_svc/psci/psci_afflvl_on.c
+++ b/services/std_svc/psci/psci_afflvl_on.c
@@ -36,8 +36,8 @@
 #include <console.h>
 #include <platform.h>
 #include <psci.h>
-#include <psci_private.h>
 #include <context_mgmt.h>
+#include "psci_private.h"
 
 typedef int (*afflvl_on_handler)(unsigned long,
                                 aff_map_node *,

diff --git a/services/std_svc/psci/psci_afflvl_suspend.c b/services/std_svc/psci/psci_afflvl_suspend.c
index fc6fe1f4c6f7229fad8c46630d89609e6aee6a73..ec7b89f278d99bc3cb6cf79b26dd4867d0039941 100644 (file)
--- a/services/std_svc/psci/psci_afflvl_suspend.c
+++ b/services/std_svc/psci/psci_afflvl_suspend.c
@@ -36,8 +36,8 @@
 #include <console.h>
 #include <platform.h>
 #include <psci.h>
-#include <psci_private.h>
 #include <context_mgmt.h>
+#include "psci_private.h"
 
 typedef int (*afflvl_suspend_handler)(unsigned long,
                                      aff_map_node *,

diff --git a/services/std_svc/psci/psci_common.c b/services/std_svc/psci/psci_common.c
index 8b49b7786a0554d4b6781e16cc0fd468141a41d5..fc10ab0c35ccc8c4220bf67ba9e8efb15858edf9 100644 (file)
--- a/services/std_svc/psci/psci_common.c
+++ b/services/std_svc/psci/psci_common.c
@@ -35,10 +35,10 @@
 #include <console.h>
 #include <platform.h>
 #include <psci.h>
-#include <psci_private.h>
 #include <context_mgmt.h>
 #include <runtime_svc.h>
-#include "debug.h"
+#include <debug.h>
+#include "psci_private.h"
 
 /*
  * SPD power management operations, expected to be supplied by the registered

diff --git a/services/std_svc/psci/psci_entry.S b/services/std_svc/psci/psci_entry.S
index bdd571e774433f5f4a77ba3d989b3127129b0715..8a73e8b9913049f795852a0f7e94ff4d91ea8347 100644 (file)
--- a/services/std_svc/psci/psci_entry.S
+++ b/services/std_svc/psci/psci_entry.S
@@ -31,10 +31,10 @@
 #include <arch.h>
 #include <platform.h>
 #include <psci.h>
-#include <psci_private.h>
 #include <runtime_svc.h>
 #include <asm_macros.S>
 #include <cm_macros.S>
+#include "psci_private.h"
 
        .globl  psci_aff_on_finish_entry
        .globl  psci_aff_suspend_finish_entry

diff --git a/services/std_svc/psci/psci_main.c b/services/std_svc/psci/psci_main.c
index c90929ddee934bf522f936529e2ae6bac30d37a2..8692adf6ba180a99c799ad81713cdc82c49a26ec 100644 (file)
--- a/services/std_svc/psci/psci_main.c
+++ b/services/std_svc/psci/psci_main.c
@@ -34,10 +34,10 @@
 #include <arch_helpers.h>
 #include <console.h>
 #include <platform.h>
-#include <psci_private.h>
 #include <runtime_svc.h>
 #include <debug.h>
 #include <context_mgmt.h>
+#include "psci_private.h"
 
 /*******************************************************************************
  * PSCI frontend api for servicing SMCs. Described in the PSCI spec.

diff --git a/services/std_svc/psci/psci_setup.c b/services/std_svc/psci/psci_setup.c
index 4525d78dff56a4047b85e6b439d38d59f7dce4b2..63258150854b6eaf94ef1ffe2b5d808e0ab08f55 100644 (file)
--- a/services/std_svc/psci/psci_setup.c
+++ b/services/std_svc/psci/psci_setup.c
@@ -34,9 +34,9 @@
 #include <arch_helpers.h>
 #include <console.h>
 #include <platform.h>
-#include <psci_private.h>
 #include <context_mgmt.h>
 #include <runtime_svc.h>
+#include "psci_private.h"
 
 /*******************************************************************************
  * Per cpu non-secure contexts used to program the architectural state prior

diff --git a/services/std_svc/std_svc_setup.c b/services/std_svc/std_svc_setup.c
index 080836ab9d167dec442d76009727137b88adff8b..7d5527aaa91889d49029f879f3fb6c4a97de394b 100644 (file)
--- a/services/std_svc/std_svc_setup.c
+++ b/services/std_svc/std_svc_setup.c
@@ -34,8 +34,8 @@
 #include <runtime_svc.h>
 #include <std_svc.h>
 #include <psci.h>
-#include <psci_private.h>
 #include <debug.h>
+#include "psci/psci_private.h"
 
 /* Standard Service UUID */
 DEFINE_SVC_UUID(arm_svc_uid,