From a99c0fd10c708ccb905c4ccd838f19601f2228aa Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Sun, 16 Jan 2022 14:05:50 -0700
Subject: [PATCH] spl: Tidy up the header includes

These are out of order. Fix them.

Signed-off-by: Simon Glass <sjg@chromium.org>
Change-Id: Ie563607416a8f7504c69b46ce608c1c1df75caa6
---
 common/spl/spl.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 6b75910e243..75902c8e3d5 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -6,42 +6,41 @@
  * Aneesh V <aneesh@ti.com>
  */
 
-#include <config.h>
-#include <bloblist.h>
 #include <binman_sym.h>
+#include <bloblist.h>
+#include <bootcount.h>
 #include <bootstage.h>
 #include <dm.h>
+#include <fat.h>
+#include <fdt_support.h>
 #include <handoff.h>
 #include <hang.h>
+#include <image.h>
 #include <init.h>
 #include <irq_func.h>
 #include <log.h>
+#include <malloc.h>
 #include <mapmem.h>
+#include <nand.h>
 #include <serial.h>
 #include <spl.h>
 #include <spl_load.h>
 #include <system-constants.h>
-#include <asm/global_data.h>
-#include <asm-generic/gpio.h>
-#include <nand.h>
-#include <fat.h>
-#include <u-boot/crc.h>
 #if CONFIG_IS_ENABLED(BANNER_PRINT)
 #include <timestamp.h>
 #endif
 #include <version.h>
-#include <image.h>
-#include <malloc.h>
-#include <mapmem.h>
+#include <video.h>
+#include <wdt.h>
+#include <asm-generic/gpio.h>
+#include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <dm/root.h>
 #include <dm/util.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/compiler.h>
-#include <fdt_support.h>
-#include <bootcount.h>
-#include <wdt.h>
-#include <video.h>
+#include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 DECLARE_BINMAN_MAGIC_SYM;