summaryrefslogtreecommitdiff
path: root/include/image.h
diff options
context:
space:
mode:
authorMarian Balakowicz <m8@semihalf.com>2008-04-11 11:07:49 +0200
committerWolfgang Denk <wd@denx.de>2008-04-17 23:59:05 -0700
commitcb1c4896905ab22fcd982e6a8a539f0031942e71 (patch)
tree31e02bd5eb93e4692cb23289a108beb951211e91 /include/image.h
parentde2b3216e6b4f3b2fe93759c05b17504f9dfe036 (diff)
downloadu-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 'include/image.h')
-rw-r--r--include/image.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/image.h b/include/image.h
index c1a6cbb..60fdb2b 100644
--- a/include/image.h
+++ b/include/image.h
@@ -197,7 +197,8 @@ typedef struct bootm_headers {
* then boot_get_ramdisk() and get_fdt() will attempt to get
* data from second and third component accordingly.
*/
- image_header_t *legacy_hdr_os;
+ image_header_t *legacy_hdr_os; /* image header pointer */
+ image_header_t legacy_hdr_os_copy; /* header copy */
ulong legacy_hdr_valid;
#if defined(CONFIG_FIT)