Merge branch 'marek.vasut@gmail.com' of git://git.denx.de/u-boot-staging

[u-boot] / include / configs / qemu-mips.h

diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index cbacdf98cb9dc1a1cbb4f06ffd2258f9c64ed280..f5a137e01ddbed54dc2d675171f17ab42d7572bd 100644 (file)
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -136,7 +136,7 @@
  */
 
 /* The following #defines are needed to get flash environment right */
-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MONITOR_LEN         (192 << 10)
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x400000
@@ -157,8 +157,6 @@
 
 #define CONFIG_ENV_OVERWRITE   1
 
-#undef CONFIG_NET_MULTI
-
 #define MEM_SIZE               128
 
 #undef CONFIG_MEMSIZE_IN_BYTES