Merge branch 'mimc200' into next

[oweals/u-boot.git] / cpu / nios2 / sysid.c

diff --git a/cpu/nios2/sysid.c b/cpu/nios2/sysid.c
index b5a29593ea60f9d66226cbd6d3642b99d9b693e2..251204beb7b14e5e80512c8ec2745ea3d7466dd6 100644 (file)
--- a/cpu/nios2/sysid.c
+++ b/cpu/nios2/sysid.c
@@ -23,7 +23,7 @@
 
 #include <common.h>
 
-#if defined (CFG_NIOS_SYSID_BASE)
+#if defined (CONFIG_SYS_NIOS_SYSID_BASE)
 
 #include <command.h>
 #include <asm/io.h>
@@ -32,7 +32,7 @@
 
 void display_sysid (void)
 {
-       struct nios_sysid_t *sysid = (struct nios_sysid_t *)CFG_NIOS_SYSID_BASE;
+       struct nios_sysid_t *sysid = (struct nios_sysid_t *)CONFIG_SYS_NIOS_SYSID_BASE;
        struct tm t;
        char asc[32];
        time_t stamp;
@@ -40,7 +40,7 @@ void display_sysid (void)
        stamp = readl (&sysid->timestamp);
        localtime_r (&stamp, &t);
        asctime_r (&t, asc);
-       printf ("SYSID : %08x, %s", readl (&sysid->id), asc);
+       printf ("SYSID : %08lx, %s", readl (&sysid->id), asc);
 
 }
 
@@ -52,7 +52,7 @@ int do_sysid (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        sysid,  1,      1,      do_sysid,
-       "sysid   - display Nios-II system id\n\n",
+       "display Nios-II system id",
        "\n    - display Nios-II system id\n"
 );
-#endif /* CFG_NIOS_SYSID_BASE */
+#endif /* CONFIG_SYS_NIOS_SYSID_BASE */