projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
riscv: align mtvec on a 4-byte boundary
[oweals/u-boot.git]
/
common
/
log.c
diff --git
a/common/log.c
b/common/log.c
index 66d5e3ebf85b773cfb5807b70a9ce4bf387425ce..ec14644516c14d70bcd4d94438a42653f2cd4cc5 100644
(file)
--- a/
common/log.c
+++ b/
common/log.c
@@
-1,10
+1,9
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Logging support
*
* Copyright (c) 2017 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
/*
* Logging support
*
* Copyright (c) 2017 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
@@
-39,12
+38,16
@@
static const char *log_level_name[LOGL_COUNT] = {
const char *log_get_cat_name(enum log_category_t cat)
{
const char *log_get_cat_name(enum log_category_t cat)
{
- if (cat > LOGC_COUNT)
- return "invalid";
+ const char *name;
+
+ if (cat < 0 || cat >= LOGC_COUNT)
+ return "<invalid>";
if (cat >= LOGC_NONE)
return log_cat_name[cat - LOGC_NONE];
if (cat >= LOGC_NONE)
return log_cat_name[cat - LOGC_NONE];
- return uclass_get_name((enum uclass_id)cat);
+ name = uclass_get_name((enum uclass_id)cat);
+
+ return name ? name : "<missing>";
}
enum log_category_t log_get_cat_by_name(const char *name)
}
enum log_category_t log_get_cat_by_name(const char *name)
@@
-312,7
+315,8
@@
int log_init(void)
drv++;
}
gd->flags |= GD_FLG_LOG_READY;
drv++;
}
gd->flags |= GD_FLG_LOG_READY;
- gd->default_log_level = LOGL_INFO;
+ if (!gd->default_log_level)
+ gd->default_log_level = LOGL_INFO;
gd->log_fmt = LOGF_DEFAULT;
return 0;
gd->log_fmt = LOGF_DEFAULT;
return 0;