hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c

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

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index bcdd86e..295d123 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -41,10 +41,14 @@
 #elif XILINX_UART16550_BASEADDR
 # define CONFIG_SYS_NS16550            1
 # define CONFIG_SYS_NS16550_SERIAL
-# define CONFIG_SYS_NS16550_REG_SIZE   -4
+# if defined(__MICROBLAZEEL__)
+#  define CONFIG_SYS_NS16550_REG_SIZE  -4
+# else
+#  define CONFIG_SYS_NS16550_REG_SIZE  4
+# endif
 # define CONFIG_CONS_INDEX             1
 # define CONFIG_SYS_NS16550_COM1 \
-                       (XILINX_UART16550_BASEADDR + 0x1000 + 0x3)
+               ((XILINX_UART16550_BASEADDR & ~0xF) + 0x1000)
 # define CONFIG_SYS_NS16550_CLK        XILINX_UART16550_CLOCK_HZ
 # define CONFIG_BAUDRATE       115200
 
@@ -60,11 +64,17 @@
 /*#define      CONFIG_SYS_RESET_ADDRESS        CONFIG_SYS_TEXT_BASE*/
 
 /* ethernet */
-#ifdef XILINX_EMACLITE_BASEADDR
-# define CONFIG_XILINX_EMACLITE                1
+#undef CONFIG_SYS_ENET
+#if defined(XILINX_EMACLITE_BASEADDR)
+# 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
-#elif XILINX_LLTEMAC_BASEADDR
-# define CONFIG_XILINX_LL_TEMAC                1
+#endif
+#if defined(XILINX_AXIEMAC_BASEADDR)
+# define CONFIG_XILINX_AXIEMAC 1
 # define CONFIG_SYS_ENET
 #endif
 
@@ -135,17 +145,16 @@
 #define        CONFIG_SYS_MEMTEST_END          (CONFIG_SYS_SDRAM_BASE + 0x1000)
 
 /* global pointer */
-#define        CONFIG_SYS_GBL_DATA_SIZE        128 /* size of global data */
 /* start of global data */
 #define        CONFIG_SYS_GBL_DATA_OFFSET \
-       (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_SDRAM_SIZE \
-                               - CONFIG_SYS_GBL_DATA_SIZE)
+               (CONFIG_SYS_SDRAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
 /* monitor code */
 #define        SIZE                            0x40000
-#define        CONFIG_SYS_MONITOR_LEN          (SIZE - CONFIG_SYS_GBL_DATA_SIZE)
+#define        CONFIG_SYS_MONITOR_LEN          SIZE
 #define        CONFIG_SYS_MONITOR_BASE \
-                       (CONFIG_SYS_GBL_DATA_OFFSET - CONFIG_SYS_MONITOR_LEN)
+               (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_GBL_DATA_OFFSET \
+                       - CONFIG_SYS_MONITOR_LEN - GENERATED_BD_INFO_SIZE)
 #define        CONFIG_SYS_MONITOR_END \
                        (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
 #define        CONFIG_SYS_MALLOC_LEN           SIZE
@@ -243,11 +252,11 @@
 
 #ifndef CONFIG_SYS_ENET
 # undef CONFIG_CMD_NET
-# undef CONFIG_NET_MULTI
+# undef CONFIG_CMD_NFS
 #else
 # define CONFIG_CMD_PING
 # define CONFIG_CMD_DHCP
-# define CONFIG_NET_MULTI
+# define CONFIG_CMD_TFTPPUT
 #endif
 
 #if defined(CONFIG_SYSTEMACE)
@@ -322,8 +331,31 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-# define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
+
+/* Enable flat device tree support */
+#define CONFIG_LMB             1
+#define CONFIG_FIT             1
+#define CONFIG_OF_LIBFDT       1
+
+#if defined(CONFIG_XILINX_LL_TEMAC) || defined(CONFIG_XILINX_AXIEMAC)
+# define CONFIG_MII            1
+# define CONFIG_CMD_MII                1
+# define CONFIG_PHY_GIGE       1
+# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN       1
+# define CONFIG_PHYLIB         1
+# define CONFIG_PHY_ATHEROS    1
+# define CONFIG_PHY_BROADCOM   1
+# define CONFIG_PHY_DAVICOM    1
+# define CONFIG_PHY_LXT                1
+# define CONFIG_PHY_MARVELL    1
+# define CONFIG_PHY_MICREL     1
+# define CONFIG_PHY_NATSEMI    1
+# define CONFIG_PHY_REALTEK    1
+# define CONFIG_PHY_VITESSE    1
+#else
+# undef CONFIG_MII
+# undef CONFIG_CMD_MII
+# undef CONFIG_PHYLIB
 #endif
 
 #endif /* __CONFIG_H */