From cb1c4896905ab22fcd982e6a8a539f0031942e71 Mon Sep 17 00:00:00 2001 From: Marian Balakowicz Date: Fri, 11 Apr 2008 11:07:49 +0200 Subject: Restore the ability to continue booting after legacy image overwrite Before new uImage code was merged, bootm code allowed for the kernel image to get overwritten during decompresion. new uImage introduced a check for image overwrites and refused to boot the image that got overwritten. This patch restores the old behavior. It also adds a warning when the image overwriten is a multi-image file, because in such case accessing componentes other than the first one will fail. Signed-off-by: Marian Balakowicz --- lib_microblaze/bootm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib_microblaze') diff --git a/lib_microblaze/bootm.c b/lib_microblaze/bootm.c index fab4a54..30a03ef 100644 --- a/lib_microblaze/bootm.c +++ b/lib_microblaze/bootm.c @@ -44,7 +44,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[], /* find kernel entry point */ if (images->legacy_hdr_valid) { - ep = image_get_ep (images->legacy_hdr_os); + ep = image_get_ep (&images->legacy_hdr_os_copy); #if defined(CONFIG_FIT) } else if (images->fit_uname_os) { int ret = fit_image_get_entry (images->fit_hdr_os, -- cgit v1.1