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 9c846e239c1d033daa2e6e9ff589066272316808..9b5f2a19ab8e0e813bfcc6b77d28e2e94de3278e 100644 (file)
--- 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 */