LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ubi: ubifs: Turn off verbose prints 

The prints are out of control.  SILENCE!

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Joe Hershberger 2013-04-08 10:32:49 +00:00 committed by Tom Rini
parent 70c219cd7c
commit 147162dac6
5 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README
View File

@ -2814,6 +2814,11 @@ FIT uImage format:
Requires also defining CONFIG_RBTREE Requires also defining CONFIG_RBTREE
CONFIG_UBI_SILENCE_MSG
Make the verbose messages from UBI stop printing. This leaves
warnings and errors enabled.
- UBIFS support - UBIFS support
CONFIG_CMD_UBIFS CONFIG_CMD_UBIFS
@ -2822,6 +2827,11 @@ FIT uImage format:
Requires UBI support as well as CONFIG_LZO Requires UBI support as well as CONFIG_LZO
CONFIG_UBIFS_SILENCE_MSG
Make the verbose messages from UBIFS stop printing. This leaves
warnings and errors enabled.
- SPL framework - SPL framework
CONFIG_SPL CONFIG_SPL
Enable building of SPL globally. Enable building of SPL globally.

3
common/cmd_ubi.c
View File

@ -23,6 +23,9 @@
#include <asm/errno.h> #include <asm/errno.h>
#include <jffs2/load_kernel.h> #include <jffs2/load_kernel.h>
#undef ubi_msg
#define ubi_msg(fmt, ...) printf("UBI: " fmt "\n", ##__VA_ARGS__)
#define DEV_TYPE_NONE 0 #define DEV_TYPE_NONE 0
#define DEV_TYPE_NAND 1 #define DEV_TYPE_NAND 1
#define DEV_TYPE_ONENAND 2 #define DEV_TYPE_ONENAND 2

14
drivers/mtd/mtdpart.c
View File

@ -347,16 +347,18 @@ static struct mtd_part *add_one_partition(struct mtd_info *master,
if (mtd_mod_by_eb(cur_offset, master) != 0) { if (mtd_mod_by_eb(cur_offset, master) != 0) {
/* Round up to next erasesize */ /* Round up to next erasesize */
slave->offset = (mtd_div_by_eb(cur_offset, master) + 1) * master->erasesize; slave->offset = (mtd_div_by_eb(cur_offset, master) + 1) * master->erasesize;
printk(KERN_NOTICE "Moving partition %d: " debug("Moving partition %d: 0x%012llx -> 0x%012llx\n",
"0x%012llx -> 0x%012llx\n", partno, partno, (unsigned long long)cur_offset,
(unsigned long long)cur_offset, (unsigned long long)slave->offset); (unsigned long long)slave->offset);
} }
} }
if (slave->mtd.size == MTDPART_SIZ_FULL) if (slave->mtd.size == MTDPART_SIZ_FULL)
slave->mtd.size = master->size - slave->offset; slave->mtd.size = master->size - slave->offset;
printk(KERN_NOTICE "0x%012llx-0x%012llx : \"%s\"\n", (unsigned long long)slave->offset, debug("0x%012llx-0x%012llx : \"%s\"\n",
(unsigned long long)(slave->offset + slave->mtd.size), slave->mtd.name); (unsigned long long)slave->offset,
(unsigned long long)(slave->offset + slave->mtd.size),
slave->mtd.name);
/* let's do some sanity checks */ /* let's do some sanity checks */
if (slave->offset >= master->size) { if (slave->offset >= master->size) {
@ -463,7 +465,7 @@ int add_mtd_partitions(struct mtd_info *master,
if (mtd_partitions.next == NULL) if (mtd_partitions.next == NULL)
INIT_LIST_HEAD(&mtd_partitions); INIT_LIST_HEAD(&mtd_partitions);
printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name); debug("Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
for (i = 0; i < nbparts; i++) { for (i = 0; i < nbparts; i++) {
slave = add_one_partition(master, parts + i, i, cur_offset); slave = add_one_partition(master, parts + i, i, cur_offset);

4
drivers/mtd/ubi/ubi.h
View File

@ -59,7 +59,11 @@
#define UBI_NAME_STR "ubi" #define UBI_NAME_STR "ubi"
/* Normal UBI messages */ /* Normal UBI messages */
#ifdef CONFIG_UBI_SILENCE_MSG
#define ubi_msg(fmt, ...)
#else
#define ubi_msg(fmt, ...) printk(KERN_NOTICE "UBI: " fmt "\n", ##__VA_ARGS__) #define ubi_msg(fmt, ...) printk(KERN_NOTICE "UBI: " fmt "\n", ##__VA_ARGS__)
#endif
/* UBI warning messages */ /* UBI warning messages */
#define ubi_warn(fmt, ...) printk(KERN_WARNING "UBI warning: %s: " fmt "\n", \ #define ubi_warn(fmt, ...) printk(KERN_WARNING "UBI warning: %s: " fmt "\n", \
__func__, ##__VA_ARGS__) __func__, ##__VA_ARGS__)

4
fs/ubifs/ubifs.h
View File

@ -463,8 +463,12 @@ static inline ino_t parent_ino(struct dentry *dentry)
#define UBIFS_VERSION 1 #define UBIFS_VERSION 1
/* Normal UBIFS messages */ /* Normal UBIFS messages */
#ifdef CONFIG_UBIFS_SILENCE_MSG
#define ubifs_msg(fmt, ...)
#else
#define ubifs_msg(fmt, ...) \ #define ubifs_msg(fmt, ...) \
printk(KERN_NOTICE "UBIFS: " fmt "\n", ##__VA_ARGS__) printk(KERN_NOTICE "UBIFS: " fmt "\n", ##__VA_ARGS__)
#endif
/* UBIFS error messages */ /* UBIFS error messages */
#define ubifs_err(fmt, ...) \ #define ubifs_err(fmt, ...) \
printk(KERN_ERR "UBIFS error (pid %d): %s: " fmt "\n", 0, \ printk(KERN_ERR "UBIFS error (pid %d): %s: " fmt "\n", 0, \