board configs: drop NET_MULTI references

[J-u-boot.git] / include / configs / r2dplus.h

diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 955f3ff57fed8d46af1f9cdc74f6b343b9a7b482..a7a92f798cf3377dc77113333a76dce844e43242 100644 (file)
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -24,6 +24,7 @@
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_EXT2
 #define CONFIG_DOS_PARTITION
+#define CONFIG_CMD_SH_ZIMAGEBOOT
 
 /* SCIF */
 #define CONFIG_SCIF_CONSOLE    1
@@ -39,6 +40,7 @@
 #define CONFIG_SYS_SDRAM_BASE          (0x8C000000)
 #define CONFIG_SYS_SDRAM_SIZE          (0x04000000)
 
+#define CONFIG_SYS_TEXT_BASE   0x0FFC0000
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_PROMPT              "=> "
 #define CONFIG_SYS_CBSIZE              256
@@ -49,7 +51,7 @@
 #define CONFIG_SYS_BAUDRATE_TABLE      { 115200, 57600, 38400, 19200, 9600 }
 
 #define CONFIG_SYS_MEMTEST_START       (CONFIG_SYS_SDRAM_BASE)
-#define CONFIG_SYS_MEMTEST_END         (TEXT_BASE - 0x100000)
+#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_TEXT_BASE - 0x100000)
 
 #define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 32 * 1024 * 1024)
 /* Address of u-boot image in Flash */
@@ -57,8 +59,6 @@
 #define CONFIG_SYS_MONITOR_LEN         (256 * 1024)
 /* Size of DRAM reserved for malloc() use */
 #define CONFIG_SYS_MALLOC_LEN          (1024 * 1024)
-/* size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_SIZE       (256)
 #define CONFIG_SYS_BOOTMAPSZ           (8 * 1024 * 1024)
 
 /*
@@ -122,7 +122,6 @@
 /*
  * Network device (RTL8139) support
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_RTL8139
 
 #endif /* __CONFIG_H */