projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
[oweals/u-boot.git]
/
common
/
log.c
diff --git
a/common/log.c
b/common/log.c
index 59869cd29dabba5375e5897f96a0f46a53f29ebb..c5b9b489ca3775f2376a72fa8747e60b5cee1aa3 100644
(file)
--- a/
common/log.c
+++ b/
common/log.c
@@
-233,7
+233,7
@@
int log_add_filter(const char *drv_name, enum log_category_t cat_list[],
ldev = log_device_find_by_name(drv_name);
if (!ldev)
return -ENOENT;
ldev = log_device_find_by_name(drv_name);
if (!ldev)
return -ENOENT;
- filt =
(struct log_filter *)
calloc(1, sizeof(*filt));
+ filt = calloc(1, sizeof(*filt));
if (!filt)
return -ENOMEM;
if (!filt)
return -ENOMEM;
@@
-315,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 = CONFIG_LOG_DEFAULT_LEVEL;
gd->log_fmt = LOGF_DEFAULT;
return 0;
gd->log_fmt = LOGF_DEFAULT;
return 0;