summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Sieka <tur@semihalf.com>2008-10-01 15:26:32 +0200
committerWolfgang Denk <wd@denx.de>2008-10-18 21:54:00 +0200
commitfbc87dc0546dff709b38f358e2c5d5e39c4ca374 (patch)
tree52b162e99a90ca95208e2b8b1b16e19e009b73a4
parent4bae90904b69ce3deb9f7c334ef12ed74e18a275 (diff)
downloadtalos-obmc-uboot-fbc87dc0546dff709b38f358e2c5d5e39c4ca374.tar.gz
talos-obmc-uboot-fbc87dc0546dff709b38f358e2c5d5e39c4ca374.zip
FIT: output image load address for type 'firmware', fix message while there
Now that the auto-update feature uses the 'firmware' type for updates, it is useful to inspect the load address of such images. Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
-rw-r--r--common/image.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/common/image.c b/common/image.c
index dc8d7dda6b..0b7bd8d06d 100644
--- a/common/image.c
+++ b/common/image.c
@@ -1852,7 +1852,10 @@ void fit_print_contents (const void *fit)
* @p: pointer to prefix string
*
* fit_image_print() lists all mandatory properies for the processed component
- * image. If present, hash nodes are printed out as well.
+ * image. If present, hash nodes are printed out as well. Load
+ * address for images of type firmware is also printed out. Since the load
+ * address is not mandatory for firmware images, it will be output as
+ * "unavailable" when not present.
*
* returns:
* no returned results
@@ -1911,14 +1914,17 @@ void fit_image_print (const void *fit, int image_noffset, const char *p)
printf ("%s OS: %s\n", p, genimg_get_os_name (os));
}
- if ((type == IH_TYPE_KERNEL) || (type == IH_TYPE_STANDALONE)) {
+ if ((type == IH_TYPE_KERNEL) || (type == IH_TYPE_STANDALONE) ||
+ (type == IH_TYPE_FIRMWARE)) {
ret = fit_image_get_load (fit, image_noffset, &load);
printf ("%s Load Address: ", p);
if (ret)
printf ("unavailable\n");
else
printf ("0x%08lx\n", load);
+ }
+ if ((type == IH_TYPE_KERNEL) || (type == IH_TYPE_STANDALONE)) {
fit_image_get_entry (fit, image_noffset, &entry);
printf ("%s Entry Point: ", p);
if (ret)
@@ -2844,7 +2850,7 @@ int fit_check_format (const void *fit)
#if defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE) || defined(USE_HOSTCC)
/* mandatory / node 'timestamp' property */
if (fdt_getprop (fit, 0, FIT_TIMESTAMP_PROP, NULL) == NULL) {
- debug ("Wrong FIT format: no description\n");
+ debug ("Wrong FIT format: no timestamp\n");
return 0;
}
#endif
OpenPOWER on IntegriCloud