Convert CONFIG_SYS_DV_CLKMODE et al to Kconfig

[people/ms/u-boot.git] / include / configs / xilinx_zynqmp.h

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 57fee6a4c8a562dc3c071614d39a4877f8471061..9997fd095982fed4a58d7b25870e5b8c081c20ab 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -126,6 +126,7 @@
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CMDLINE_EDITING
+#define CONFIG_PANIC_HANG
 #define CONFIG_SYS_MAXARGS             64
 
 /* Ethernet driver */
@@ -233,6 +234,15 @@
 
 #define CONFIG_SPL_FRAMEWORK
 
+#if defined(CONFIG_SPL_SPI_FLASH_SUPPORT)
+# define CONFIG_SPL_SPI_LOAD
+# define CONFIG_SYS_SPI_KERNEL_OFFS    0x80000
+# define CONFIG_SYS_SPI_ARGS_OFFS      0xa0000
+# define CONFIG_SYS_SPI_ARGS_SIZE      0xa0000
+
+# define CONFIG_SYS_SPI_U_BOOT_OFFS    0x170000
+#endif
+
 /* u-boot is like dtb */
 #define CONFIG_SPL_FS_LOAD_ARGS_NAME   "u-boot.bin"
 #define CONFIG_SYS_SPL_ARGS_ADDR       0x8000000
@@ -257,14 +267,14 @@
 # define CONFIG_SPL_ENV_SUPPORT
 # define CONFIG_SPL_HASH_SUPPORT
 # define CONFIG_ENV_MAX_ENTRIES        10
+#endif
 
-# define CONFIG_SYS_SPL_MALLOC_START   0x20000000
-# define CONFIG_SYS_SPL_MALLOC_SIZE    0x100000
+#define CONFIG_SYS_SPL_MALLOC_START    0x20000000
+#define CONFIG_SYS_SPL_MALLOC_SIZE     0x100000
 
 #ifdef CONFIG_SPL_SYS_MALLOC_SIMPLE
 # error "Disable CONFIG_SPL_SYS_MALLOC_SIMPLE. Full malloc needs to be used"
 #endif
-#endif
 
 #define CONFIG_BOARD_EARLY_INIT_F