02 Jul, 2016
4 commits
-
Move the bootdelay >= 0 check to the caller, which simplifies
the callees.Signed-off-by: Masahiro Yamada
Reviewed-by: Stefan Roese
Reviewed-by: Simon Glass
Reviewed-by: Heiko Schocher -
Factor out the same code from the callees to the caller.
Signed-off-by: Masahiro Yamada
Reviewed-by: Stefan Roese
Reviewed-by: Simon Glass
Reviewed-by: Heiko Schocher -
Because abortboot_keyed() and abortboot_normal() are not compiled
at the same time, we can rename both of them to __abortboot().
This allows to drop #ifdef from the caller.Signed-off-by: Masahiro Yamada
Reviewed-by: Stefan Roese
Reviewed-by: Simon Glass
Reviewed-by: Heiko Schocher -
As the help message of CONFIG_BOOTDELAY says, CONFIG_BOOTDELAY=-2
means the autoboot with no delay, with no abort check even if
CONFIG_ZERO_BOOTDELAY_CHECK is defined.To sum up, the autoboot behaves as follows:
[1] CONFIG_BOOTDELAY=0 && CONFIG_ZERO_BOOTDELAY_CHECK=y
autoboot with no delay, but you can abort it by key input[2] CONFIG_BOOTDELAY=0 && CONFIG_ZERO_BOOTDELAY_CHECK=n
autoboot with no delay, with no check for abort[3] CONFIG_BOOTDELAY=-1
disable autoboot[4] CONFIG_BOOTDELAY=-2
autoboot with no delay, with no check for abortAs you notice, [2] and [4] come to the same result, which means we
do not need CONFIG_ZERO_BOOTDELAY_CHECK. We can control all the
cases only by CONFIG_BOOTDELAY, like this:[1] CONFIG_BOOTDELAY=0
autoboot with no delay, but you can abort it by key input[2] CONFIG_BOOTDELAY=-1
disable autoboot[3] CONFIG_BOOTDELAY=-2
autoboot with no delay, with no check for abortThis commit converts the logic as follow:
CONFIG_BOOTDELAY=0 && CONFIG_ZERO_BOOTDELAY_CHECK=n
--> CONFIG_BOOTDELAY=-2Signed-off-by: Masahiro Yamada
Reviewed-by: Stefan Roese
Acked-by: Igor Grinberg
Reviewed-by: Simon Glass
Acked-by: Vladimir Zapolskiy
Reviewed-by: Heiko Schocher
Acked-by: Christian Riesch
Acked-by: Hannes Schmelzer
05 Feb, 2016
1 commit
-
The x86 build target "efi-x86" has no TEXT_BASE configured. And with the
introduction of CONFIG_BOOTDELAY for x86, this function is now called
for this board as well. Resulting in compile errors for this target.Without TEXT_BASE it makes no sense to fill these values. So lets only
configure the env variable if TEXT_BASE is defined.Signed-off-by: Stefan Roese
Cc: Simon Glass
Cc: Bin Meng
Cc: Tom Rini
Reviewed-by: Simon Glass
Reviewed-by: Bin Meng
20 Nov, 2015
1 commit
-
The console includes a global variable and several functions that are only
used by a small subset of U-Boot files. Before adding more functions, move
the definitions into their own header file.Signed-off-by: Simon Glass
09 Jun, 2015
2 commits
-
This patch adds the feature to only stop the autobooting, and therefor
boot into the U-Boot prompt, when the input string / password matches
a values that is encypted via a SHA256 hash and saved in the environment.This feature is enabled by defined these config options:
CONFIG_AUTOBOOT_KEYED
CONFIG_AUTOBOOT_STOP_STR_SHA256Signed-off-by: Stefan Roese
Reviewed-by: Simon Glass -
This patch moves the following config options to Kconfig:
CONFIG_AUTOBOOT_KEYED
CONFIG_AUTOBOOT_PROMPT
CONFIG_AUTOBOOT_DELAY_STR
CONFIG_AUTOBOOT_STOP_STR
AUTOBOOT_KEYED_CTRLCSigned-off-by: Stefan Roese
Reviewed-by: Simon Glass
[trini: Drop ip04 and pm9263 configs/ additions, those boards previously
set CONFIG_AUTOBOOT_PROMPT but never used it, re-run savedefconfig over
all boards that did change. Make digsy_mtc_* string include seconds to
match others and not warn. ]
Signed-off-by: Tom Rini
Cc: Masahiro Yamada
08 Jun, 2015
1 commit
-
These defines for a 2nd autoboot stop and delay string are nearly unused. Only
sc3 defines CONFIG_AUTOBOOT_DELAY_STR2. And a patch to remove this most likely
unmaintained board is also posted to the list.By removing these defines the code will become cleaner and moving the remaining
compile options to Kconfig will get easier.Signed-off-by: Stefan Roese
Reviewed-by: Tom Rini
Reviewed-by: Simon Glass
Cc: Wolfgang Denk
Cc: Heiko Schocher
19 Jul, 2014
1 commit
-
Signed-off-by: Jeroen Hofstee
19 Jun, 2014
1 commit
-
Signed-off-by: Jeroen Hofstee
30 May, 2014
4 commits
-
bootdelay_process() never returns in some circumstances, whichs makes the
control flow confusing. Change it so that the decision about how to execute
the boot command is made in the main_loop() code, so it is easier to follow.
Move CLI stuff to cli.c.Signed-off-by: Simon Glass
-
Add a bootretry_ prefix to these two functions, and remove the need for
the #ifdef around everything (it moves to the Makefile).Signed-off-by: Simon Glass
-
This code is only used by one board, so it seems a shame to clutter up
the readline code with it. Move it into its own file.Signed-off-by: Simon Glass
-
The autoboot code is complex and long. It deserves its own file with
a simple interface from main.c.Signed-off-by: Simon Glass