* Fix RTC configuration for PPChameleon board

* Cleanup, fix typo in include/configs/TQM5200.h

diff --git a/CHANGELOG b/CHANGELOG
index 019a5db6372139c8c162444d0488f16cb84d80b8..7244c9b1d277795d4ed30ca46e45999fc55b151a 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,10 @@
 Changes for U-Boot 1.1.3:
 ======================================================================
 
+* Fix RTC configuration for PPChameleon board
+
+* Cleanup, fix typo in include/configs/TQM5200.h
+
 * Patch by Stefan Roese, 16 Mar 2005:
   Update for esd auto_update and hh405 board
 

diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index 2ffe89f8c6a947492102ae7ae56e60af20605790..e4ad1fbd876b5aa0f37e7e673d0db2d6464cf6ca 100644 (file)
--- 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 14452921366006d0ebf57c71188cc20ddebf287f..87bcc5b3057d3b7f99c61babddfce0cdcebcd799 100644 (file)
--- 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"

diff --git a/rtc/m41t11.c b/rtc/m41t11.c
index 11a1b086adaf6a1c8d3ad6cf1e2c37d9015bc9cb..c725cc9045f868192fd4d1060c538650aecac1f5 100644 (file)
--- a/rtc/m41t11.c
+++ b/rtc/m41t11.c
@@ -23,6 +23,8 @@
  * can you believe a trademark on that?
  */
 
+/* #define DEBUG 1 */
+
 #include <common.h>
 #include <command.h>
 #include <rtc.h>
@@ -43,8 +45,6 @@
 
 #if defined(CONFIG_RTC_M41T11) && defined(CFG_I2C_RTC_ADDR) && (CONFIG_COMMANDS & CFG_CMD_DATE)
 
-#define DEBUG 1
-
 static unsigned bcd2bin (uchar n)
 {
        return ((((n >> 4) & 0x0F) * 10) + (n & 0x0F));