From 1ac7e17e8600a464df87db37abf5a2d251365116 Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@fifi.denx.de>
Date: Fri, 16 Jun 2006 16:43:33 +0200
Subject: Update configuration for CMC-PU2 board Patch by Martin Krause, 17 Nov
 2005

---
 CHANGELOG                 |  3 +++
 include/configs/cmc_pu2.h | 11 +----------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index e2346c8d6f..b30c0d12ce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Update configuration for CMC-PU2 board
+  Patch by Martin Krause, 17 Nov 2005
+
 * Add support for PS/2 keyboard on TQM85xx board
   Patch by Martin Krause, 07 Nov 2005
 
diff --git a/include/configs/cmc_pu2.h b/include/configs/cmc_pu2.h
index 46280f7e32..572a70f120 100644
--- a/include/configs/cmc_pu2.h
+++ b/include/configs/cmc_pu2.h
@@ -108,7 +108,7 @@
 /* still about 20 kB free with this defined */
 #define CFG_LONGHELP
 
-#define CONFIG_BOOTDELAY      3
+#define CONFIG_BOOTDELAY      1
 
 #ifdef CONFIG_HARD_I2C
 #define CONFIG_COMMANDS		\
@@ -206,15 +206,6 @@ struct bd_info_ext {
 #error CONFIG_USE_IRQ not supported
 #endif
 
-#define CFG_DEVICE_NULLDEV	 1	/* enble null device		*/
-#define CONFIG_SILENT_CONSOLE	 1	/* enable silent startup	*/
-
-#define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds\n"
-#define CONFIG_AUTOBOOT_STOP_STR "R"	/* default password */
-
-#define CONFIG_VERSION_VARIABLE	1       /* include version env variable */
-
 #define	CONFIG_EXTRA_ENV_SETTINGS	\
 	"net_nfs=tftp ${loadaddr} ${bootfile};run nfsargs addip addcons " \
 		"addmtd;bootm\0" \
-- 
cgit