summaryrefslogtreecommitdiff
path: root/tools/fiptool
diff options
context:
space:
mode:
authorIsla Mitchell <isla.mitchell@arm.com>2017-07-11 14:54:08 +0100
committerIsla Mitchell <isla.mitchell@arm.com>2017-07-12 14:45:31 +0100
commit2a4b4b71ba8a14148708719077d80889faa6f47b (patch)
treea6c11e34542ef63da6276bacc68590e765fdeaae /tools/fiptool
parentca5ba394cab0c4e7c5621a50a7bd270cb64cec97 (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 'tools/fiptool')
-rw-r--r--tools/fiptool/fiptool.c1
-rw-r--r--tools/fiptool/fiptool.h3
-rw-r--r--tools/fiptool/tbbr_config.c3
3 files changed, 3 insertions, 4 deletions
diff --git a/tools/fiptool/fiptool.c b/tools/fiptool/fiptool.c
index 4d80f2f1..65e4a25c 100644
--- 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"
diff --git a/tools/fiptool/fiptool.h b/tools/fiptool/fiptool.h
index 4b5cdd91..889b0fde 100644
--- 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))
diff --git a/tools/fiptool/tbbr_config.c b/tools/fiptool/tbbr_config.c
index 7c6c24be..6231cd4e 100644
--- 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"