diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-10 16:22:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-10 16:22:57 -0400 |
| commit | 4a9146c29573dbfa661918280d9522a01f6ca919 (patch) | |
| tree | b1b135237dcfee94a27e8df7ce2208230c28b894 /include/log.h | |
| parent | f30924739975b4f60c0862b539790fdcdb7da20c (diff) | |
| parent | 6c3fc50ee59366df62e8345ea9fd86c3ace0c3f1 (diff) | |
Merge tag 'dm-pull-10jul20' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
of-platdata: better phandle and compatible-string support
patman support for Python3 on Ubuntu 14.04
new checkpatch check to avoid #ifdefs
Diffstat (limited to 'include/log.h')
| -rw-r--r-- | include/log.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/include/log.h b/include/log.h index df65398c04..2859ce1f2e 100644 --- a/include/log.h +++ b/include/log.h @@ -12,6 +12,7 @@ #include <stdio.h> #include <linker_lists.h> #include <dm/uclass-id.h> +#include <linux/bitops.h> #include <linux/list.h> struct cmd_tbl; @@ -411,7 +412,6 @@ enum log_fmt { LOGF_MSG, LOGF_COUNT, - LOGF_DEFAULT = (1 << LOGF_FUNC) | (1 << LOGF_MSG), LOGF_ALL = 0x3f, }; @@ -460,4 +460,20 @@ static inline int log_init(void) } #endif +/** + * log_get_default_format() - get default log format + * + * The default log format is configurable via + * CONFIG_LOGF_FILE, CONFIG_LOGF_LINE, CONFIG_LOGF_FUNC. + * + * Return: default log format + */ +static inline int log_get_default_format(void) +{ + return BIT(LOGF_MSG) | + (IS_ENABLED(CONFIG_LOGF_FILE) ? BIT(LOGF_FILE) : 0) | + (IS_ENABLED(CONFIG_LOGF_LINE) ? BIT(LOGF_LINE) : 0) | + (IS_ENABLED(CONFIG_LOGF_FUNC) ? BIT(LOGF_FUNC) : 0); +} + #endif |