Merge git://git.denx.de/u-boot-mmc

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

diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 2d1e56aeb8d4d75f60a3055bd34f2ae8f4ec4c3c..129dcf33982e7e9ee97b5b34a6efc63a098af321 100644 (file)
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -1,44 +1,21 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#undef DEBUG
-
 #define CONFIG_CPU_SH7751      1
-#define CONFIG_CPU_SH_TYPE_R   1
-#define CONFIG_R2DPLUS         1
 #define __LITTLE_ENDIAN__      1
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_PCI
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_IDE
-#define CONFIG_CMD_EXT2
-#define CONFIG_DOS_PARTITION
-#define CONFIG_CMD_SH_ZIMAGEBOOT
+#define CONFIG_DISPLAY_BOARDINFO
 
 /* SCIF */
-#define CONFIG_SCIF_CONSOLE    1
-#define CONFIG_BAUDRATE                115200
 #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
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE          (0x8C000000)
-#define CONFIG_SYS_SDRAM_SIZE          (0x04000000)
+#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_CBSIZE              256
 #define CONFIG_SYS_PBSIZE              256
-#define CONFIG_SYS_MAXARGS             16
-#define CONFIG_SYS_BARGSIZE            512
 
 #define CONFIG_SYS_MEMTEST_START       (CONFIG_SYS_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_TEXT_BASE - 0x100000)
@@ -61,7 +38,6 @@
 #define CONFIG_SYS_MAX_FLASH_SECT  256
 #define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE }
 
-#define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_SECT_SIZE   0x40000
 #define CONFIG_ENV_SIZE        (CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_ADDR        (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
@@ -92,12 +68,9 @@
 /*
  * SuperH PCI Bridge Configration
  */
-#define CONFIG_PCI
 #define CONFIG_SH4_PCI
 #define CONFIG_SH7751_PCI
-#define CONFIG_PCI_PNP
 #define CONFIG_PCI_SCAN_SHOW   1
-#define __io
 #define __mem_pci
 
 #define CONFIG_PCI_MEM_BUS     0xFD000000      /* Memory space base addr */
@@ -106,13 +79,8 @@
 #define CONFIG_PCI_IO_BUS      0xFE240000      /* IO space base address */
 #define CONFIG_PCI_IO_PHYS     CONFIG_PCI_IO_BUS
 #define CONFIG_PCI_IO_SIZE     0x00040000      /* Size of IO window */
-#define CONFIG_PCI_SYS_BUS     (CONFIG_SYS_SDRAM_BASE & 0x1fffffff)
-#define CONFIG_PCI_SYS_PHYS    (CONFIG_SYS_SDRAM_BASE & 0x1fffffff)
+#define CONFIG_PCI_SYS_BUS     CONFIG_SYS_SDRAM_BASE
+#define CONFIG_PCI_SYS_PHYS    CONFIG_SYS_SDRAM_BASE
 #define CONFIG_PCI_SYS_SIZE    CONFIG_SYS_SDRAM_SIZE
 
-/*
- * Network device (RTL8139) support
- */
-#define CONFIG_RTL8139
-
 #endif /* __CONFIG_H */