diff options
| author | Kumar Gala | 2008-02-27 21:51:48 -0600 |
|---|---|---|
| committer | Marian Balakowicz | 2008-02-29 13:15:56 +0100 |
| commit | f5614e7926863bf0225ec860d9b319741a9c4004 (patch) | |
| tree | 7e8a128eb6e56227c967e9244531c8eb1efcaf6a /common | |
| parent | 4ed6552f715983bfc7d212c1199a1f796f1144ad (diff) | |
[new uImage] Add autostart flag to bootm_headers structure
The autostart env variable was dropped as part of the initial new uImage
cleanup. Add it back here so the arch specific code can decide if it
wants to really boot or not.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Marian Balakowicz <m8@semihalf.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_bootm.c | 1 | ||||
| -rw-r--r-- | common/image.c | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 92c18d059d7..92c2f4e83aa 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -123,6 +123,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) memset ((void *)&images, 0, sizeof (images)); images.verify = getenv_verify(); + images.autostart = getenv_autostart(); images.lmb = &lmb; lmb_init(&lmb); diff --git a/common/image.c b/common/image.c index d4acb6b5bee..4f2ff9c9771 100644 --- a/common/image.c +++ b/common/image.c @@ -126,6 +126,12 @@ int getenv_verify (void) return (s && (*s == 'n')) ? 0 : 1; } +int getenv_autostart (void) +{ + char *s = getenv ("autostart"); + return (s && (*s == 'n')) ? 0 : 1; +} + void memmove_wd (void *to, void *from, size_t len, ulong chunksz) { #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) |