diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-03-26 10:41:48 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-03-26 10:41:48 +0100 |
| commit | b951f8d31711f3f10ad119ddcf5a3d0afe14d561 (patch) | |
| tree | 950ca2e675ec92ea7b5610a3a2ea2b739f0aaab5 /board/cray | |
| parent | 218ca724c08ca8a649f0917cf201cf23d4b33f39 (diff) | |
| parent | 27f33e9f45ef7f9685cbdc65066a1828e85dde4f (diff) | |
| download | u-boot-b951f8d31711f3f10ad119ddcf5a3d0afe14d561.zip u-boot-b951f8d31711f3f10ad119ddcf5a3d0afe14d561.tar.gz u-boot-b951f8d31711f3f10ad119ddcf5a3d0afe14d561.tar.bz2 | |
Merge branch 'master_merge_new-image' of /home/tur/git/u-boot
Diffstat (limited to 'board/cray')
| -rw-r--r-- | board/cray/L1/L1.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/board/cray/L1/L1.c b/board/cray/L1/L1.c index 5264baf..a72ba46 100644 --- 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); |