X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Fmicroblaze-generic.h;h=090ab3bc2eb0170629b37acaafe67ef05a2aab66;hb=7b89795f17c990263a17ecf25e447df16e379748;hp=9301a6beec068d40330e1d839d795109e894cf71;hpb=4aecfb1602729b40bf7b49866e9614e6b4f70c2d;p=u-boot

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 9301a6beec..090ab3bc2e 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -57,7 +57,7 @@
 #endif
 
 /* setting reset address */
-/*#define	CONFIG_SYS_RESET_ADDRESS	TEXT_BASE*/
+/*#define	CONFIG_SYS_RESET_ADDRESS	CONFIG_SYS_TEXT_BASE*/
 
 /* ethernet */
 #ifdef XILINX_EMACLITE_BASEADDR
@@ -103,7 +103,7 @@
 
 /*
  * memory layout - Example
- * TEXT_BASE = 0x1200_0000;
+ * CONFIG_SYS_TEXT_BASE = 0x1200_0000;
  * CONFIG_SYS_SRAM_BASE = 0x1000_0000;
  * CONFIG_SYS_SRAM_SIZE = 0x0400_0000;
  *
@@ -113,7 +113,7 @@
  *
  * 0x1000_0000	CONFIG_SYS_SDRAM_BASE
  *					FREE
- * 0x1200_0000	TEXT_BASE
+ * 0x1200_0000	CONFIG_SYS_TEXT_BASE
  *		U-BOOT code
  * 0x1202_0000
  *					FREE
@@ -135,17 +135,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,9 +242,11 @@
 
 #ifndef CONFIG_SYS_ENET
 # undef CONFIG_CMD_NET
+# undef CONFIG_NET_MULTI
 #else
 # define CONFIG_CMD_PING
 # define CONFIG_CMD_DHCP
+# define CONFIG_NET_MULTI
 #endif
 
 #if defined(CONFIG_SYSTEMACE)