Merge 'next' branch

[platform/kernel/u-boot.git] / cpu / s3c44b0 / cpu.c

diff --git a/cpu/s3c44b0/cpu.c b/cpu/s3c44b0/cpu.c
index 1a8a17d..fd09bf9 100644 (file)
--- a/cpu/s3c44b0/cpu.c
+++ b/cpu/s3c44b0/cpu.c
@@ -86,8 +86,6 @@ void reset_cpu (ulong addr)
 
 int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-       extern void reset_cpu (ulong addr);
-
        disable_interrupts ();
        reset_cpu (0);
 
@@ -157,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);
@@ -186,9 +184,11 @@ 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)
+int rtc_set (struct rtc_time* tm)
 {
        if(tm->tm_year < 2000)
                tm->tm_year -= 1900;
@@ -204,6 +204,8 @@ void rtc_set (struct rtc_time* tm)
        BCDMIN = HEX2BCD(tm->tm_min);
        BCDSEC = HEX2BCD(tm->tm_sec);
        RTCCON &= 1;
+
+       return 0;
 }
 
 void rtc_reset (void)
@@ -272,7 +274,7 @@ int i2c_probe(uchar chip)
                not implemented
        */
 
-       printf(__FUNCTION__ " chip %d\n", (int) chip);
+       printf("i2c_probe chip %d\n", (int) chip);
        return -1;
 }