ARM: relocation: don't undef CONFIG_SYS_ARM_WITHOUT_RELOC

[u-boot] / common / cmd_date.c

diff --git a/common/cmd_date.c b/common/cmd_date.c
index b69e93508583be1e5ad0e426640ff6b64c324694..50b42402673696c987e5f04e93b048f357ed64ba 100644 (file)
--- a/common/cmd_date.c
+++ b/common/cmd_date.c
@@ -35,11 +35,15 @@ const char *weekdays[] = {
        "Sun", "Mon", "Tues", "Wednes", "Thurs", "Fri", "Satur",
 };
 
+#ifdef CONFIG_RELOC_FIXUP_WORKS
+#define RELOC(a)       a
+#else
 #define RELOC(a)       ((typeof(a))((unsigned long)(a) + gd->reloc_off))
+#endif
 
 int mk_date (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;
@@ -67,9 +71,9 @@ int do_date (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                                /* and write to RTC */
                                rcode = rtc_set (&tm);
                                if(rcode)
-                                       puts("## Set date failled\n");
+                                       puts("## Set date failed\n");
                        } else {
-                               puts("## Get date failled\n");
+                               puts("## Get date failed\n");
                        }
                }
                /* FALL TROUGH */
@@ -77,7 +81,7 @@ int do_date (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                rcode = rtc_get (&tm);
 
                if (rcode) {
-                       puts("## Get date failled\n");
+                       puts("## Get date failed\n");
                        break;
                }