Skip to content

Commit

Permalink
autoboot: use default environment if debricking board
Browse files Browse the repository at this point in the history
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
  • Loading branch information
tkisky authored and jnettlet committed Nov 28, 2018
1 parent a75ad6b commit ae5de28
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions common/autoboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
#include <post.h>
#include <u-boot/sha256.h>
#include <bootcount.h>
#include <asm/arch/sys_proto.h>
#include <environment.h>

DECLARE_GLOBAL_DATA_PTR;

Expand Down Expand Up @@ -296,6 +298,10 @@ const char *bootdelay_process(void)

s = env_get("bootdelay");
bootdelay = s ? (int)simple_strtol(s, NULL, 10) : CONFIG_BOOTDELAY;
if (is_usb_boot()) {
bootdelay = 1;
set_default_env("!Started from usb", 0);
}

#ifdef CONFIG_OF_CONTROL
bootdelay = fdtdec_get_config_int(gd->fdt_blob, "bootdelay",
Expand Down

0 comments on commit ae5de28

Please sign in to comment.