GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-07-23 23:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[new uImage] Add dual format uImage support framework

Browse source 
This patch adds framework for dual format images. Format detection is added
and the bootm controll flow is updated to include cases for new FIT format
uImages.

When the legacy (image_header based) format is detected appropriate
legacy specific handling is invoked. For the new (FIT based) format uImages
dual boot framework has a minial support, that will only print out a
corresponding debug messages. Implementation of the FIT specific handling will
be added in following patches.

Signed-off-by: Marian Balakowicz <m8@semihalf.com>
This commit is contained in:
Marian Balakowicz 2008-02-04 08:28:09 +01:00
parent 5583cbf736
commit d5934ad775
29 changed files with 1084 additions and 414 deletions
Download patch file Download diff file Expand all files Collapse all files

59
common/cmd_nand.c
View file

@ -512,18 +512,32 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
}
show_boot_progress (56);
hdr = (image_header_t *) addr;
switch (gen_image_get_format ((void *)addr)) {
case IMAGE_FORMAT_LEGACY:
hdr = (image_header_t *)addr;
if (!image_check_magic (hdr)) {
printf("\n** Bad Magic Number 0x%x **\n", image_get_magic (hdr));
show_boot_progress (-57);
if (!image_check_magic (hdr)) {
printf("\n** Bad Magic Number 0x%x **\n",
image_get_magic (hdr));
show_boot_progress (-57);
return 1;
}
show_boot_progress (57);
image_print_contents (hdr);
cnt = image_get_image_size (hdr);
break;
#if defined(CONFIG_FIT)
case IMAGE_FORMAT_FIT:
fit_unsupported ("nand_load_image");
return 1;
#endif
default:
puts ("** Unknown image type\n");
return 1;
}
show_boot_progress (57);
image_print_contents (hdr);
cnt = image_get_image_size (hdr);
if (jffs2) {
nand_read_options_t opts;
memset(&opts, 0, sizeof(opts));
@ -980,17 +994,30 @@ int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
}
show_boot_progress (56);
hdr = (image_header_t *)addr;
switch (gen_image_get_format ((void *)addr)) {
case IMAGE_FORMAT_LEGACY:
hdr = (image_header_t *)addr;
if (image_check_magic (hdr)) {
if (image_check_magic (hdr)) {
image_print_contents (hdr);
image_print_contents (hdr);
cnt = image_get_image_size (hdr);
cnt -= SECTORSIZE;
} else {
printf ("\n** Bad Magic Number 0x%x **\n", image_get_magic (hdr));
show_boot_progress (-57);
cnt = image_get_image_size (hdr);
cnt -= SECTORSIZE;
} else {
printf ("\n** Bad Magic Number 0x%x **\n",
image_get_magic (hdr));
show_boot_progress (-57);
return 1;
}
break;
#if defined(CONFIG_FIT)
case IMAGE_FORMAT_FIT:
fit_unsupported ("nboot");
return 1;
#endif
default:
puts ("** Unknown image type\n");
return 1;
}
show_boot_progress (57);