Skip to content

Commit ba501c8

Browse files
committed
Revert "autoboot: use default environment if debricking board"
This reverts commit ae5de28. Revert this for now as it breaks other platforms that do not use a sys_proto.h header. Signed-off-by: Jon Nettleton <[email protected]>
1 parent 350104d commit ba501c8

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

common/autoboot.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
#include <post.h>
1515
#include <u-boot/sha256.h>
1616
#include <bootcount.h>
17-
#include <asm/arch/sys_proto.h>
18-
#include <environment.h>
1917

2018
DECLARE_GLOBAL_DATA_PTR;
2119

@@ -298,10 +296,6 @@ const char *bootdelay_process(void)
298296

299297
s = env_get("bootdelay");
300298
bootdelay = s ? (int)simple_strtol(s, NULL, 10) : CONFIG_BOOTDELAY;
301-
if (is_usb_boot()) {
302-
bootdelay = 1;
303-
set_default_env("!Started from usb", 0);
304-
}
305299

306300
#ifdef CONFIG_OF_CONTROL
307301
bootdelay = fdtdec_get_config_int(gd->fdt_blob, "bootdelay",

0 commit comments

Comments
 (0)