Merge branch 'master' of git://git.denx.de/u-boot-arm

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

diff --git a/cpu/nios2/cpu.c b/cpu/nios2/cpu.c
index c9db1276146f15cea38852c8d2506e255795dfd0..6379534a0b5c59175332a11b317fbd5f35fec39d 100644 (file)
--- a/cpu/nios2/cpu.c
+++ b/cpu/nios2/cpu.c
@@ -25,29 +25,17 @@
 #include <nios2.h>
 #include <nios2-io.h>
 
-#if defined (CFG_NIOS_SYSID_BASE)
-#include <linux/time.h>
-static void check_sysid (void)
-{
-       struct nios_sysid_t *sysid =
-               (struct nios_sysid_t *)CACHE_BYPASS(CFG_NIOS_SYSID_BASE);
-       struct tm t;
-       char asc[32];
-
-       localtime_r ((time_t *)&sysid->timestamp, &t);
-       asctime_r (&t, asc);
-       printf ("SYSID : %08x, %s", sysid->id, asc);
-
-}
-#endif /* CFG_NIOS_SYSID_BASE */
+#if defined (CONFIG_SYS_NIOS_SYSID_BASE)
+extern void display_sysid (void);
+#endif /* CONFIG_SYS_NIOS_SYSID_BASE */
 
 int checkcpu (void)
 {
        printf ("CPU   : Nios-II\n");
-#if !defined(CFG_NIOS_SYSID_BASE)
+#if !defined(CONFIG_SYS_NIOS_SYSID_BASE)
        printf ("SYSID : <unknown>\n");
 #else
-       check_sysid ();
+       display_sysid ();
 #endif
        return (0);
 }
@@ -55,7 +43,7 @@ int checkcpu (void)
 
 int do_reset (void)
 {
-       void (*rst)(void) = (void(*)(void))CFG_RESET_ADDR;
+       void (*rst)(void) = (void(*)(void))CONFIG_SYS_RESET_ADDR;
        disable_interrupts ();
        rst();
        return(0);