Merge branch 'master' of git://git.denx.de/u-boot-net

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

diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 24d0c34..1fc919b 100644 (file)
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -11,15 +11,8 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_PCI
-#define CONFIG_CMD_NET
-#define CONFIG_CMD_PING
 #define CONFIG_CMD_IDE
-#define CONFIG_CMD_EXT2
 #define CONFIG_DOS_PARTITION
 #define CONFIG_CMD_SH_ZIMAGEBOOT
 
@@ -29,7 +22,6 @@
 #define CONFIG_CONS_SCIF1      1
 #define CONFIG_BOARD_LATE_INIT
 
-#define CONFIG_BOOTDELAY       -1
 #define CONFIG_BOOTARGS                "console=ttySC0,115200"
 #define CONFIG_ENV_OVERWRITE   1
 
@@ -114,9 +106,4 @@
 #define CONFIG_PCI_SYS_PHYS    (CONFIG_SYS_SDRAM_BASE & 0x1fffffff)
 #define CONFIG_PCI_SYS_SIZE    CONFIG_SYS_SDRAM_SIZE
 
-/*
- * Network device (RTL8139) support
- */
-#define CONFIG_RTL8139
-
 #endif /* __CONFIG_H */