ubi: ubifs: Turn off verbose prints

The prints are out of control. SILENCE! Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>

ubi: ubifs: Turn off verbose prints
The prints are out of control. SILENCE! Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Joe Hershberger · Tom Rini · Eric Lee · Eric Lee · Eric Lee · Eric Lee
1 parent 70c219cd7c
Showing 5 changed files with 29 additions and 6 deletions Side-by-side Diff
README
common/cmd_ubi.c
drivers/mtd/mtdpart.c
drivers/mtd/ubi/ubi.h
fs/ubifs/ubifs.h
@@ -2814,6 +2814,11 @@
  
 		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
 		CONFIG_CMD_UBIFS
  
@@ -2821,6 +2826,11 @@
 		UBIFS.  UBIFS is read-only in u-boot.
  
 		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
 		CONFIG_SPL
@@ -23,6 +23,9 @@
 #include <asm/errno.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_NAND		1
 #define DEV_TYPE_ONENAND	2
@@ -347,16 +347,18 @@
 		if (mtd_mod_by_eb(cur_offset, master) != 0) {
 			/* Round up to next erasesize */
 			slave->offset = (mtd_div_by_eb(cur_offset, master) + 1) * master->erasesize;
-			printk(KERN_NOTICE "Moving partition %d: "
-			       "0x%012llx -> 0x%012llx\n", partno,
-			       (unsigned long long)cur_offset, (unsigned long long)slave->offset);
+			debug("Moving partition %d: 0x%012llx -> 0x%012llx\n",
+			      partno, (unsigned long long)cur_offset,
+			      (unsigned long long)slave->offset);
 		}
 	}
 	if (slave->mtd.size == MTDPART_SIZ_FULL)
 		slave->mtd.size = master->size - slave->offset;
  
