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

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

diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index 522ec57b13f95f3d3e55ed9291262ba6c3e41997..3622b4ab924fc22713dcb393342fea4e4d013737 100644 (file)
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -70,6 +70,7 @@
 #define CONFIG_PCI             1
 #define CONFIG_PCI_PNP         1
 #define CONFIG_PCI_SCAN_SHOW   1
+#define CONFIG_PCI_BOOTDELAY   250
 
 #define CONFIG_PCI_MEM_BUS     0x40000000
 #define CONFIG_PCI_MEM_PHYS    CONFIG_PCI_MEM_BUS
@@ -118,7 +119,6 @@
 #ifdef CONFIG_VIDEO
 #define CONFIG_CMD_BMP
 #endif
-#define CONFIG_CMD_DFL
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -288,13 +288,6 @@
 #define CONFIG_SYS_DS1339_TCR_VAL      0xAB    /* diode + 4k resistor */
 #endif
 
-/* ExBo I2C Addresses */
-#if defined(CONFIG_DIGSY_REV5)
-#define CONFIG_SYS_EXBO_EE_I2C_ADDRESS 0x54
-#else
-#define CONFIG_SYS_EXBO_EE_I2C_ADDRESS 0x56
-#endif
-
 /*
  * Flash configuration
  */
@@ -418,7 +411,6 @@
 #define CONFIG_CMDLINE_EDITING 1
 #define CONFIG_SYS_PROMPT      "=> "
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 
 #define CONFIG_AUTOBOOT_KEYED
 #define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds\n", bootdelay