diff options
| author | Marian Balakowicz <m8@semihalf.com> | 2008-04-11 11:07:49 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-04-17 23:59:05 -0700 |
| commit | cb1c4896905ab22fcd982e6a8a539f0031942e71 (patch) | |
| tree | 31e02bd5eb93e4692cb23289a108beb951211e91 /common/image.c | |
| parent | de2b3216e6b4f3b2fe93759c05b17504f9dfe036 (diff) | |
| download | u-boot-imx-cb1c4896905ab22fcd982e6a8a539f0031942e71.zip u-boot-imx-cb1c4896905ab22fcd982e6a8a539f0031942e71.tar.gz u-boot-imx-cb1c4896905ab22fcd982e6a8a539f0031942e71.tar.bz2 | |
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 <m8@semihalf.com>
Diffstat (limited to 'common/image.c')
| -rw-r--r-- | common/image.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/image.c b/common/image.c index 9e63432..d218f2f 100644 --- a/common/image.c +++ b/common/image.c @@ -983,7 +983,7 @@ int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images, #endif /* CONFIG_B2 || CONFIG_EVB4510 || CONFIG_ARMADILLO */ } else if (images->legacy_hdr_valid && - image_check_type (images->legacy_hdr_os, IH_TYPE_MULTI)) { + image_check_type (&images->legacy_hdr_os_copy, IH_TYPE_MULTI)) { /* * Now check if we have a legacy mult-component image, * get second entry data start address and len. |