summaryrefslogtreecommitdiffstats
path: root/commands/bootm.c
diff options
context:
space:
mode:
Diffstat (limited to 'commands/bootm.c')
-rw-r--r--commands/bootm.c79
1 files changed, 42 insertions, 37 deletions
diff --git a/commands/bootm.c b/commands/bootm.c
index a64f67879d..98047cda69 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -98,19 +98,19 @@ fixup_silent_linux ()
int relocate_image(struct image_handle *handle, void *load_address)
{
image_header_t *hdr = &handle->header;
- unsigned long len = ntohl(hdr->ih_size);
+ unsigned long len = image_get_size(hdr);
unsigned long data = (unsigned long)(handle->data);
#if defined CONFIG_CMD_BOOTM_ZLIB || defined CONFIG_CMD_BOOTM_BZLIB
uint unc_len = CFG_BOOTM_LEN;
#endif
- switch (hdr->ih_comp) {
+ switch (image_get_comp(hdr)) {
case IH_COMP_NONE:
- if(ntohl(hdr->ih_load) == data) {
+ if(image_get_load(hdr) == data) {
printf (" XIP ... ");
} else {
- memmove ((void *) ntohl(hdr->ih_load), (uchar *)data, len);
+ memmove ((void *) image_get_load(hdr), (uchar *)data, len);
}
break;
#ifdef CONFIG_CMD_BOOTM_ZLIB
@@ -137,7 +137,8 @@ int relocate_image(struct image_handle *handle, void *load_address)
break;
#endif
default:
- printf ("Unimplemented compression type %d\n", hdr->ih_comp);
+ printf("Unimplemented compression type %d\n",
+ image_get_comp(hdr));
return -1;
}
@@ -161,24 +162,24 @@ struct image_handle *map_image(const char *filename, int verify)
handle = xzalloc(sizeof(struct image_handle));
header = &handle->header;
- if (read(fd, header, sizeof(image_header_t)) < 0) {
+ if (read(fd, header, image_get_header_size()) < 0) {
printf("could not read: %s\n", errno_str());
goto err_out;
}
- if (ntohl(header->ih_magic) != IH_MAGIC) {
+ if (image_check_magic(header)) {
puts ("Bad Magic Number\n");
goto err_out;
}
- checksum = ntohl(header->ih_hcrc);
+ checksum = image_get_hcrc(header);
header->ih_hcrc = 0;
- if (crc32 (0, (uchar *)header, sizeof(image_header_t)) != checksum) {
+ if (crc32 (0, (uchar *)header, image_get_header_size()) != checksum) {
puts ("Bad Header Checksum\n");
goto err_out;
}
- len = ntohl(header->ih_size);
+ len = image_get_size(header);
handle->data = memmap(fd, PROT_READ);
if (handle->data == (void *)-1) {
@@ -189,12 +190,13 @@ struct image_handle *map_image(const char *filename, int verify)
goto err_out;
}
} else {
- handle->data = (void *)((unsigned long)handle->data + sizeof(image_header_t));
+ handle->data = (void *)((unsigned long)handle->data +
+ image_get_header_size());
}
if (verify) {
puts (" Verifying Checksum ... ");
- if (crc32 (0, handle->data, len) != ntohl(header->ih_dcrc)) {
+ if (crc32 (0, handle->data, len) != image_get_dcrc(header)) {
printf ("Bad Data CRC\n");
goto err_out;
}
@@ -330,8 +332,9 @@ static int do_bootm(struct command *cmdtp, int argc, char *argv[])
os_header = &os_handle->header;
- if (os_header->ih_arch != IH_ARCH) {
- printf ("Unsupported Architecture 0x%x\n", os_header->ih_arch);
+ if (image_check_arch(os_header, IH_ARCH)) {
+ printf("Unsupported Architecture 0x%x\n",
+ image_get_arch(os_header));
goto err_out;
}
@@ -347,14 +350,15 @@ static int do_bootm(struct command *cmdtp, int argc, char *argv[])
/* loop through the registered handlers */
list_for_each_entry(handler, &handler_list, list) {
- if (handler->image_type == os_header->ih_os) {
+ if (image_check_os(os_header, handler->image_type)) {
handler->bootm(&data);
printf("handler returned!\n");
goto err_out;
}
}
- printf("no image handler found for image type %d\n", os_header->ih_os);
+ printf("no image handler found for image type %d\n",
+ image_get_os(os_header));
err_out:
if (os_handle)
@@ -403,17 +407,17 @@ static int image_info (ulong addr)
printf ("\n## Checking Image at %08lx ...\n", addr);
/* Copy header so we can blank CRC field for re-calculation */
- memmove (&header, (char *)addr, sizeof(image_header_t));
+ memmove (&header, (char *)addr, image_get_header_size());
- if (ntohl(hdr->ih_magic) != IH_MAGIC) {
+ if (image_check_magic(hdr)) {
puts (" Bad Magic Number\n");
return 1;
}
data = (ulong)&header;
- len = sizeof(image_header_t);
+ len = image_get_header_size();
- checksum = ntohl(hdr->ih_hcrc);
+ checksum = image_get_hcrc(hdr);
hdr->ih_hcrc = 0;
if (crc32 (0, (uchar *)data, len) != checksum) {
@@ -424,11 +428,11 @@ static int image_info (ulong addr)
/* for multi-file images we need the data part, too */
print_image_hdr ((image_header_t *)addr);
- data = addr + sizeof(image_header_t);
- len = ntohl(hdr->ih_size);
+ data = addr + image_get_header_size();
+ len = image_get_size(hdr);
puts (" Verifying Checksum ... ");
- if (crc32 (0, (uchar *)data, len) != ntohl(hdr->ih_dcrc)) {
+ if (crc32 (0, (uchar *)data, len) != image_get_dcrc(hdr)) {
puts (" Bad Data CRC\n");
return 1;
}
@@ -451,11 +455,11 @@ void
print_image_hdr (image_header_t *hdr)
{
#if defined(CONFIG_CMD_DATE) || defined(CONFIG_TIMESTAMP)
- time_t timestamp = (time_t)ntohl(hdr->ih_time);
+ time_t timestamp = (time_t)image_get_time(hdr);
struct rtc_time tm;
#endif
- printf (" Image Name: %.*s\n", IH_NMLEN, hdr->ih_name);
+ printf (" Image Name: %.*s\n", IH_NMLEN, image_get_name(hdr));
#if defined(CONFIG_CMD_DATE) || defined(CONFIG_TIMESTAMP)
to_tm (timestamp, &tm);
printf (" Created: %4d-%02d-%02d %2d:%02d:%02d UTC\n",
@@ -464,26 +468,27 @@ print_image_hdr (image_header_t *hdr)
#endif /* CONFIG_CMD_DATE, CONFIG_TIMESTAMP */
#ifdef CONFIG_CMD_BOOTM_SHOW_TYPE
printf (" Image Type: %s %s %s (%s)\n",
- image_arch(hdr->ih_arch),
- image_os(hdr->ih_os),
- image_type(hdr->ih_type),
- image_compression(hdr->ih_comp));
+ image_get_arch_name(image_get_arch(hdr)),
+ image_get_os_name(image_get_os(hdr)),
+ image_get_type_name(image_get_type(hdr)),
+ image_get_comp_name(image_get_comp(hdr)));
#endif
printf (" Data Size: %d Bytes = %s\n"
" Load Address: %08x\n"
" Entry Point: %08x\n",
- ntohl(hdr->ih_size),
- size_human_readable(ntohl(hdr->ih_size)),
- ntohl(hdr->ih_load),
- ntohl(hdr->ih_ep));
+ image_get_size(hdr),
+ size_human_readable(image_get_size(hdr)),
+ image_get_load(hdr),
+ image_get_ep(hdr));
- if (hdr->ih_type == IH_TYPE_MULTI) {
+ if (image_check_type(hdr, IH_TYPE_MULTI)) {
int i;
- ulong len;
- ulong *len_ptr = (ulong *)((ulong)hdr + sizeof(image_header_t));
+ uint32_t len;
+ uint32_t *len_ptr = (uint32_t *)((ulong)hdr + image_get_header_size());
puts (" Contents:\n");
- for (i=0; (len = ntohl(*len_ptr)); ++i, ++len_ptr) {
+ for (i=0; len_ptr[i]; ++i) {
+ len = ntohl(len_ptr[i]);
printf (" Image %d: %8ld Bytes = %s", i, len,
size_human_readable (len));
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-23 17:58:08 +0000