* MA 02111-1307 USA
*/
-#define DEBUG
/*
* Boot support
ulong image_start, image_end;
ulong load_start, load_end;
ulong mem_start, mem_size;
-#if defined(CONFIG_FIT)
- int os_noffset;
-#endif
struct lmb lmb;
return 1;
}
- show_boot_progress (6);
-
/* get image parameters */
switch (genimg_get_format (os_hdr)) {
case IMAGE_FORMAT_LEGACY:
break;
#if defined(CONFIG_FIT)
case IMAGE_FORMAT_FIT:
- os_noffset = fit_image_get_node (images.fit_hdr_os,
- images.fit_uname_os);
- if (os_noffset < 0) {
- printf ("Can't get image node for '%s'!\n",
- images.fit_uname_os);
- return 1;
- }
-
- if (fit_image_get_type (images.fit_hdr_os, os_noffset, &type)) {
+ if (fit_image_get_type (images.fit_hdr_os,
+ images.fit_noffset_os, &type)) {
puts ("Can't get image type!\n");
+ show_boot_progress (-109);
return 1;
}
- if (fit_image_get_comp (images.fit_hdr_os, os_noffset, &comp)) {
+ if (fit_image_get_comp (images.fit_hdr_os,
+ images.fit_noffset_os, &comp)) {
puts ("Can't get image compression!\n");
+ show_boot_progress (-110);
return 1;
}
- if (fit_image_get_os (images.fit_hdr_os, os_noffset, &os)) {
+ if (fit_image_get_os (images.fit_hdr_os,
+ images.fit_noffset_os, &os)) {
puts ("Can't get image OS!\n");
+ show_boot_progress (-111);
return 1;
}
image_end = fit_get_end (images.fit_hdr_os);
- if (fit_image_get_load (images.fit_hdr_os, os_noffset,
+ if (fit_image_get_load (images.fit_hdr_os, images.fit_noffset_os,
&load_start)) {
puts ("Can't get image load address!\n");
+ show_boot_progress (-112);
return 1;
}
break;
printf (" Uncompressing %s ... ", type_name);
if (gunzip ((void *)load_start, unc_len,
(uchar *)os_data, &os_len) != 0) {
- puts ("GUNZIP ERROR - must RESET board to recover\n");
+ puts ("GUNZIP: uncompress or overwrite error "
+ "- must RESET board to recover\n");
show_boot_progress (-6);
do_reset (cmdtp, flag, argc, argv);
}
&unc_len, (char *)os_data, os_len,
CFG_MALLOC_LEN < (4096 * 1024), 0);
if (i != BZ_OK) {
- printf ("BUNZIP2 ERROR %d - must RESET board to recover\n", i);
+ printf ("BUNZIP2: uncompress or overwrite error %d "
+ "- must RESET board to recover\n", i);
show_boot_progress (-6);
do_reset (cmdtp, flag, argc, argv);
}
debug ("load_start = 0x%lx, load_end = 0x%lx\n", load_start, load_end);
puts ("ERROR: image overwritten - must RESET the board to recover.\n");
+ show_boot_progress (-113);
do_reset (cmdtp, flag, argc, argv);
}
show_boot_progress (-9);
#ifdef DEBUG
puts ("\n## Control returned to monitor - resetting...\n");
- do_reset (cmdtp, flag, argc, argv);
+ if (images.autostart)
+ do_reset (cmdtp, flag, argc, argv);
#endif
+ if (!images.autostart && iflag)
+ enable_interrupts();
+
return 1;
}
puts (" Verifying Hash Integrity ... ");
if (!fit_image_check_hashes (fit, os_noffset)) {
puts ("Bad Data Hash\n");
+ show_boot_progress (-104);
return 0;
}
puts ("OK\n");
}
-
+ show_boot_progress (105);
+
+#ifdef CONFIG_LOGBUFFER
+#ifndef CONFIG_ALT_LB_ADDR
+ kbd=gd->bd;
+ /* Prevent initrd from overwriting logbuffer */
+ if (initrd_high < (kbd->bi_memsize-LOGBUFF_LEN-LOGBUFF_OVERHEAD))
+ initrd_high = kbd->bi_memsize-LOGBUFF_LEN-LOGBUFF_OVERHEAD;
+ debug ("## Logbuffer at 0x%08lX ", kbd->bi_memsize-LOGBUFF_LEN);
+#else
+ debug ("## Logbuffer at 0x%08lX ", CONFIG_ALT_LB_ADDR);
+#endif
+#endif
if (!fit_image_check_target_arch (fit, os_noffset)) {
puts ("Unsupported Architecture\n");
+ show_boot_progress (-105);
return 0;
}
+ show_boot_progress (106);
if (!fit_image_check_type (fit, os_noffset, IH_TYPE_KERNEL)) {
puts ("Not a kernel image\n");
+ show_boot_progress (-106);
return 0;
}
+ show_boot_progress (107);
return 1;
}
#endif /* CONFIG_FIT */
const char *fit_uname_kernel = NULL;
const void *data;
size_t len;
- int conf_noffset;
+ int cfg_noffset;
int os_noffset;
#endif
images->legacy_hdr_os = hdr;
images->legacy_hdr_valid = 1;
+ show_boot_progress (6);
break;
#if defined(CONFIG_FIT)
case IMAGE_FORMAT_FIT:
if (!fit_check_format (fit_hdr)) {
puts ("Bad FIT kernel image format!\n");
+ show_boot_progress (-100);
return NULL;
}
+ show_boot_progress (100);
if (!fit_uname_kernel) {
/*
* node first. If config unit node name is NULL
* fit_conf_get_node() will try to find default config node
*/
- conf_noffset = fit_conf_get_node (fit_hdr, fit_uname_config);
- if (conf_noffset < 0)
+ show_boot_progress (101);
+ cfg_noffset = fit_conf_get_node (fit_hdr, fit_uname_config);
+ if (cfg_noffset < 0) {
+ show_boot_progress (-101);
return NULL;
+ }
+ /* save configuration uname provided in the first
+ * bootm argument
+ */
+ images->fit_uname_cfg = fdt_get_name (fit_hdr, cfg_noffset, NULL);
+ printf (" Using '%s' configuration\n", images->fit_uname_cfg);
+ show_boot_progress (103);
- os_noffset = fit_conf_get_kernel_node (fit_hdr, conf_noffset);
+ os_noffset = fit_conf_get_kernel_node (fit_hdr, cfg_noffset);
fit_uname_kernel = fit_get_name (fit_hdr, os_noffset, NULL);
} else {
/* get kernel component image node offset */
+ show_boot_progress (102);
os_noffset = fit_image_get_node (fit_hdr, fit_uname_kernel);
}
- if (os_noffset < 0)
+ if (os_noffset < 0) {
+ show_boot_progress (-103);
return NULL;
+ }
printf (" Trying '%s' kernel subimage\n", fit_uname_kernel);
+ show_boot_progress (104);
if (!fit_check_kernel (fit_hdr, os_noffset, images->verify))
return NULL;
/* get kernel image data address and length */
if (fit_image_get_data (fit_hdr, os_noffset, &data, &len)) {
puts ("Could not find kernel subimage data!\n");
+ show_boot_progress (-107);
return NULL;
}
+ show_boot_progress (108);
*os_len = len;
*os_data = (ulong)data;
images->fit_hdr_os = fit_hdr;
images->fit_uname_os = fit_uname_kernel;
+ images->fit_noffset_os = os_noffset;
break;
#endif
default:
printf ("Wrong Image Format for %s command\n", cmdtp->name);
+ show_boot_progress (-108);
return NULL;
}