arm: socfpga: cyclone5_socdk: Enable qspiload console command

[oweals/u-boot.git] / include / configs / microblaze-generic.h

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 06f6ed1fc0c2aa3f9d996e153d791a6b72a76fa6..f93861d770ee3effe181ae050cea09ec0775c686 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -68,10 +68,6 @@
 # define CONFIG_XILINX_EMACLITE        1
 # define CONFIG_SYS_ENET
 #endif
-#if defined(XILINX_LLTEMAC_BASEADDR)
-# define CONFIG_XILINX_LL_TEMAC        1
-# define CONFIG_SYS_ENET
-#endif
 #if defined(XILINX_AXIEMAC_BASEADDR)
 # define CONFIG_XILINX_AXIEMAC 1
 # define CONFIG_SYS_ENET
@@ -101,8 +97,10 @@
 #if defined(XILINX_WATCHDOG_BASEADDR) && defined(XILINX_WATCHDOG_IRQ)
 # define CONFIG_WATCHDOG_BASEADDR      XILINX_WATCHDOG_BASEADDR
 # define CONFIG_WATCHDOG_IRQ           XILINX_WATCHDOG_IRQ
-# define CONFIG_HW_WATCHDOG
-# define CONFIG_XILINX_TB_WATCHDOG
+# ifndef CONFIG_SPL_BUILD
+#  define CONFIG_HW_WATCHDOG
+#  define CONFIG_XILINX_TB_WATCHDOG
+# endif
 #endif
 
 #if !defined(CONFIG_OF_CONTROL) || \
@@ -113,15 +111,10 @@
 #endif
 
 #define CONFIG_SYS_MALLOC_LEN  0xC0000
-#ifndef CONFIG_SPL_BUILD
-# define CONFIG_SYS_MALLOC_F_LEN       1024
-#else
-# define CONFIG_SYS_MALLOC_SIMPLE
-# define CONFIG_SYS_MALLOC_F_LEN       0x150
-#endif
 
 /* Stack location before relocation */
-#define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_TEXT_BASE - \
+                                        CONFIG_SYS_MALLOC_F_LEN)
 
 /*
  * CFI flash memory layout - Example
@@ -360,7 +353,7 @@
 #define CONFIG_FIT             1
 #define CONFIG_OF_LIBFDT       1
 
-#if defined(CONFIG_XILINX_LL_TEMAC) || defined(CONFIG_XILINX_AXIEMAC)
+#if defined(CONFIG_XILINX_AXIEMAC)
 # define CONFIG_MII            1
 # define CONFIG_CMD_MII                1
 # define CONFIG_PHY_GIGE       1