When we import code from Linux, with regular re-sync planned, we want to use printk() and pr_*(). U-Boot does not support them in a clean way. So, people end up with local macros, or compat headers here and there, then we occasionally see build errors of definition conflicts. We have include/linux/compat.h, but putting all sorts of unrelated things into a single header is just a temporal workaround. Hence this patch, to find the best home for all printk variants. If you want to use printk() and friends, please include <linux/printk.h>. This header is self-contained, and pulls in only a few headers. When I was testing this clean-up, I noticed the image size exceeded its platform limit on some boards. This is because all pr_*() that were previously defined as no-op in include/linux/mtd/mtd.h (unless CONFIG_MTD_DEBUG is set), are now enabled. To make such boards happy, this commit also implements CONFIG_LOGLEVEL. The concept is similar to the kernel parameter "loglevel". (Actually, the Kconfig help message was taken from kernel-paremeter.txt of Linux) Messages with a loglevel smaller than console loglevel will be printed. The difference is the loglevel is build-time determined. To save the image size, lower priority pr_*() are compiled out. I set the default of CONFIG_LOGLEVEL to 6, i.e. pr_notice and higher priority messages are compiled in. I adjusted CONFIG_LOGLEVEL to avoid build error for some boards. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> [trini: Add in SPL_LOGLEVEL that is the same as LOGLEVEL] Signed-off-by: Tom Rini <trini@konsulko.com>master
Masahiro Yamada
7 years ago
committed by
Tom Rini
parent
7fea7b1a37
commit
b44b30260f
@ -0,0 +1,79 @@ |
||||
#ifndef __KERNEL_PRINTK__ |
||||
#define __KERNEL_PRINTK__ |
||||
|
||||
#include <stdio.h> |
||||
#include <linux/compiler.h> |
||||
|
||||
#define KERN_EMERG |
||||
#define KERN_ALERT |
||||
#define KERN_CRIT |
||||
#define KERN_ERR |
||||
#define KERN_WARNING |
||||
#define KERN_NOTICE |
||||
#define KERN_INFO |
||||
#define KERN_DEBUG |
||||
#define KERN_CONT |
||||
|
||||
#define printk(fmt, ...) \ |
||||
printf(fmt, ##__VA_ARGS__) |
||||
|
||||
/*
|
||||
* Dummy printk for disabled debugging statements to use whilst maintaining |
||||
* gcc's format checking. |
||||
*/ |
||||
#define no_printk(fmt, ...) \ |
||||
({ \
|
||||
if (0) \
|
||||
printk(fmt, ##__VA_ARGS__); \
|
||||
0; \
|
||||
}) |
||||
|
||||
#define __printk(level, fmt, ...) \ |
||||
({ \
|
||||
level < CONFIG_LOGLEVEL ? printk(fmt, ##__VA_ARGS__) : 0; \
|
||||
}) |
||||
|
||||
#ifndef pr_fmt |
||||
#define pr_fmt(fmt) fmt |
||||
#endif |
||||
|
||||
#define pr_emerg(fmt, ...) \ |
||||
__printk(0, pr_fmt(fmt), ##__VA_ARGS__) |
||||
#define pr_alert(fmt, ...) \ |
||||
__printk(1, pr_fmt(fmt), ##__VA_ARGS__) |
||||
#define pr_crit(fmt, ...) \ |
||||
__printk(2, pr_fmt(fmt), ##__VA_ARGS__) |
||||
#define pr_err(fmt, ...) \ |
||||
__printk(3, pr_fmt(fmt), ##__VA_ARGS__) |
||||
#define pr_warning(fmt, ...) \ |
||||
__printk(4, pr_fmt(fmt), ##__VA_ARGS__) |
||||
#define pr_warn pr_warning |
||||
#define pr_notice(fmt, ...) \ |
||||
__printk(5, pr_fmt(fmt), ##__VA_ARGS__) |
||||
#define pr_info(fmt, ...) \ |
||||
__printk(6, pr_fmt(fmt), ##__VA_ARGS__) |
||||
|
||||
#define pr_cont(fmt, ...) \ |
||||
printk(fmt, ##__VA_ARGS__) |
||||
|
||||
/* pr_devel() should produce zero code unless DEBUG is defined */ |
||||
#ifdef DEBUG |
||||
#define pr_devel(fmt, ...) \ |
||||
__printk(7, pr_fmt(fmt), ##__VA_ARGS__) |
||||
#else |
||||
#define pr_devel(fmt, ...) \ |
||||
no_printk(pr_fmt(fmt), ##__VA_ARGS__) |
||||
#endif |
||||
|
||||
#ifdef DEBUG |
||||
#define pr_debug(fmt, ...) \ |
||||
__printk(7, pr_fmt(fmt), ##__VA_ARGS__) |
||||
#else |
||||
#define pr_debug(fmt, ...) \ |
||||
no_printk(pr_fmt(fmt), ##__VA_ARGS__) |
||||
#endif |
||||
|
||||
#define printk_once(fmt, ...) \ |
||||
printk(fmt, ##__VA_ARGS__) |
||||
|
||||
#endif |
||||
Loading…
Reference in new issue