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>
2017-07-11 14:54:08 +01:00 · 2017-07-11 14:54:08 +01:00 · 2a4b4b71ba
parent ca5ba394ca
commit 2a4b4b71ba
28 changed files with 36 additions and 35 deletions
--- a/bl1/aarch64/bl1_exceptions.S
+++ b/bl1/aarch64/bl1_exceptions.S
@ -6,8 +6,8 @@

 #include <arch.h>
 #include <asm_macros.S>
-#include <bl_common.h>
 #include <bl1.h>
+#include <bl_common.h>
 #include <context.h>

 /* -----------------------------------------------------------------------------
--- a/bl1/bl1_fwu.c
+++ b/bl1/bl1_fwu.c
@ -4,8 +4,8 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <assert.h>
 #include <arch_helpers.h>
+#include <assert.h>
 #include <auth_mod.h>
 #include <bl1.h>
 #include <bl_common.h>
--- a/bl1/bl1_main.c
+++ b/bl1/bl1_main.c
@ -17,8 +17,8 @@
 #include <platform_def.h>
 #include <smcc_helpers.h>
 #include <utils.h>
-#include "bl1_private.h"
 #include <uuid.h>
+#include "bl1_private.h"

 /* BL1 Service UUID */
 DEFINE_SVC_UUID(bl1_svc_uid,
--- a/bl2u/bl2u_main.c
+++ b/bl2u/bl2u_main.c
@ -8,8 +8,8 @@
 #include <arch_helpers.h>
 #include <assert.h>
 #include <auth_mod.h>
-#include <bl_common.h>
 #include <bl1.h>
+#include <bl_common.h>
 #include <console.h>
 #include <debug.h>
 #include <platform.h>
--- a/bl31/bl31_main.c
+++ b/bl31/bl31_main.c
@ -7,8 +7,8 @@
 #include <arch.h>
 #include <arch_helpers.h>
 #include <assert.h>
-#include <bl_common.h>
 #include <bl31.h>
+#include <bl_common.h>
 #include <console.h>
 #include <context_mgmt.h>
 #include <debug.h>
--- a/drivers/auth/cryptocell/cryptocell_crypto.c
+++ b/drivers/auth/cryptocell/cryptocell_crypto.c
@ -5,8 +5,8 @@
 */

 #include <arch_helpers.h>
-#include <crypto_mod.h>
 #include <crypto_driver.h>
+#include <crypto_mod.h>
 #include <debug.h>
 #include <mbedtls_common.h>
 #include <platform_def.h>
@ -16,8 +16,8 @@
 #include <secureboot_gen_defs.h>
 #include <stddef.h>
 #include <string.h>
-#include <utils.h>
 #include <util.h>
+#include <utils.h>

 #include <mbedtls/oid.h>

--- a/drivers/auth/mbedtls/mbedtls_crypto.c
+++ b/drivers/auth/mbedtls/mbedtls_crypto.c
@ -4,7 +4,6 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-
 #include <crypto_mod.h>
 #include <debug.h>
 #include <mbedtls_common.h>
--- a/drivers/auth/tbbr/tbbr_cot.c
+++ b/drivers/auth/tbbr/tbbr_cot.c
@ -6,12 +6,14 @@

 #include <auth_mod.h>
 #include <platform_def.h>
+#include <stddef.h>
+
 #if USE_TBBR_DEFS
 #include <tbbr_oid.h>
 #else
 #include <platform_oid.h>
 #endif
-#include <stddef.h>
+

 /*
 * Maximum key and hash sizes (in DER format)
--- a/drivers/partition/partition.c
+++ b/drivers/partition/partition.c
@ -6,8 +6,8 @@

 #include <assert.h>
 #include <debug.h>
-#include <io_storage.h>
 #include <gpt.h>
+#include <io_storage.h>
 #include <mbr.h>
 #include <partition.h>
 #include <platform.h>
--- a/include/drivers/arm/cryptocell/cc_pal_types_plat.h
+++ b/include/drivers/arm/cryptocell/cc_pal_types_plat.h
@ -11,8 +11,8 @@
 #define _CC_PAL_TYPES_PLAT_H
 /* Host specific types for standard (ISO-C99) compilant platforms */

-#include <stdint.h>
 #include <stddef.h>
+#include <stdint.h>

 typedef uint32_t CCStatus;

--- a/include/drivers/arm/cryptocell/nvm.h
+++ b/include/drivers/arm/cryptocell/nvm.h
@ -13,8 +13,8 @@ extern "C"
 #endif

 #include "cc_crypto_boot_defs.h"
-#include "cc_sec_defs.h"
 #include "cc_pal_types.h"
+#include "cc_sec_defs.h"

 /*------------------------------------
    DEFINES
--- a/include/drivers/auth/mbedtls/mbedtls_config.h
+++ b/include/drivers/auth/mbedtls/mbedtls_config.h
@ -69,12 +69,12 @@
 #define MBEDTLS_MPI_WINDOW_SIZE              2
 #define MBEDTLS_MPI_MAX_SIZE               256

+/* System headers required to build mbed TLS with the current configuration */
+#include <stdlib.h>
+
 /* Memory buffer allocator options */
 #define MBEDTLS_MEMORY_ALIGN_MULTIPLE        8

 #include "mbedtls/check_config.h"

-/* System headers required to build mbed TLS with the current configuration */
-#include <stdlib.h>
-
 #endif /* __MBEDTLS_CONFIG_H__ */
--- a/include/lib/pmf/pmf_helpers.h
+++ b/include/lib/pmf/pmf_helpers.h
@ -12,8 +12,8 @@
 #include <bl_common.h>
 #include <platform.h>
 #include <pmf.h>
-#include <stdint.h>
 #include <stddef.h>
+#include <stdint.h>

 /*
 * Prototype for PMF service functions.
--- a/lib/cpus/aarch64/cortex_a55.S
+++ b/lib/cpus/aarch64/cortex_a55.S
@ -4,10 +4,10 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <cortex_a55.h>
 #include <arch.h>
 #include <asm_macros.S>
 #include <bl_common.h>
+#include <cortex_a55.h>
 #include <cpu_macros.S>
 #include <plat_macros.S>

--- a/lib/psci/psci_on.c
+++ b/lib/psci/psci_on.c
@ -8,8 +8,8 @@
 #include <arch_helpers.h>
 #include <assert.h>
 #include <bl_common.h>
-#include <debug.h>
 #include <context_mgmt.h>
+#include <debug.h>
 #include <platform.h>
 #include <stddef.h>
 #include "psci_private.h"
--- a/lib/psci/psci_suspend.c
+++ b/lib/psci/psci_suspend.c
@ -4,10 +4,10 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <assert.h>
-#include <bl_common.h>
 #include <arch.h>
 #include <arch_helpers.h>
+#include <assert.h>
+#include <bl_common.h>
 #include <context.h>
 #include <context_mgmt.h>
 #include <cpu_data.h>
--- a/lib/psci/psci_system_off.c
+++ b/lib/psci/psci_system_off.c
@ -4,12 +4,12 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <stddef.h>
 #include <arch_helpers.h>
 #include <assert.h>
 #include <console.h>
 #include <debug.h>
 #include <platform.h>
+#include <stddef.h>
 #include "psci_private.h"

 void __dead2 psci_system_off(void)
--- 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
--- 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>
--- 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
--- 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>
--- a/tools/cert_create/include/ext.h
+++ b/tools/cert_create/include/ext.h
@ -7,8 +7,8 @@
 #ifndef EXT_H_
 #define EXT_H_

-#include "key.h"
 #include <openssl/x509v3.h>
+#include "key.h"

 /* Extension types supported */
 enum ext_type_e {
--- a/tools/cert_create/src/cmd_opt.c
+++ b/tools/cert_create/src/cmd_opt.c
@ -5,10 +5,10 @@
 */

 #include <assert.h>
+#include <cmd_opt.h>
 #include <getopt.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <cmd_opt.h>
 #include "debug.h"

 /* Command line options */
--- a/tools/cert_create/src/main.c
+++ b/tools/cert_create/src/main.c
@ -30,8 +30,8 @@
 #include "ext.h"
 #include "key.h"
 #include "sha.h"
-#include "tbbr/tbb_ext.h"
 #include "tbbr/tbb_cert.h"
+#include "tbbr/tbb_ext.h"
 #include "tbbr/tbb_key.h"

 /*
--- a/tools/cert_create/src/sha.c
+++ b/tools/cert_create/src/sha.c
@ -4,8 +4,8 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <stdio.h>
 #include <openssl/sha.h>
+#include <stdio.h>

 #include "debug.h"

--- a/tools/fiptool/fiptool.c
+++ b/tools/fiptool/fiptool.c
@ -19,7 +19,6 @@
 #include <unistd.h>

 #include <openssl/sha.h>
-
 #include <firmware_image_package.h>

 #include "fiptool.h"
--- a/tools/fiptool/fiptool.h
+++ b/tools/fiptool/fiptool.h
@ -7,10 +7,11 @@
 #ifndef __FIPTOOL_H__
 #define __FIPTOOL_H__

+#include <firmware_image_package.h>
+
 #include <stddef.h>
 #include <stdint.h>

-#include <firmware_image_package.h>
 #include <uuid.h>

 #define NELEM(x) (sizeof (x) / sizeof *(x))
--- a/tools/fiptool/tbbr_config.c
+++ b/tools/fiptool/tbbr_config.c
@ -4,9 +4,8 @@
 * SPDX-License-Identifier: BSD-3-Clause
 */

-#include <stddef.h>
-
 #include <firmware_image_package.h>
+#include <stddef.h>

 #include "tbbr_config.h"