mirror of
https://github.com/smaeul/u-boot.git
synced 2025-11-03 21:48:15 +00:00
cb1c489690
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>
82 lines
2.1 KiB
C
82 lines
2.1 KiB
C
/*
|
|
* (C) Copyright 2007 Michal Simek
|
|
* (C) Copyright 2004 Atmark Techno, Inc.
|
|
*
|
|
* Michal SIMEK <monstr@monstr.eu>
|
|
* Yasushi SHOJI <yashi@atmark-techno.com>
|
|
*
|
|
* See file CREDITS for list of people who contributed to this
|
|
* project.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
|
* MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <command.h>
|
|
#include <image.h>
|
|
#include <zlib.h>
|
|
#include <asm/byteorder.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
|
|
|
|
void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
|
bootm_headers_t *images)
|
|
{
|
|
/* First parameter is mapped to $r5 for kernel boot args */
|
|
void (*theKernel) (char *);
|
|
char *commandline = getenv ("bootargs");
|
|
ulong ep = 0;
|
|
|
|
/* find kernel entry point */
|
|
if (images->legacy_hdr_valid) {
|
|
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,
|
|
images->fit_noffset_os, &ep);
|
|
if (ret) {
|
|
puts ("Can't get entry point property!\n");
|
|
goto error;
|
|
}
|
|
#endif
|
|
} else {
|
|
puts ("Could not find kernel entry point!\n");
|
|
goto error;
|
|
}
|
|
theKernel = (void (*)(char *))ep;
|
|
|
|
show_boot_progress (15);
|
|
|
|
#ifdef DEBUG
|
|
printf ("## Transferring control to Linux (at address %08lx) ...\n",
|
|
(ulong) theKernel);
|
|
#endif
|
|
|
|
if (!images->autostart)
|
|
return ;
|
|
|
|
theKernel (commandline);
|
|
/* does not return */
|
|
return;
|
|
|
|
error:
|
|
if (images->autostart)
|
|
do_reset (cmdtp, flag, argc, argv);
|
|
return;
|
|
}
|