diff options
| author | wdenk <wdenk> | 2005-03-17 16:43:10 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2005-03-17 16:43:10 +0000 |
| commit | e6325153874b567eece9c4ac294c4b82ec7b4004 (patch) | |
| tree | f7e2e2816ca992c57cda20dbe89ac41b595dc6da | |
| parent | 4d00eb029008d1ef56111110ea9c61eb7e38c7c9 (diff) | |
* Fix RTC configuration for PPChameleon board
* Cleanup, fix typo in include/configs/TQM5200.h
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | include/configs/PPChameleonEVB.h | 5 | ||||
| -rw-r--r-- | include/configs/TQM5200.h | 8 | ||||
| -rw-r--r-- | rtc/m41t11.c | 4 |
4 files changed, 13 insertions, 8 deletions
diff --git a/CHANGELOG b/CHANGELOG index 019a5db6372..7244c9b1d27 100644 --- 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 2ffe89f8c6a..e4ad1fbd876 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 14452921366..87bcc5b3057 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" diff --git a/rtc/m41t11.c b/rtc/m41t11.c index 11a1b086ada..c725cc9045f 100644 --- 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)); |