diff options
| author | Tom Rini <[email protected]> | 2021-09-04 15:43:59 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-09-04 15:43:59 -0400 |
| commit | 21b86803ebb1b00cd40487f466905c73722752ac (patch) | |
| tree | bc6e51a4c759f59065d86c25ab0bb110addd28aa /lib | |
| parent | a48f5ff4f523a59cdf025a4cbafd0cb3a932809f (diff) | |
| parent | 9f6649209f09adcdcec4f194cbca9bdcf9c43bef (diff) | |
Merge branch '2021-09-04-makefile-cleanups-part-b' into next
- Further Makefile/Kconfig namespace cleanups from Simon. This migrates
a number of symbols to Kconfig and replaces some inconsistencies
between CONFIG_FOO and CONFIG_SPL_FOO_SUPPORT/CONFIG_TPL_FOO_SUPPORT.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/hang.c | 2 | ||||
| -rw-r--r-- | lib/tiny-printf.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/hang.c b/lib/hang.c index 578ac78d453..2735774f9a4 100644 --- a/lib/hang.c +++ b/lib/hang.c @@ -24,7 +24,7 @@ void hang(void) { #if !defined(CONFIG_SPL_BUILD) || \ (CONFIG_IS_ENABLED(LIBCOMMON_SUPPORT) && \ - CONFIG_IS_ENABLED(SERIAL_SUPPORT)) + CONFIG_IS_ENABLED(SERIAL)) puts("### ERROR ### Please RESET the board ###\n"); #endif bootstage_error(BOOTSTAGE_ID_NEED_RESET); diff --git a/lib/tiny-printf.c b/lib/tiny-printf.c index 89aaa854771..f661fc65054 100644 --- a/lib/tiny-printf.c +++ b/lib/tiny-printf.c @@ -48,7 +48,7 @@ static void div_out(struct printf_info *info, unsigned long *num, out_dgt(info, dgt); } -#ifdef CONFIG_SPL_NET_SUPPORT +#ifdef CONFIG_SPL_NET static void string(struct printf_info *info, char *s) { char ch; @@ -178,7 +178,7 @@ static void __maybe_unused pointer(struct printf_info *info, const char *fmt, } break; #endif -#ifdef CONFIG_SPL_NET_SUPPORT +#ifdef CONFIG_SPL_NET case 'm': return mac_address_string(info, ptr, false); case 'M': @@ -270,7 +270,7 @@ static int _vprintf(struct printf_info *info, const char *fmt, va_list va) } break; case 'p': - if (CONFIG_IS_ENABLED(NET_SUPPORT) || _DEBUG) { + if (CONFIG_IS_ENABLED(NET) || _DEBUG) { pointer(info, fmt, va_arg(va, void *)); /* * Skip this because it pulls in _ctype which is |