[PATCH] autoboot: fix typos of CONFIG_AUTOBOOT_USE_MENUKEY

[PATCH] autoboot: fix typos of CONFIG_AUTOBOOT_USE_MENUKEY

[Da Xue]

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(-)

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
 #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

Re: [PATCH] autoboot: fix typos of CONFIG_AUTOBOOT_USE_MENUKEY

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 234 bytes --]

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCH] autoboot: fix typos of CONFIG_AUTOBOOT_USE_MENUKEY

[Da Xue]

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
>


-- 

Best,

Da Xue
General Manager
Imprecision Systems LLC

TEL: +1 (856) 562-6108 (WhatsApp)
FAX: +1 856-624-3969

Re: [PATCH] autoboot: fix typos of CONFIG_AUTOBOOT_USE_MENUKEY

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 985 bytes --]

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!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]