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

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}

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

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

bl31/aarch64/runtime_exceptions.S

@@ -32,8 +32,8 @@
 #include <runtime_svc.h>
 #include <platform.h>
 #include <context.h>
-#include "asm_macros.S"
+#include <asm_macros.S>
-#include "cm_macros.S"
+#include <cm_macros.S>
 
 	.globl	runtime_exceptions
 	.globl	el3_exit

common/bl_common.c

@@ -37,8 +37,8 @@
 #include <platform.h>
 #include <semihosting.h>
 #include <bl_common.h>
-#include "io_storage.h"
+#include <io_storage.h>
-#include "debug.h"
+#include <debug.h>
 
 unsigned long page_align(unsigned long value, unsigned dir)
 {

drivers/arm/tzc400/tzc400.c

@@ -29,10 +29,10 @@
  */
 
 #include <assert.h>
-#include "arch_helpers.h"
+#include <arch_helpers.h>
-#include "tzc400.h"
+#include <tzc400.h>
-#include "mmio.h"
+#include <mmio.h>
-#include "debug.h"
+#include <debug.h>
 
 static uint32_t tzc_read_build_config(uint64_t base)
 {

drivers/io/io_fip.c

@@ -33,12 +33,12 @@
 #include <errno.h>
 #include <string.h>
 #include <assert.h>
-#include "platform.h"
+#include <platform.h>
-#include "firmware_image_package.h"
+#include <firmware_image_package.h>
-#include "io_storage.h"
+#include <io_storage.h>
-#include "io_driver.h"
+#include <io_driver.h>
-#include "io_fip.h"
+#include <io_fip.h>
-#include "debug.h"
+#include <debug.h>
 
 /* Useful for printing UUIDs when debugging.*/
 #define PRINT_UUID2(x)								\

drivers/io/io_memmap.c

@@ -30,9 +30,9 @@
 
 #include <assert.h>
 #include <string.h>
-#include "io_storage.h"
+#include <io_storage.h>
-#include "io_driver.h"
+#include <io_driver.h>
-#include "debug.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

drivers/io/io_semihosting.c

@@ -29,9 +29,9 @@
  */
 
 #include <assert.h>
-#include "io_storage.h"
+#include <io_storage.h>
-#include "io_driver.h"
+#include <io_driver.h>
-#include "semihosting.h"
+#include <semihosting.h>
 
 
 

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

lib/io_storage.c

@@ -31,8 +31,8 @@
 
 #include <stddef.h>
 #include <assert.h>
-#include "io_storage.h"
+#include <io_storage.h>
-#include "io_driver.h"
+#include <io_driver.h>
 
 
 #define MAX_DEVICES(plat_data)						\

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>
 

plat/fvp/plat_io_storage.c

@@ -30,14 +30,14 @@
 
 #include <assert.h>
 #include <string.h>
-#include "platform.h"
+#include <platform.h>
-#include "io_storage.h"
+#include <io_storage.h>
-#include "io_driver.h"
+#include <io_driver.h>
-#include "io_semihosting.h"
+#include <io_semihosting.h>
-#include "semihosting.h"	/* For FOPEN_MODE_... */
+#include <semihosting.h>	/* For FOPEN_MODE_... */
-#include "io_fip.h"
+#include <io_fip.h>
-#include "io_memmap.h"
+#include <io_memmap.h>
-#include "debug.h"
+#include <debug.h>
 
 /* IO devices */
 static struct io_plat_data io_data;

plat/fvp/plat_security.c

@@ -29,9 +29,9 @@
  */
 
 #include <assert.h>
-#include "platform.h"
+#include <platform.h>
-#include "tzc400.h"
+#include <tzc400.h>
-#include "debug.h"
+#include <debug.h>
 
 /* Used to improve readability for configuring regions. */
 #define FILTER_SHIFT(filter)	(1 << filter)

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>
 
 
 /*******************************************************************************

services/spd/tspd/tspd.mk

@@ -29,8 +29,7 @@
 #
 
 TSPD_DIR		:=	services/spd/tspd
-SPD_INCLUDES		:=	-Iinclude/bl32/payloads	\
+SPD_INCLUDES		:=	-Iinclude/bl32/payloads
-				-I${TSPD_DIR}
 
 SPD_SOURCES		:=	tspd_common.c		\
 				tspd_main.c		\

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

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
 	/* ---------------------------------------------

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

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

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 *);
 

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 *,

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 *,

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

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

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.

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

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,