Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing

[u-boot] / board / cray / L1 / L1.c

diff --git a/board/cray/L1/L1.c b/board/cray/L1/L1.c
index 5264bafd4bd9b2e2542868c3e9ccef97b631ff0e..a72ba4620b52a264c478aee49e967cd95551a3b5 100644 (file)
--- a/board/cray/L1/L1.c
+++ b/board/cray/L1/L1.c
@@ -139,8 +139,15 @@ int misc_init_r (void)
        struct rtc_time tm;
        char bootcmd[32];
 
-       hdr = (image_header_t *) (CFG_MONITOR_BASE - sizeof (image_header_t));
-       timestamp = (time_t) hdr->ih_time;
+       hdr = (image_header_t *) (CFG_MONITOR_BASE - image_get_header_size ());
+#if defined(CONFIG_FIT)
+       if (genimg_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) {
+               puts ("Non legacy image format not supported\n");
+               return -1;
+       }
+#endif
+
+       timestamp = (time_t)image_get_time (hdr);
        to_tm (timestamp, &tm);
        printf ("Welcome to U-Boot on Cray L1. Compiled %4d-%02d-%02d  %2d:%02d:%02d (UTC)\n", tm.tm_year, tm.tm_mon, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);