]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
autoboot: fix typos of CONFIG_AUTOBOOT_USE_MENUKEY
authorDa Xue <da@libre.computer>
Tue, 22 Jun 2021 02:39:19 +0000 (22:39 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 22 Jun 2021 18:01:22 +0000 (14:01 -0400)
Replace typo CONFIG_USE_AUTOBOOT_MENUKEY with
CONFIG_AUTOBOOT_USE_MENUKEY as when they were introduced initially there
was some mismatch in which name was used where.

Fixes: 8fc31e23aa83 ("autoboot: Rename CONFIG_MENUKEY to CONFIG_AUTOBOOT_MENUKEY")
Signed-off-by: Da Xue <da@libre.computer>
common/autoboot.c

index 0bb08e7a4cf9366ba0ad58481472bcc0b406e5aa..c0b71af4d169d1874f45579389ad224a3235b915 100644 (file)
@@ -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
+#ifdef CONFIG_AUTOBOOT_USE_MENUKEY
+#define AUTOBOOT_MENUKEY CONFIG_AUTOBOOT_USE_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)