diff options
| author | Tom Rini <[email protected]> | 2021-06-23 08:45:09 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-06-23 08:45:09 -0400 |
| commit | 6fc0a2f76bc285dc4bc80f55452311385e6c3d57 (patch) | |
| tree | aa741bbc7cb8e0208b7e21c870fdc39f9ca99ae6 /common | |
| parent | 1ce892cb1ce970d8ee6ffcecc22351c84e67fca4 (diff) | |
| parent | b2710faf82998d7be9e4eef554063a5e27e88ec9 (diff) | |
Merge branch '2021-06-22-assorted-fixes'
- Assorted minor bugfixes
Diffstat (limited to 'common')
| -rw-r--r-- | common/autoboot.c | 8 | ||||
| -rw-r--r-- | common/dlmalloc.c | 10 |
2 files changed, 14 insertions, 4 deletions
diff --git a/common/autoboot.c b/common/autoboot.c index 0bb08e7a4cf..c0b71af4d16 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 +#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) diff --git a/common/dlmalloc.c b/common/dlmalloc.c index cf0270a9c11..11729e8c85b 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -1,3 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * This code is based on a version (aka dlmalloc) of malloc/free/realloc written + * by Doug Lea and released to the public domain, as explained at + * http://creativecommons.org/publicdomain/zero/1.0/- + * + * The original code is available at http://gee.cs.oswego.edu/pub/misc/ + * as file malloc-2.6.6.c. + */ + #include <common.h> #include <log.h> #include <asm/global_data.h> |