Merge with git://www.denx.de/git/u-boot.git

[platform/kernel/u-boot.git] / rtc / mk48t59.c

diff --git a/rtc/mk48t59.c b/rtc/mk48t59.c
index 664d310..bacdb5b 100644 (file)
--- a/rtc/mk48t59.c
+++ b/rtc/mk48t59.c
@@ -83,6 +83,18 @@ static void rtc_write (short reg, uchar val)
     out_byte(CMOS_DATA, (uint8)val);
 }
 
+#elif defined(CONFIG_EVAL5200)
+
+static uchar rtc_read (short reg)
+{
+       return in8(RTC(reg));
+}
+
+static void rtc_write (short reg, uchar val)
+{
+       out8(RTC(reg),val);
+}
+
 #else
 # error Board specific rtc access functions should be supplied
 #endif
@@ -119,7 +131,7 @@ void nvram_write(short dest, const void *src, size_t count)
                rtc_write(d++, *s++);
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_CMD_DATE)
 
 /* ------------------------------------------------------------------------- */
 
@@ -221,5 +233,5 @@ void rtc_set_watchdog(short multi, short res)
        rtc_write(RTC_WATCHDOG, wd_value);
 }
 
-#endif /* (CONFIG_COMMANDS & CFG_CMD_DATE) */
+#endif
 #endif /* CONFIG_RTC_MK48T59 */