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

[u-boot] / include / configs / r7780mp.h

diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index 82a056c6903a8adfa5842c642a1d0644d7e64fda..baadd876bc6a18ab0c20c4accdb782cf033a8b1f 100644 (file)
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -10,33 +10,28 @@
 #ifndef __R7780RP_H
 #define __R7780RP_H
 
-#undef DEBUG
 #define CONFIG_CPU_SH7780      1
 #define CONFIG_R7780MP         1
 #define CONFIG_SYS_R7780MP_OLD_FLASH   1
 #define __LITTLE_ENDIAN__ 1
 
+#define CONFIG_DISPLAY_BOARDINFO
+
 /*
  * Command line configuration.
  */
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_PCI
-#define CONFIG_CMD_PING
 #define CONFIG_CMD_IDE
-#define CONFIG_CMD_EXT2
 #define CONFIG_DOS_PARTITION
 
 #define CONFIG_SCIF_CONSOLE    1
 #define CONFIG_BAUDRATE                115200
 #define CONFIG_CONS_SCIF0      1
 
-#define CONFIG_BOOTDELAY       3
 #define CONFIG_BOOTARGS                "console=ttySC0,115200"
 #define CONFIG_ENV_OVERWRITE   1
 
-/* check for keypress on bootdelay==0 */
-/*#define CONFIG_ZERO_BOOTDELAY_CHECK*/
-
 #define CONFIG_SYS_TEXT_BASE           0x0FFC0000
 #define CONFIG_SYS_SDRAM_BASE          (0x08000000)
 #define CONFIG_SYS_SDRAM_SIZE          (128 * 1024 * 1024)
@@ -100,15 +95,12 @@
 
 /* PCI Controller */
 #if defined(CONFIG_CMD_PCI)
-#define CONFIG_PCI
 #define CONFIG_SH4_PCI
 #define CONFIG_SH7780_PCI
 #define CONFIG_SH7780_PCI_LSR  0x07f00001
 #define CONFIG_SH7780_PCI_LAR  CONFIG_SYS_SDRAM_SIZE
 #define CONFIG_SH7780_PCI_BAR  CONFIG_SYS_SDRAM_SIZE
-#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 */
@@ -124,9 +116,6 @@
 #endif /* CONFIG_CMD_PCI */
 
 #if defined(CONFIG_CMD_NET)
-/*
-#define CONFIG_RTL8169
-*/
 /* AX88796L Support(NE2000 base chip) */
 #define CONFIG_DRIVER_AX88796L
 #define CONFIG_DRIVER_NE2000_BASE      0xA4100000