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
This commit is contained in:
Dan Handley 2014-04-09 13:13:04 +01:00
parent e8246c0714
commit 35e98e5588
28 changed files with 52 additions and 54 deletions

View File

@ -145,7 +145,6 @@ INCLUDES += -Iinclude/bl1 \
-Iinclude/lib/aarch64 \ -Iinclude/lib/aarch64 \
-Iinclude/stdlib \ -Iinclude/stdlib \
-Iinclude/stdlib/sys \ -Iinclude/stdlib/sys \
-Iservices/std_svc/psci \
-Iplat/${PLAT} \ -Iplat/${PLAT} \
${PLAT_INCLUDES} \ ${PLAT_INCLUDES} \
${SPD_INCLUDES} ${SPD_INCLUDES}

View File

@ -37,7 +37,7 @@
#include <semihosting.h> #include <semihosting.h>
#include <bl_common.h> #include <bl_common.h>
#include <bl2.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 * The only thing to do in BL2 is to load further images and pass control to

View File

@ -31,8 +31,8 @@
#include <bl_common.h> #include <bl_common.h>
#include <platform.h> #include <platform.h>
#include <arch.h> #include <arch.h>
#include "cm_macros.S"
#include <asm_macros.S> #include <asm_macros.S>
#include <cm_macros.S>
.globl bl31_entrypoint .globl bl31_entrypoint

View File

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

View File

