diff options
| author | Isla Mitchell <isla.mitchell@arm.com> | 2017-07-11 14:54:08 +0100 |
|---|---|---|
| committer | Isla Mitchell <isla.mitchell@arm.com> | 2017-07-12 14:45:31 +0100 |
| commit | 2a4b4b71ba8a14148708719077d80889faa6f47b (patch) | |
| tree | a6c11e34542ef63da6276bacc68590e765fdeaae /services | |
| parent | ca5ba394cab0c4e7c5621a50a7bd270cb64cec97 (diff) | |
Fix order of #includes
This fix modifies the order of system includes to meet the ARM TF coding
standard. There are some exceptions in order to retain header groupings,
minimise changes to imported headers, and where there are headers within
the #if and #ifndef statements.
Change-Id: I65085a142ba6a83792b26efb47df1329153f1624
Signed-off-by: Isla Mitchell <isla.mitchell@arm.com>
Diffstat (limited to 'services')
| -rw-r--r-- | services/spd/opteed/opteed_main.c | 5 | ||||
| -rw-r--r-- | services/spd/tlkd/tlkd_main.c | 2 | ||||
| -rw-r--r-- | services/spd/trusty/trusty.c | 4 | ||||
| -rw-r--r-- | services/spd/tspd/tspd_main.c | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/services/spd/opteed/opteed_main.c b/services/spd/opteed/opteed_main.c index 418e4820..e2a20352 100644 --- a/services/spd/opteed/opteed_main.c +++ b/services/spd/opteed/opteed_main.c @@ -16,8 +16,8 @@ ******************************************************************************/ #include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> #include <bl31.h> +#include <bl_common.h> #include <context_mgmt.h> #include <debug.h> #include <errno.h> @@ -26,8 +26,9 @@ #include <stddef.h> #include <uuid.h> #include "opteed_private.h" -#include "teesmc_opteed_macros.h" #include "teesmc_opteed.h" +#include "teesmc_opteed_macros.h" + /******************************************************************************* * Address of the entrypoint vector table in OPTEE. It is diff --git a/services/spd/tlkd/tlkd_main.c b/services/spd/tlkd/tlkd_main.c index 948be5df..78e98535 100644 --- a/services/spd/tlkd/tlkd_main.c +++ b/services/spd/tlkd/tlkd_main.c @@ -15,8 +15,8 @@ ******************************************************************************/ #include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> #include <bl31.h> +#include <bl_common.h> #include <context_mgmt.h> #include <debug.h> #include <errno.h> diff --git a/services/spd/trusty/trusty.c b/services/spd/trusty/trusty.c index a95141bf..e386f71c 100644 --- a/services/spd/trusty/trusty.c +++ b/services/spd/trusty/trusty.c @@ -6,8 +6,8 @@ #include <arch_helpers.h> #include <assert.h> /* for context_mgmt.h */ -#include <bl_common.h> #include <bl31.h> +#include <bl_common.h> #include <context_mgmt.h> #include <debug.h> #include <interrupt_mgmt.h> @@ -15,8 +15,8 @@ #include <runtime_svc.h> #include <string.h> -#include "smcall.h" #include "sm_err.h" +#include "smcall.h" /* macro to check if Hypervisor is enabled in the HCR_EL2 register */ #define HYP_ENABLE_FLAG 0x286001 diff --git a/services/spd/tspd/tspd_main.c b/services/spd/tspd/tspd_main.c index afa7e2ae..2ba9f84c 100644 --- a/services/spd/tspd/tspd_main.c +++ b/services/spd/tspd/tspd_main.c @@ -16,8 +16,8 @@ ******************************************************************************/ #include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> #include <bl31.h> +#include <bl_common.h> #include <context_mgmt.h> #include <debug.h> #include <errno.h> |