From 769fb6b6fefde9a9737e2548522492c99cfdfeac Mon Sep 17 00:00:00 2001
From: Isla Mitchell <isla.mitchell@arm.com>
Date: Fri, 14 Jul 2017 10:46:32 +0100
Subject: Fix order of #includes

This fix modifies the order of system includes to meet the ARM TF coding
standard whilst retaining header groupings.

Change-Id: Ib91968f8e2cac9e96033d73d3ad9d0a2ae228b13
Signed-off-by: Isla Mitchell <isla.mitchell@arm.com>
---
 tools/fiptool/fiptool.c     | 1 +
 tools/fiptool/fiptool.h     | 3 +--
 tools/fiptool/tbbr_config.c | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/fiptool/fiptool.c b/tools/fiptool/fiptool.c
index 65e4a25c..4d80f2f1 100644
--- a/tools/fiptool/fiptool.c
+++ b/tools/fiptool/fiptool.c
@@ -19,6 +19,7 @@
 #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 889b0fde..4b5cdd91 100644
--- a/tools/fiptool/fiptool.h
+++ b/tools/fiptool/fiptool.h
@@ -7,11 +7,10 @@
 #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 6231cd4e..7c6c24be 100644
--- a/tools/fiptool/tbbr_config.c
+++ b/tools/fiptool/tbbr_config.c
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <firmware_image_package.h>
 #include <stddef.h>
 
+#include <firmware_image_package.h>
+
 #include "tbbr_config.h"
 
 /* The images used depends on the platform. */
-- 
cgit v1.2.3