summaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2021-10-22 06:08:52 +0300
committerTom Rini <trini@konsulko.com>2021-11-16 22:35:09 +0300
commit78398652723b6fe743751ffb19d8256b7e3e0a4e (patch)
tree9e86d3aeaf5e46cd0e23bbb8bfc0e6e5406617e0 /boot
parent1d192d5bccc6e4b9e7112f720ccc47786694ee39 (diff)
downloadu-boot-78398652723b6fe743751ffb19d8256b7e3e0a4e.tar.xz
bootm: Tidy up use of autostart env var
This has different semantics in different places. Go with the bootm method and put it in a common function so that the behaviour is consistent in U-Boot. Update the docs. To be clear, this changes the way that 'bootelf' and standalone boot work. Before, if autostart was set to "fred" or "YES", for example, they would consider that a "yes". This may change behaviour for some boards, but the only in-tree boards which mention autostart use "no" to disable it, which will still work. Signed-off-by: Simon Glass <sjg@chromium.org> Suggested-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'boot')
-rw-r--r--boot/bootm_os.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/boot/bootm_os.c b/boot/bootm_os.c
index e635c72709..f31820cd07 100644
--- a/boot/bootm_os.c
+++ b/boot/bootm_os.c
@@ -26,12 +26,9 @@ DECLARE_GLOBAL_DATA_PTR;
static int do_bootm_standalone(int flag, int argc, char *const argv[],
bootm_headers_t *images)
{
- char *s;
int (*appl)(int, char *const[]);
- /* Don't start if "autostart" is set to "no" */
- s = env_get("autostart");
- if ((s != NULL) && !strcmp(s, "no")) {
+ if (!env_get_autostart()) {
env_set_hex("filesize", images->os.image_len);
return 0;
}