mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-25 14:10:43 +00:00
Revert "[new uImage] Add autostart flag to bootm_headers structure"
This reverts commit f5614e7926
.
The commit was based on a misunderstanding of the (documented)
meaning of the 'autostart' environment variable. It might cause
boards to hang if 'autostart' was used, with the potential to brick
them. Go back to the documented behaviour.
Conflicts:
common/cmd_bootm.c
common/image.c
include/image.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
parent
dedec4cfc8
commit
0bf202ec58
3 changed files with 16 additions and 2 deletions
|
@ -138,7 +138,6 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
|
||||
memset ((void *)&images, 0, sizeof (images));
|
||||
images.verify = getenv_yesno ("verify");
|
||||
images.autostart = getenv_yesno ("autostart");
|
||||
images.lmb = &lmb;
|
||||
|
||||
lmb_init(&lmb);
|
||||
|
|
|
@ -189,6 +189,22 @@ int image_check_dcrc (image_header_t *hdr)
|
|||
return (dcrc == image_get_dcrc (hdr));
|
||||
}
|
||||
|
||||
void memmove_wd (void *to, void *from, size_t len, ulong chunksz)
|
||||
{
|
||||
#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
|
||||
while (len > 0) {
|
||||
size_t tail = (len > chunksz) ? chunksz : len;
|
||||
WATCHDOG_RESET ();
|
||||
memmove (to, from, tail);
|
||||
to += tail;
|
||||
from += tail;
|
||||
len -= tail;
|
||||
}
|
||||
#else /* !(CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG) */
|
||||
memmove (to, from, len);
|
||||
#endif /* CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG */
|
||||
}
|
||||
#endif /* USE_HOSTCC */
|
||||
|
||||
/**
|
||||
* image_multi_count - get component (sub-image) count
|
||||
|
|
|
@ -220,7 +220,6 @@ typedef struct bootm_headers {
|
|||
#endif
|
||||
|
||||
int verify; /* getenv("verify")[0] != 'n' */
|
||||
int autostart; /* getenv("autostart")[0] != 'n' */
|
||||
struct lmb *lmb; /* for memory mgmt */
|
||||
} bootm_headers_t;
|
||||
|
||||
|
|
Loading…
Reference in a new issue