@ -37,8 +37,8 @@
#include <platform.h> #include <platform.h>
#include <semihosting.h> #include <semihosting.h>
#include <bl_common.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) unsigned long page_align(unsigned long value, unsigned dir)
{ {

View File

@ -29,10 +29,10 @@
*/ */
#include <assert.h> #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) static uint32_t tzc_read_build_config(uint64_t base)
{ {

View File

@ -33,12 +33,12 @@
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <assert.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.*/ /* Useful for printing UUIDs when debugging.*/
#define PRINT_UUID2(x) \ #define PRINT_UUID2(x) \

View File

@ -30,9 +30,9 @@
#include <assert.h> #include <assert.h>
#include <string.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 /* 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 * at a time. Make this a structure and point to the entity->info. When we

View File

@ -29,9 +29,9 @@
*/ */
#include <assert.h> #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>

View File

@ -31,7 +31,7 @@
#ifndef __IO_DRIVER_H__ #ifndef __IO_DRIVER_H__
#define __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 /* Generic IO entity structure,representing an accessible IO construct on the

View File

@ -31,8 +31,8 @@
#include <stddef.h> #include <stddef.h>
#include <assert.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) \ #define MAX_DEVICES(plat_data) \

View File

@ -30,7 +30,7 @@
#include <assert.h> #include <assert.h>
#include <arch_helpers.h> #include <arch_helpers.h>
#include "debug.h" #include <debug.h>
#include <platform.h> #include <platform.h>
#include <xlat_tables.h> #include <xlat_tables.h>

View File

@ -30,14 +30,14 @@
#include <assert.h> #include <assert.h>
#include <string.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 */ /* IO devices */
static struct io_plat_data io_data; static struct io_plat_data io_data;

View File

@ -29,9 +29,9 @@
*/ */
#include <assert.h> #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. */ /* Used to improve readability for configuring regions. */
#define FILTER_SHIFT(filter) (1 << filter) #define FILTER_SHIFT(filter) (1 << filter)

View File

@ -35,7 +35,7 @@
#include <mmio.h> #include <mmio.h>
#include <psci.h> #include <psci.h>
#include <bl_common.h> #include <bl_common.h>
#include "io_storage.h" #include <io_storage.h>
/******************************************************************************* /*******************************************************************************

View File

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

View File

@ -37,7 +37,7 @@
#include <bl_common.h> #include <bl_common.h>
#include <runtime_svc.h> #include <runtime_svc.h>
#include <context_mgmt.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 * Given a secure payload entrypoint, register width, cpu id & pointer to a

View File

@ -29,9 +29,9 @@
*/ */
#include <context.h> #include <context.h>
#include <tspd_private.h>
#include <asm_macros.S> #include <asm_macros.S>
#include <cm_macros.S> #include <cm_macros.S>
#include "tspd_private.h"
.global tspd_enter_sp .global tspd_enter_sp
/* --------------------------------------------- /* ---------------------------------------------

View File

@ -49,9 +49,9 @@
#include <bl31.h> #include <bl31.h>
#include <tsp.h> #include <tsp.h>
#include <psci.h> #include <psci.h>
#include <tspd_private.h>
#include <debug.h> #include <debug.h>
#include <uuid.h> #include <uuid.h>
#include "tspd_private.h"
/******************************************************************************* /*******************************************************************************
* Single structure to hold information about the various entry points into the * Single structure to hold information about the various entry points into the

View File

@ -39,8 +39,8 @@
#include <bl31.h> #include <bl31.h>
#include <bl32.h> #include <bl32.h>
#include <psci.h> #include <psci.h>
#include <tspd_private.h>
#include <debug.h> #include <debug.h>
#include "tspd_private.h"
/******************************************************************************* /*******************************************************************************
* The target cpu is being turned on. Allow the TSPD/TSP to perform any actions * The target cpu is being turned on. Allow the TSPD/TSP to perform any actions

View File

@ -36,7 +36,7 @@
#include <console.h> #include <console.h>
#include <platform.h> #include <platform.h>
#include <psci.h> #include <psci.h>
#include <psci_private.h> #include "psci_private.h"
typedef int (*afflvl_off_handler)(unsigned long, aff_map_node *); typedef int (*afflvl_off_handler)(unsigned long, aff_map_node *);

View File

@ -36,8 +36,8 @@
#include <console.h> #include <console.h>
#include <platform.h> #include <platform.h>
#include <psci.h> #include <psci.h>
#include <psci_private.h>
#include <context_mgmt.h> #include <context_mgmt.h>
#include "psci_private.h"
typedef int (*afflvl_on_handler)(unsigned long, typedef int (*afflvl_on_handler)(unsigned long,
aff_map_node *, aff_map_node *,

View File

@ -36,8 +36,8 @@
#include <console.h> #include <console.h>
#include <platform.h> #include <platform.h>
#include <psci.h> #include <psci.h>
#include <psci_private.h>
#include <context_mgmt.h> #include <context_mgmt.h>
#include "psci_private.h"
typedef int (*afflvl_suspend_handler)(unsigned long, typedef int (*afflvl_suspend_handler)(unsigned long,
aff_map_node *, aff_map_node *,

View File

@ -35,10 +35,10 @@
#include <console.h> #include <console.h>
#include <platform.h> #include <platform.h>
#include <psci.h> #include <psci.h>
#include <psci_private.h>
#include <context_mgmt.h> #include <context_mgmt.h>
#include <runtime_svc.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 * SPD power management operations, expected to be supplied by the registered

View File

@ -31,10 +31,10 @@
#include <arch.h> #include <arch.h>
#include <platform.h> #include <platform.h>
#include <psci.h> #include <psci.h>
#include <psci_private.h>
#include <runtime_svc.h> #include <runtime_svc.h>
#include <asm_macros.S> #include <asm_macros.S>
#include <cm_macros.S> #include <cm_macros.S>
#include "psci_private.h"
.globl psci_aff_on_finish_entry .globl psci_aff_on_finish_entry
.globl psci_aff_suspend_finish_entry .globl psci_aff_suspend_finish_entry

View File

@ -34,10 +34,10 @@
#include <arch_helpers.h> #include <arch_helpers.h>
#include <console.h> #include <console.h>
#include <platform.h> #include <platform.h>
#include <psci_private.h>
#include <runtime_svc.h> #include <runtime_svc.h>
#include <debug.h> #include <debug.h>
#include <context_mgmt.h> #include <context_mgmt.h>
#include "psci_private.h"
/******************************************************************************* /*******************************************************************************
* PSCI frontend api for servicing SMCs. Described in the PSCI spec. * PSCI frontend api for servicing SMCs. Described in the PSCI spec.

View File

@ -34,9 +34,9 @@
#include <arch_helpers.h> #include <arch_helpers.h>
#include <console.h> #include <console.h>
#include <platform.h> #include <platform.h>
#include <psci_private.h>
#include <context_mgmt.h> #include <context_mgmt.h>
#include <runtime_svc.h> #include <runtime_svc.h>
#include "psci_private.h"
/******************************************************************************* /*******************************************************************************
* Per cpu non-secure contexts used to program the architectural state prior * Per cpu non-secure contexts used to program the architectural state prior

View File

@ -34,8 +34,8 @@
#include <runtime_svc.h> #include <runtime_svc.h>
#include <std_svc.h> #include <std_svc.h>
#include <psci.h> #include <psci.h>
#include <psci_private.h>
#include <debug.h> #include <debug.h>
#include "psci/psci_private.h"
/* Standard Service UUID */ /* Standard Service UUID */
DEFINE_SVC_UUID(arm_svc_uid, DEFINE_SVC_UUID(arm_svc_uid,