-	printk(KERN_NOTICE "0x%012llx-0x%012llx : \"%s\"\n", (unsigned long long)slave->offset,
-		(unsigned long long)(slave->offset + slave->mtd.size), slave->mtd.name);
+	debug("0x%012llx-0x%012llx : \"%s\"\n",
+	      (unsigned long long)slave->offset,
+	      (unsigned long long)(slave->offset + slave->mtd.size),
+	      slave->mtd.name);
  
 	/* let's do some sanity checks */
 	if (slave->offset >= master->size) {
@@ -463,7 +465,7 @@
 	if (mtd_partitions.next == NULL)
 		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++) {
 		slave = add_one_partition(master, parts + i, i, cur_offset);
@@ -59,7 +59,11 @@
 #define UBI_NAME_STR "ubi"
  
 /* 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__)
+#endif
 /* UBI warning messages */
 #define ubi_warn(fmt, ...) printk(KERN_WARNING "UBI warning: %s: " fmt "\n", \
 				  __func__, ##__VA_ARGS__)
@@ -463,8 +463,12 @@
 #define UBIFS_VERSION 1
  
 /* Normal UBIFS messages */
+#ifdef CONFIG_UBIFS_SILENCE_MSG
+#define ubifs_msg(fmt, ...)
+#else
 #define ubifs_msg(fmt, ...) \
 		printk(KERN_NOTICE "UBIFS: " fmt "\n", ##__VA_ARGS__)
+#endif
 /* UBIFS error messages */
 #define ubifs_err(fmt, ...)                                                  \
 	printk(KERN_ERR "UBIFS error (pid %d): %s: " fmt "\n", 0, \
...	...	@@ -2814,6 +2814,11 @@
2814	2814
2815	2815	Requires also defining CONFIG_RBTREE
2816	2816
	2817	+ CONFIG_UBI_SILENCE_MSG
	2818	+
	2819	+ Make the verbose messages from UBI stop printing. This leaves
	2820	+ warnings and errors enabled.
	2821	+
2817	2822	- UBIFS support
2818	2823	CONFIG_CMD_UBIFS
2819	2824
...	...	@@ -2821,6 +2826,11 @@
2821	2826	UBIFS. UBIFS is read-only in u-boot.
2822	2827
2823	2828	Requires UBI support as well as CONFIG_LZO
	2829	+
	2830	+ CONFIG_UBIFS_SILENCE_MSG
	2831	+
	2832	+ Make the verbose messages from UBIFS stop printing. This leaves
	2833	+ warnings and errors enabled.
2824	2834
2825	2835	- SPL framework
2826	2836	CONFIG_SPL
...	...	@@ -23,6 +23,9 @@
23	23	#include <asm/errno.h>
24	24	#include <jffs2/load_kernel.h>
25	25
	26	+#undef ubi_msg
	27	+#define ubi_msg(fmt, ...) printf("UBI: " fmt "\n", ##__VA_ARGS__)
	28	+
26	29	#define DEV_TYPE_NONE 0
27	30	#define DEV_TYPE_NAND 1
28	31	#define DEV_TYPE_ONENAND 2
...	...	@@ -347,16 +347,18 @@
347	347	if (mtd_mod_by_eb(cur_offset, master) != 0) {
348	348	/* Round up to next erasesize */
349	349	slave->offset = (mtd_div_by_eb(cur_offset, master) + 1) * master->erasesize;
350		- printk(KERN_NOTICE "Moving partition %d: "
351		- "0x%012llx -> 0x%012llx\n", partno,
352		- (unsigned long long)cur_offset, (unsigned long long)slave->offset);
	350	+ debug("Moving partition %d: 0x%012llx -> 0x%012llx\n",
	351	+ partno, (unsigned long long)cur_offset,
	352	+ (unsigned long long)slave->offset);
353	353	}
354	354	}
355	355	if (slave->mtd.size == MTDPART_SIZ_FULL)
356	356	slave->mtd.size = master->size - slave->offset;
357	357
358		- printk(KERN_NOTICE "0x%012llx-0x%012llx : \"%s\"\n", (unsigned long long)slave->offset,
359		- (unsigned long long)(slave->offset + slave->mtd.size), slave->mtd.name);
	358	+ debug("0x%012llx-0x%012llx : \"%s\"\n",
	359	+ (unsigned long long)slave->offset,
	360	+ (unsigned long long)(slave->offset + slave->mtd.size),
	361	+ slave->mtd.name);
360	362
361	363	/* let's do some sanity checks */
362	364	if (slave->offset >= master->size) {
...	...	@@ -463,7 +465,7 @@
463	465	if (mtd_partitions.next == NULL)
464	466	INIT_LIST_HEAD(&mtd_partitions);
465	467
466		- printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
	468	+ debug("Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
467	469
468	470	for (i = 0; i < nbparts; i++) {
469	471	slave = add_one_partition(master, parts + i, i, cur_offset);
...	...	@@ -59,7 +59,11 @@
59	59	#define UBI_NAME_STR "ubi"
60	60
61	61	/* Normal UBI messages */
	62	+#ifdef CONFIG_UBI_SILENCE_MSG
	63	+#define ubi_msg(fmt, ...)
	64	+#else
62	65	#define ubi_msg(fmt, ...) printk(KERN_NOTICE "UBI: " fmt "\n", ##__VA_ARGS__)
	66	+#endif
63	67	/* UBI warning messages */
64	68	#define ubi_warn(fmt, ...) printk(KERN_WARNING "UBI warning: %s: " fmt "\n", \
65	69	__func__, ##__VA_ARGS__)
...	...	@@ -463,8 +463,12 @@
463	463	#define UBIFS_VERSION 1
464	464
465	465	/* Normal UBIFS messages */
	466	+#ifdef CONFIG_UBIFS_SILENCE_MSG
	467	+#define ubifs_msg(fmt, ...)
	468	+#else
466	469	#define ubifs_msg(fmt, ...) \
467	470	printk(KERN_NOTICE "UBIFS: " fmt "\n", ##__VA_ARGS__)
	471	+#endif
468	472	/* UBIFS error messages */
469	473	#define ubifs_err(fmt, ...) \
470	474	printk(KERN_ERR "UBIFS error (pid %d): %s: " fmt "\n", 0, \