From: Michal Simek <michal.simek@xilinx.com>
Date: Thu, 30 Jul 2015 05:51:36 +0000 (+0200)
Subject: zynqmp: Sync config with mainline
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b542a37fca346e9611cc41da9a44328e71e9f7bd;p=thirdparty%2Fu-boot.git

zynqmp: Sync config with mainline

Move one part of configuration below driver config.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 9c846e239c1..9b5f2a19ab8 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -221,17 +221,6 @@
 # define CONFIG_SYS_EEPROM_SIZE			(64 * 1024)
 #endif
 
-#define CONFIG_FIT
-#define CONFIG_FIT_VERBOSE       /* enable fit_format_{error,warning}() */
-
-#define CONFIG_SYS_BOOTM_LEN	(60 * 1024 * 1024)
-
-#define CONFIG_CMD_BOOTI
-#define CONFIG_CMD_UNZIP
-
-#define CONFIG_BOARD_EARLY_INIT_R
-#define CONFIG_CLOCKS
-
 #ifdef CONFIG_AHCI
 #define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI
@@ -243,4 +232,15 @@
 #define CONFIG_CMD_SCSI
 #endif
 
+#define CONFIG_FIT
+#define CONFIG_FIT_VERBOSE       /* enable fit_format_{error,warning}() */
+
+#define CONFIG_SYS_BOOTM_LEN	(60 * 1024 * 1024)
+
+#define CONFIG_CMD_BOOTI
+#define CONFIG_CMD_UNZIP
+
+#define CONFIG_BOARD_EARLY_INIT_R
+#define CONFIG_CLOCKS
+
 #endif /* __XILINX_ZYNQMP_H */