From e6325153874b567eece9c4ac294c4b82ec7b4004 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Thu, 17 Mar 2005 16:43:10 +0000
Subject: * Fix RTC configuration for PPChameleon board

* Cleanup, fix typo in include/configs/TQM5200.h
---
 include/configs/PPChameleonEVB.h | 5 +++--
 include/configs/TQM5200.h        | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'include/configs')

diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index 2ffe89f..e4ad1fb 100644
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -129,8 +129,9 @@
 
 #undef	CONFIG_WATCHDOG			/* watchdog disabled		*/
 
-#define CONFIG_RTC_MC146818		/* DS1685 is MC146818 compatible*/
-#define CFG_RTC_REG_BASE_ADDR	 0xF0000500 /* RTC Base Address		*/
+#define CONFIG_RTC_M41T11	1	/* uses a M41T00 RTC		*/
+#define CFG_I2C_RTC_ADDR	0x68
+#define CFG_M41T11_BASE_YEAR	1900
 
 #define CONFIG_SDRAM_BANK0	1	/* init onboard SDRAM bank 0	*/
 
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 1445292..87bcc5b 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -175,11 +175,11 @@
 #if defined (CONFIG_TQM5200_AA)
 # define CONFIG_U_BOOT_SUFFIX	"-AA"
 #elif defined (CONFIG_TQM5200_AB)
-# define CONFIG_U_BOOT_SUFFIX	"-AB"
+# define CONFIG_U_BOOT_SUFFIX	"-AB\0"
 #elif defined (CONFIG_TQM5200_AC)
-# define CONFIG_U_BOOT_SUFFIX	"-AC"
+# define CONFIG_U_BOOT_SUFFIX	"-AC\0"
 #else
-# define CONFIG_U_BOOT_SUFFIX	/* nothing */
+# define CONFIG_U_BOOT_SUFFIX	"\0"
 #endif
 
 #define CONFIG_EXTRA_ENV_SETTINGS					\
@@ -202,7 +202,7 @@
 	"update=protect off FC000000 FC05FFFF;"				\
 		"erase FC000000 FC05FFFF;"				\
 		"cp.b 200000 FC000000 $(filesize);"			\
-		"protect on FC000000 FC05FFFF\0"a			\
+		"protect on FC000000 FC05FFFF\0"			\
 	""
 
 #define CONFIG_BOOTCOMMAND	"run net_nfs"
-- 
cgit v1.1