Merge remote-tracking branch 'u-boot-atmel/master'

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

diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index ec5223c..3622b4a 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
@@ -411,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