| Message ID | CACdvmAiDGKxJJx9HuyZ7O9j21a6cijJfnjN3MuCqvYYbBm8q0g@mail.gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | autoboot: fix typos of CONFIG_AUTOBOOT_USE_MENUKEY | expand |
On Mon, Jun 21, 2021 at 10:39:19PM -0400, Da Xue wrote: > replace typo CONFIG_USE_AUTOBOOT_MENUKEY with CONFIG_AUTOBOOT_USE_MENUKEY > > Signed-off-by: Da Xue <da@libre.computer> Applied to u-boot/master, thanks!
Hi Tom, There is a distinction between the two flags CONFIG_AUTOBOOT_USE_MENUKEY AND CONFIG_AUTOBOOT_MENUKEY. config AUTOBOOT_USE_MENUKEY bool "Allow a specify key to run a menu from the environment" depends on !AUTOBOOT_KEYED help If a specific key is pressed to stop autoboot, then the commands in the environment variable 'menucmd' are executed before boot starts. config AUTOBOOT_MENUKEY int "ASCII value of boot key to show a menu" default 0 depends on AUTOBOOT_USE_MENUKEY help If this key is pressed to stop autoboot, then the commands in the environment variable 'menucmd' will be executed before boot starts. For example, 33 means "!" in ASCII, so pressing ! at boot would take this action. The modified patch that was merged causes Kconfig to remove both flags. I will send another patch. Best, Da On Thu, Jun 24, 2021 at 9:16 AM Tom Rini <trini@konsulko.com> wrote: > On Mon, Jun 21, 2021 at 10:39:19PM -0400, Da Xue wrote: > > > replace typo CONFIG_USE_AUTOBOOT_MENUKEY with CONFIG_AUTOBOOT_USE_MENUKEY > > > > Signed-off-by: Da Xue <da@libre.computer> > > Applied to u-boot/master, thanks! > > -- > Tom >
On Fri, Jul 02, 2021 at 12:22:01PM -0400, Da Xue wrote: > Hi Tom, > > There is a distinction between the two flags CONFIG_AUTOBOOT_USE_MENUKEY > AND CONFIG_AUTOBOOT_MENUKEY. > > config AUTOBOOT_USE_MENUKEY > bool "Allow a specify key to run a menu from the environment" > depends on !AUTOBOOT_KEYED > help > If a specific key is pressed to stop autoboot, then the commands in > the environment variable 'menucmd' are executed before boot starts. > > config AUTOBOOT_MENUKEY > int "ASCII value of boot key to show a menu" > default 0 > depends on AUTOBOOT_USE_MENUKEY > help > If this key is pressed to stop autoboot, then the commands in the > environment variable 'menucmd' will be executed before boot starts. > For example, 33 means "!" in ASCII, so pressing ! at boot would take > this action. > > The modified patch that was merged causes Kconfig to remove both flags. I > will send another patch. Ah, thanks for catching that!
diff --git a/common/autoboot.c b/common/autoboot.c index 0bb08e7a4c..e201c01ece 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -44,8 +44,8 @@ static int menukey; #define AUTOBOOT_STOP_STR_SHA256 "" #endif -#ifdef CONFIG_USE_AUTOBOOT_MENUKEY -#define AUTOBOOT_MENUKEY CONFIG_USE_AUTOBOOT_MENUKEY +#if defined(CONFIG_AUTOBOOT_USE_MENUKEY) && defined(CONFIG_AUTOBOOT_MENUKEY) +#define AUTOBOOT_MENUKEY CONFIG_AUTOBOOT_MENUKEY #else #define AUTOBOOT_MENUKEY 0
replace typo CONFIG_USE_AUTOBOOT_MENUKEY with CONFIG_AUTOBOOT_USE_MENUKEY Signed-off-by: Da Xue <da@libre.computer> --- common/autoboot.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) #endif @@ -282,7 +282,7 @@ static int abortboot_single_key(int bootdelay) abort = 1; /* don't auto boot */ bootdelay = 0; /* no more delay */ key = getchar();/* consume input */ - if (IS_ENABLED(CONFIG_USE_AUTOBOOT_MENUKEY)) + if (IS_ENABLED(CONFIG_AUTOBOOT_USE_MENUKEY)) menukey = key; break; } @@ -388,7 +388,7 @@ void autoboot_command(const char *s) disable_ctrlc(prev); /* restore Ctrl-C checking */ } - if (IS_ENABLED(CONFIG_USE_AUTOBOOT_MENUKEY) && + if (IS_ENABLED(CONFIG_AUTOBOOT_USE_MENUKEY) && menukey == AUTOBOOT_MENUKEY) { s = env_get("menucmd"); if (s) -- 2.20.1