Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 07:04:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

autoboot: fix typos of CONFIG_AUTOBOOT_USE_MENUKEY

Browse source 
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: 8fc31e23aa ("autoboot: Rename CONFIG_MENUKEY to CONFIG_AUTOBOOT_MENUKEY")
Signed-off-by: Da Xue <da@libre.computer>
This commit is contained in:
Da Xue 2021-06-21 22:39:19 -04:00 committed by Tom Rini
parent c7d1b18908
commit 5a87df8380
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/autoboot.c
View file

@ -44,8 +44,8 @@ static int menukey;
#define AUTOBOOT_STOP_STR_SHA256 "" #define AUTOBOOT_STOP_STR_SHA256 ""
#endif #endif
#ifdef CONFIG_USE_AUTOBOOT_MENUKEY #ifdef CONFIG_AUTOBOOT_USE_MENUKEY
#define AUTOBOOT_MENUKEY CONFIG_USE_AUTOBOOT_MENUKEY #define AUTOBOOT_MENUKEY CONFIG_AUTOBOOT_USE_MENUKEY
#else #else
#define AUTOBOOT_MENUKEY 0 #define AUTOBOOT_MENUKEY 0
#endif #endif
@ -282,7 +282,7 @@ static int abortboot_single_key(int bootdelay)
abort = 1; /* don't auto boot */ abort = 1; /* don't auto boot */
bootdelay = 0; /* no more delay */ bootdelay = 0; /* no more delay */
key = getchar();/* consume input */ key = getchar();/* consume input */
if (IS_ENABLED(CONFIG_USE_AUTOBOOT_MENUKEY)) if (IS_ENABLED(CONFIG_AUTOBOOT_USE_MENUKEY))
menukey = key; menukey = key;
break; break;
} }
@ -388,7 +388,7 @@ void autoboot_command(const char *s)
disable_ctrlc(prev); /* restore Ctrl-C checking */ disable_ctrlc(prev); /* restore Ctrl-C checking */
} }
if (IS_ENABLED(CONFIG_USE_AUTOBOOT_MENUKEY) && if (IS_ENABLED(CONFIG_AUTOBOOT_USE_MENUKEY) &&
menukey == AUTOBOOT_MENUKEY) { menukey == AUTOBOOT_MENUKEY) {
s = env_get("menucmd"); s = env_get("menucmd");
if (s) if (s)