summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorGerald Van Baren <vanbaren@cideas.com>2008-03-21 11:42:54 -0400
committerGerald Van Baren <vanbaren@cideas.com>2008-03-21 11:42:54 -0400
commit493a2b1dc97367e904bf83869501f6290f3b374e (patch)
tree5e5905f085107242093e39a5e2175622df1bb73a /cpu
parent11abe45c48ec3485a6c1a5168ce8d79c3288adc1 (diff)
parent81a0ac62ea29f8252d0a714709d0ecfdbba2a15e (diff)
downloadu-boot-imx-493a2b1dc97367e904bf83869501f6290f3b374e.zip
u-boot-imx-493a2b1dc97367e904bf83869501f6290f3b374e.tar.gz
u-boot-imx-493a2b1dc97367e904bf83869501f6290f3b374e.tar.bz2
Merge git://www.denx.de/git/u-boot into uboot
Diffstat (limited to 'cpu')
-rw-r--r--cpu/s3c44b0/cpu.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpu/s3c44b0/cpu.c b/cpu/s3c44b0/cpu.c
index 5d50b3c..eae6adb 100644
--- a/cpu/s3c44b0/cpu.c
+++ b/cpu/s3c44b0/cpu.c
@@ -155,7 +155,7 @@ int dcache_status (void)
#define HEX2BCD(x) ((((x) / 10) << 4) + (x) % 10)
#endif
-void rtc_get (struct rtc_time* tm)
+int rtc_get (struct rtc_time* tm)
{
RTCCON |= 1;
tm->tm_year = BCD2HEX(BCDYEAR);
@@ -184,6 +184,8 @@ void rtc_get (struct rtc_time* tm)
tm->tm_year += 1900;
else
tm->tm_year += 2000;
+
+ return 0;
}
void rtc_set (struct rtc_time* tm)