Merge branch 'master' of /home/wd/git/u-boot/master

[J-u-boot.git] / common / cmd_date.c

diff --git a/common/cmd_date.c b/common/cmd_date.c
index 751159847a487da0fd3c034d355417eed03ca646..f0fa02ae22fcb90f17136c35349f721b7f513b4e 100644 (file)
--- a/common/cmd_date.c
+++ b/common/cmd_date.c
@@ -31,15 +31,19 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-const char *weekdays[] = {
+static const char * const weekdays[] = {
        "Sun", "Mon", "Tues", "Wednes", "Thurs", "Fri", "Satur",
 };
 
+#ifdef CONFIG_NEEDS_MANUAL_RELOC
 #define RELOC(a)       ((typeof(a))((unsigned long)(a) + gd->reloc_off))
+#else
+#define RELOC(a)       a
+#endif
 
-int mk_date (char *, struct rtc_time *);
+int mk_date (const char *, struct rtc_time *);
 
-int do_date (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_date (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        struct rtc_time tm;
        int rcode = 0;
@@ -47,7 +51,7 @@ int do_date (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        /* switch to correct I2C bus */
        old_bus = I2C_GET_BUS();
-       I2C_SET_BUS(CFG_RTC_BUS_NUM);
+       I2C_SET_BUS(CONFIG_SYS_RTC_BUS_NUM);
 
        switch (argc) {
        case 2:                 /* set date & time */
@@ -56,18 +60,30 @@ int do_date (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        rtc_reset ();
                } else {
                        /* initialize tm with current time */
-                       rtc_get (&tm);
-                       /* insert new date & time */
-                       if (mk_date (argv[1], &tm) != 0) {
-                               puts ("## Bad date format\n");
-                               break;
+                       rcode = rtc_get (&tm);
+
+                       if(!rcode) {
+                               /* insert new date & time */
+                               if (mk_date (argv[1], &tm) != 0) {
+                                       puts ("## Bad date format\n");
+                                       break;
+                               }
+                               /* and write to RTC */
+                               rcode = rtc_set (&tm);
+                               if(rcode)
+                                       puts("## Set date failed\n");
+                       } else {
+                               puts("## Get date failed\n");
                        }
-                       /* and write to RTC */
-                       rtc_set (&tm);
                }
                /* FALL TROUGH */
        case 1:                 /* get date & time */
-               rtc_get (&tm);
+               rcode = rtc_get (&tm);
+
+               if (rcode) {
+                       puts("## Get date failed\n");
+                       break;
+               }
 
                printf ("Date: %4d-%02d-%02d (%sday)    Time: %2d:%02d:%02d\n",
                        tm.tm_year, tm.tm_mon, tm.tm_mday,
@@ -77,7 +93,7 @@ int do_date (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
                break;
        default:
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                rcode = 1;
        }
 
@@ -90,7 +106,7 @@ int do_date (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 /*
  * simple conversion of two-digit string with error checking
  */
-static int cnvrt2 (char *str, int *valp)
+static int cnvrt2 (const char *str, int *valp)
 {
        int val;
 
@@ -115,7 +131,7 @@ static int cnvrt2 (char *str, int *valp)
  * Some basic checking for valid values is done, but this will not catch
  * all possible error conditions.
  */
-int mk_date (char *datestr, struct rtc_time *tmp)
+int mk_date (const char *datestr, struct rtc_time *tmp)
 {
        int len, val;
        char *ptr;
@@ -202,9 +218,9 @@ int mk_date (char *datestr, struct rtc_time *tmp)
 
 U_BOOT_CMD(
        date,   2,      1,      do_date,
-       "date    - get/set/reset date & time\n",
+       "get/set/reset date & time",
        "[MMDDhhmm[[CC]YY][.ss]]\ndate reset\n"
        "  - without arguments: print date & time\n"
        "  - with numeric argument: set the system date & time\n"
-       "  - with 'reset' argument: reset the RTC\n"
+       "  - with 'reset' argument: reset the RTC"
 );