diff options
author | Dan Handley <dan.handley@arm.com> | 2014-04-09 13:13:04 +0100 |
---|---|---|
committer | Dan Handley <dan.handley@arm.com> | 2014-05-06 12:35:02 +0100 |
commit | 35e98e5588d09145f7d0d4d98624f6b75321a187 (patch) | |
tree | eeba3b6c68401ee8199f75dacb242107406c7378 | |
parent | e8246c07142cf18db3c7f37bd1fb84dc416746f3 (diff) |
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
28 files changed, 52 insertions, 54 deletions
@@ -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 1deebc8..cb0519a 100644 --- 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 d35b50a..c04bc18 100644 --- 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 d00c1d7..b89a768 100644 --- 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 b03165b..acdcc1f 100644 --- 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 b88e34a..ec6adee 100644 --- 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 1eb76fa..3a5d220 100644 --- 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 40b8e9a..5685be1 100644 --- 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 14ec687..c8013bc 100644 --- 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 82dbbf1..5e3d132 100644 --- 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 aeb8edb..cd9c2bd 100644 --- 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 dd362f0..338141c 100644 --- 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 3c34f15..d44a71d 100644 --- 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 a60eca3..042eb81 100644 --- 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 01b995b..2024a9b 100644 --- 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 532e168..02446a3 100644 --- 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 b806543..fcc2765 100644 --- 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 27fbb5a..f9a32aa 100644 --- 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 543266e..90fa094 100644 --- 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 4ebafc7..6a07aa2 100644 --- 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 f6bd40c..0598f42 100644 --- 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 0878f21..700a4e9 100644 --- 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 fc6fe1f..ec7b89f 100644 --- 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 8b49b77..fc10ab0 100644 --- 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 bdd571e..8a73e8b 100644 --- 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 c90929d..8692adf 100644 --- 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 4525d78..6325815 100644 --- 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 080836a..7d5527a 100644 --- 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, |