The command iminfo fails on sandbox because the address is used directly. To fix this issue, we call the function map_sysmem to translate the address.
Signed-off-by: Philippe Reynes philippe.reynes@softathome.com --- cmd/bootm.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/cmd/bootm.c b/cmd/bootm.c index 8279f2b..62ee7c4 100644 --- a/cmd/bootm.c +++ b/cmd/bootm.c @@ -19,6 +19,7 @@ #include <linux/ctype.h> #include <linux/err.h> #include <u-boot/zlib.h> +#include <mapmem.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -244,7 +245,7 @@ static int do_iminfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
static int image_info(ulong addr) { - void *hdr = (void *)addr; + void *hdr = (void *)map_sysmem(addr, 0);
printf("\n## Checking Image at %08lx ...\n", addr);
@@ -254,11 +255,13 @@ static int image_info(ulong addr) puts(" Legacy image found\n"); if (!image_check_magic(hdr)) { puts(" Bad Magic Number\n"); + unmap_sysmem(hdr); return 1; }
if (!image_check_hcrc(hdr)) { puts(" Bad Header Checksum\n"); + unmap_sysmem(hdr); return 1; }
@@ -267,15 +270,18 @@ static int image_info(ulong addr) puts(" Verifying Checksum ... "); if (!image_check_dcrc(hdr)) { puts(" Bad Data CRC\n"); + unmap_sysmem(hdr); return 1; } puts("OK\n"); + unmap_sysmem(hdr); return 0; #endif #if defined(CONFIG_ANDROID_BOOT_IMAGE) case IMAGE_FORMAT_ANDROID: puts(" Android image found\n"); android_print_contents(hdr); + unmap_sysmem(hdr); return 0; #endif #if defined(CONFIG_FIT) @@ -284,6 +290,7 @@ static int image_info(ulong addr)
if (!fit_check_format(hdr)) { puts("Bad FIT image format!\n"); + unmap_sysmem(hdr); return 1; }
@@ -291,9 +298,11 @@ static int image_info(ulong addr)
if (!fit_all_image_verify(hdr)) { puts("Bad hash in FIT image!\n"); + unmap_sysmem(hdr); return 1; }
+ unmap_sysmem(hdr); return 0; #endif default: @@ -301,6 +310,7 @@ static int image_info(ulong addr) break; }
+ unmap_sysmem(hdr); return 1; }