summaryrefslogtreecommitdiff
path: root/lib/tiny-printf.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-10-04 11:27:55 -0400
committerTom Rini <trini@konsulko.com>2021-10-04 11:28:16 -0400
commit50c84208ad50a27382c64af911abba4510a8b608 (patch)
tree1b79a2e167ca4094d4adc80ab1195f42e792e309 /lib/tiny-printf.c
parentd80bb749fab53da72c4a0e09b8c2d2aaa3103c91 (diff)
parente17cbdd050f7127737988997f4a01583b34f7c96 (diff)
Merge branch 'next'
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'lib/tiny-printf.c')
-rw-r--r--lib/tiny-printf.c6
1 files changed, 3 insertions, 3 deletions
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