Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-14 00:47:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

iminfo: add missing map_sysmem

Browse source 
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>
This commit is contained in:
Philippe Reynes 2019-12-02 15:45:50 +01:00 committed by Tom Rini
parent d4d65e1125
commit ae0d12f8df
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmd/bootm.c
View file

@ -19,6 +19,7 @@
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/err.h> #include <linux/err.h>
#include <u-boot/zlib.h> #include <u-boot/zlib.h>
#include <mapmem.h>
DECLARE_GLOBAL_DATA_PTR; 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) 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); printf("\n## Checking Image at %08lx ...\n", addr);
@ -254,11 +255,13 @@ static int image_info(ulong addr)
puts(" Legacy image found\n"); puts(" Legacy image found\n");
if (!image_check_magic(hdr)) { if (!image_check_magic(hdr)) {
puts(" Bad Magic Number\n"); puts(" Bad Magic Number\n");
unmap_sysmem(hdr);
return 1; return 1;
} }
if (!image_check_hcrc(hdr)) { if (!image_check_hcrc(hdr)) {
puts(" Bad Header Checksum\n"); puts(" Bad Header Checksum\n");
unmap_sysmem(hdr);
return 1; return 1;
} }
@ -267,15 +270,18 @@ static int image_info(ulong addr)
puts(" Verifying Checksum ... "); puts(" Verifying Checksum ... ");
if (!image_check_dcrc(hdr)) { if (!image_check_dcrc(hdr)) {
puts(" Bad Data CRC\n"); puts(" Bad Data CRC\n");
unmap_sysmem(hdr);
return 1; return 1;
} }
puts("OK\n"); puts("OK\n");
unmap_sysmem(hdr);
return 0; return 0;
#endif #endif
#if defined(CONFIG_ANDROID_BOOT_IMAGE) #if defined(CONFIG_ANDROID_BOOT_IMAGE)
case IMAGE_FORMAT_ANDROID: case IMAGE_FORMAT_ANDROID:
puts(" Android image found\n"); puts(" Android image found\n");
android_print_contents(hdr); android_print_contents(hdr);
unmap_sysmem(hdr);
return 0; return 0;
#endif #endif
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
@ -284,6 +290,7 @@ static int image_info(ulong addr)
if (!fit_check_format(hdr)) { if (!fit_check_format(hdr)) {
puts("Bad FIT image format!\n"); puts("Bad FIT image format!\n");
unmap_sysmem(hdr);
return 1; return 1;
} }
@ -291,9 +298,11 @@ static int image_info(ulong addr)
if (!fit_all_image_verify(hdr)) { if (!fit_all_image_verify(hdr)) {
puts("Bad hash in FIT image!\n"); puts("Bad hash in FIT image!\n");
unmap_sysmem(hdr);
return 1; return 1;
} }
unmap_sysmem(hdr);
return 0; return 0;
#endif #endif
default: default:
@ -301,6 +310,7 @@ static int image_info(ulong addr)
break; break;
} }
unmap_sysmem(hdr);
return 1; return 1;
} }