Convert CONFIG_UBI_SILENCE_MSG and CONFIG_UBIFS_SILENCE_MSG to Kconfig

PATCH New Petr Vorel 2 participants 7 messages Mar 24, 2018

Subsystems (3)

Memory technology devices (MTD) UBI file system (UBIFS) Unsorted block images (UBI)

lore

Share & tools

lore

Petr Vorel

author

2018-03-24 00:49 UTC #0 lore raw

v3 cover Convert CONFIG_UBI_SILENCE_MSG and CONFIG_UBIFS_SILENCE_MSG to Kconfig

Hello Heiko,

thanks for your review. I fixed issues:
https://travis-ci.org/pevik/u-boot/builds/357634133
Sorry, next time I'll test it in travis before posting to ML.

Changes v2->v3:
* Fix build error for sun5i, see
https://travis-ci.org/pevik/u-boot/builds/357634133
* Drop wrong dependency on CMD_UBIFS for both CONFIG_UBI_SILENCE_MSG and CONFIG_UBIFS_SILENCE_MSG
* Add missing CONFIG_UBI_SILENCE_MSG=y to defconfigs. Some of them might
not need them (as they don't have CONFIG_ENV_IS_IN_UBI), but this way it
stays the same it was before.

Kind regards,
Petr

Petr Vorel (3):
ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG Convert CONFIG_UBIFS_SILENCE_MSG to Kconfig Convert CONFIG_UBI_SILENCE_MSG to Kconfig

 README                            | 12 ------------
 configs/am335x_igep003x_defconfig |  2 ++
 configs/igep0032_defconfig        |  2 ++
 configs/igep00x0_defconfig        |  2 ++
 drivers/mtd/ubi/Kconfig           |  7 +++++++
 env/Kconfig                       |  6 ------
 fs/ubifs/Kconfig                  |  6 ++++++
 fs/ubifs/super.c                  |  7 ++++++-
 fs/ubifs/ubifs.h                  |  4 ++++
 include/configs/am335x_igep003x.h |  4 ----
 include/configs/omap3_igep00x0.h  |  2 --
 scripts/config_whitelist.txt      |  2 --
 12 files changed, 29 insertions(+), 27 deletions(-)

Signature · 1 line

2.16.2

Petr Vorel

author

2018-03-24 00:49 UTC #1 lore raw

PATCH v3 1/3 ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG

Use of CONFIG_UBIFS_SILENCE_MSG was added in 147162dac6 ("ubi: ubifs: Turn off verbose prints")

Then it was removed in
ff94bc40af ("mtd, ubi, ubifs: resync with Linux-3.14")

Cc Joe Hershberger <[email protected]>

Cc Heiko Schocher <[email protected]>

Signed-off-by Petr Vorel <[email protected]>

---
 fs/ubifs/ubifs.h | 4 ++++
 1 file changed, 4 insertions(+)

fs/ubifs/ubifs.h +4 -0

index 1d89465205..b4ce706a8e 100644
@@ -618,9 +618,13 @@ static inline ino_t parent_ino(struct dentry *dentry)
 #define UBIFS_VERSION 1
 
 /* Normal UBIFS messages */
+#ifdef CONFIG_UBIFS_SILENCE_MSG
+#define ubifs_msg(c, fmt, ...)
+#else
 #define ubifs_msg(c, fmt, ...)                                      \
 	pr_notice("UBIFS (ubi%d:%d): " fmt "\n",                    \
 		  (c)->vi.ubi_num, (c)->vi.vol_id, ##__VA_ARGS__)
+#endif
 /* UBIFS error messages */
 #ifndef __UBOOT__
 #define ubifs_err(c, fmt, ...)                                      \

Signature · 1 line

2.16.2

Heiko Schocher

2018-03-24 10:14 UTC #2 lore raw

PATCH v3 1/3 ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG

Hello Petr,

Am 24.03.2018 um 01:49 schrieb Petr Vorel:

Quoted 6 lines

Use of CONFIG_UBIFS_SILENCE_MSG was added in 147162dac6 ("ubi: ubifs: Turn off verbose prints")
Then it was removed in
ff94bc40af ("mtd, ubi, ubifs: resync with Linux-3.14")

Quoted 6 lines

Cc Joe Hershberger <[email protected]>
Cc Heiko Schocher <[email protected]>
Signed-off-by Petr Vorel <[email protected]>
---
  fs/ubifs/ubifs.h | 4 ++++
  1 file changed, 4 insertions(+)

Applied to u-boot-ubi.git master

Thanks!

bye,
Heiko

Signature · 3 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: hs at denx.de

Petr Vorel

author

2018-03-24 00:49 UTC #3 lore raw

PATCH v3 2/3 Convert CONFIG_UBIFS_SILENCE_MSG to Kconfig

In reply to Petr Vorel

Introduce another difference from upstream (kernel) source in
fs/ubifs/super.c: adding preprocessor condition as y variable in
mount_ubifs() depends on CONFIG_UBIFS_SILENCE_MSG:
fs/ubifs/super.c:1337:15: error: variable ?y? set but not used [-Werror=unused-but-set-variable]
long long x, y;

Not setting CONFIG_UBIFS_SILENCE_MSG in am335x_igep003x_defconfig and igep0032_defconfig. Although it was defined in their config headers, it depends on CMD_UBIFS which is not set for them.

Signed-off-by Petr Vorel <[email protected]>

Cc Joe Hershberger <[email protected]>

Cc Heiko Schocher <[email protected]>

---
 README                            | 6 ------
 configs/am335x_igep003x_defconfig | 1 +
 configs/igep0032_defconfig        | 1 +
 configs/igep00x0_defconfig        | 1 +
 env/Kconfig                       | 1 -
 fs/ubifs/Kconfig                  | 6 ++++++
 fs/ubifs/super.c                  | 7 ++++++-
 include/configs/am335x_igep003x.h | 1 -
 include/configs/omap3_igep00x0.h  | 1 -
 scripts/config_whitelist.txt      | 1 -
 10 files changed, 15 insertions(+), 11 deletions(-)

README +0 -6

index 5fd6428c5c..af7fbb6561 100644
@@ -2549,12 +2549,6 @@ FIT uImage format:
 		Enable UBI fastmap debug
 		default: 0
 
-- UBIFS support
-		CONFIG_UBIFS_SILENCE_MSG
-
-		Make the verbose messages from UBIFS stop printing.  This leaves
-		warnings and errors enabled.
-
 - SPL framework
 		CONFIG_SPL
 		Enable building of SPL globally.

configs/am335x_igep003x_defconfig +1 -0

index d2026da7b3..e4292b549b 100644
@@ -39,6 +39,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(SPL),-(UBI)"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_UBI=y
+CONFIG_UBIFS_SILENCE_MSG=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_MTD_UBI_FASTMAP=y

configs/igep0032_defconfig +1 -0

index 0a3dff7796..cd6423409c 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
+CONFIG_UBIFS_SILENCE_MSG=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

configs/igep00x0_defconfig +1 -0

index 872766939a..9fb4b91452 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
+CONFIG_UBIFS_SILENCE_MSG=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

env/Kconfig +0 -1

index a3c6298273..36d6e799fc 100644
@@ -361,7 +361,6 @@ config ENV_IS_IN_UBI
 	  It is assumed that both volumes are in the same MTD partition.
 
 	  - CONFIG_UBI_SILENCE_MSG
-	  - CONFIG_UBIFS_SILENCE_MSG
 
 	  You will probably want to define these to avoid a really noisy system
 	  when storing the env in UBI.

fs/ubifs/Kconfig +6 -0

index e69de29bb2..9da35b8a37 100644
@@ -0,0 +1,6 @@
+config UBIFS_SILENCE_MSG
+	bool "UBIFS silence verbose messages"
+	default ENV_IS_IN_UBI
+	help
+	  Make the verbose messages from UBIFS stop printing. This leaves
+	  warnings and errors enabled.

fs/ubifs/super.c +6 -1

index effa8d933f..2c478cba96 100644
@@ -1334,7 +1334,10 @@ static int check_free_space(struct ubifs_info *c)
 static int mount_ubifs(struct ubifs_info *c)
 {
 	int err;
-	long long x, y;
+	long long x;
+#ifndef CONFIG_UBIFS_SILENCE_MSG
+	long long y;
+#endif
 	size_t sz;
 
 	c->ro_mount = !!(c->vfs_sb->s_flags & MS_RDONLY);

@@ -1613,7 +1616,9 @@ static int mount_ubifs(struct ubifs_info *c)
 		  c->vi.ubi_num, c->vi.vol_id, c->vi.name,
 		  c->ro_mount ? ", R/O mode" : "");
 	x = (long long)c->main_lebs * c->leb_size;
+#ifndef CONFIG_UBIFS_SILENCE_MSG
 	y = (long long)c->log_lebs * c->leb_size + c->max_bud_bytes;
+#endif
 	ubifs_msg(c, "LEB size: %d bytes (%d KiB), min./max. I/O unit sizes: %d bytes/%d bytes",
 		  c->leb_size, c->leb_size >> 10, c->min_io_size,
 		  c->max_write_size);

include/configs/am335x_igep003x.h +0 -1

index 50fd46a589..e00c73dab3 100644
@@ -24,7 +24,6 @@
 
 /* Make the verbose messages from UBI stop printing */
 #define CONFIG_UBI_SILENCE_MSG
-#define CONFIG_UBIFS_SILENCE_MSG
 
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG

include/configs/omap3_igep00x0.h +0 -1

index 76d8e13d52..ab54a25d1a 100644
@@ -137,7 +137,6 @@
 #define CONFIG_ENV_UBI_VOLUME		"config"
 #define CONFIG_ENV_UBI_VOLUME_REDUND	"config_r"
 #define CONFIG_UBI_SILENCE_MSG		1
-#define CONFIG_UBIFS_SILENCE_MSG	1
 #define CONFIG_ENV_SIZE			(32*1024)
 
 #endif /* __IGEP00X0_H */

scripts/config_whitelist.txt +0 -1

index d6fd150614..fce1391ac4 100644
@@ -4627,7 +4627,6 @@ CONFIG_T_SH7706LSR
 CONFIG_UART_BR_PRELIM
 CONFIG_UART_OR_PRELIM
 CONFIG_UBIBLOCK
-CONFIG_UBIFS_SILENCE_MSG
 CONFIG_UBIFS_VOLUME
 CONFIG_UBI_PART
 CONFIG_UBI_SILENCE_MSG

Signature · 1 line

2.16.2

Heiko Schocher

2018-03-24 10:14 UTC #4 lore raw

PATCH v3 2/3 Convert CONFIG_UBIFS_SILENCE_MSG to Kconfig

Hello Petr,

Am 24.03.2018 um 01:49 schrieb Petr Vorel:

Quoted 13 lines

Introduce another difference from upstream (kernel) source in
fs/ubifs/super.c: adding preprocessor condition as y variable in
mount_ubifs() depends on CONFIG_UBIFS_SILENCE_MSG:
fs/ubifs/super.c:1337:15: error: variable ?y? set but not used [-Werror=unused-but-set-variable]
long long x, y;
Not setting CONFIG_UBIFS_SILENCE_MSG in am335x_igep003x_defconfig and igep0032_defconfig. Although it was defined in their config headers, it depends on CMD_UBIFS which is not set for them.
Signed-off-by Petr Vorel <[email protected]>
Cc Joe Hershberger <[email protected]>
Cc Heiko Schocher <[email protected]>

Quoted 12 lines

---
  README                            | 6 ------
  configs/am335x_igep003x_defconfig | 1 +
  configs/igep0032_defconfig        | 1 +
  configs/igep00x0_defconfig        | 1 +
  env/Kconfig                       | 1 -
  fs/ubifs/Kconfig                  | 6 ++++++
  fs/ubifs/super.c                  | 7 ++++++-
  include/configs/am335x_igep003x.h | 1 -
  include/configs/omap3_igep00x0.h  | 1 -
  scripts/config_whitelist.txt      | 1 -
  10 files changed, 15 insertions(+), 11 deletions(-)

Applied to u-boot-ubi.git master

Thanks!

bye,
Heiko

Signature · 3 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: hs at denx.de

Petr Vorel

author

2018-03-24 00:49 UTC #5 lore raw

PATCH v3 3/3 Convert CONFIG_UBI_SILENCE_MSG to Kconfig

In reply to Petr Vorel

Signed-off-by Petr Vorel <[email protected]>

---
 README                            | 6 ------
 configs/am335x_igep003x_defconfig | 1 +
 configs/igep0032_defconfig        | 1 +
 configs/igep00x0_defconfig        | 1 +
 drivers/mtd/ubi/Kconfig           | 7 +++++++
 env/Kconfig                       | 5 -----
 include/configs/am335x_igep003x.h | 3 ---
 include/configs/omap3_igep00x0.h  | 1 -
 scripts/config_whitelist.txt      | 1 -
 9 files changed, 10 insertions(+), 16 deletions(-)

README +0 -6

index af7fbb6561..ed79298fd4 100644
@@ -2482,12 +2482,6 @@ FIT uImage format:
 		kernel. Needed for UBI support.
 
 - UBI support
-		CONFIG_UBI_SILENCE_MSG
-
-		Make the verbose messages from UBI stop printing.  This leaves
-		warnings and errors enabled.
-
-
 		CONFIG_MTD_UBI_WL_THRESHOLD
 		This parameter defines the maximum difference between the highest
 		erase counter value and the lowest erase counter value of eraseblocks

configs/am335x_igep003x_defconfig +1 -0

index e4292b549b..be4f112286 100644
@@ -37,6 +37,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(SPL),-(UBI)"
 CONFIG_CMD_UBI=y
+CONFIG_UBI_SILENCE_MSG=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_UBI=y
 CONFIG_UBIFS_SILENCE_MSG=y

configs/igep0032_defconfig +1 -0

index cd6423409c..7683e7412b 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_SPI=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_UBI=y
+CONFIG_UBI_SILENCE_MSG=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_UBIFS_SILENCE_MSG=y
 CONFIG_NET_RANDOM_ETHADDR=y

configs/igep00x0_defconfig +1 -0

index 9fb4b91452..fef1331c0a 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_SPI=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_UBI=y
+CONFIG_UBI_SILENCE_MSG=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_UBIFS_SILENCE_MSG=y
 CONFIG_NET_RANDOM_ETHADDR=y

drivers/mtd/ubi/Kconfig +7 -0

index caa5197df5..cf84783356 100644
@@ -1,5 +1,12 @@
 menu "UBI support"
 
+config CONFIG_UBI_SILENCE_MSG
+	bool "UBI silence verbose messages"
+	default ENV_IS_IN_UBI
+	help
+	  Make the verbose messages from UBI stop printing. This leaves
+	  warnings and errors enabled.
+
 config MTD_UBI
 	bool "Enable UBI - Unsorted block images"
 	select CRC32

env/Kconfig +0 -5

index 36d6e799fc..35548721bd 100644
@@ -360,11 +360,6 @@ config ENV_IS_IN_UBI
 	  the environment in.  This will enable redundant environments in UBI.
 	  It is assumed that both volumes are in the same MTD partition.
 
-	  - CONFIG_UBI_SILENCE_MSG
-
-	  You will probably want to define these to avoid a really noisy system
-	  when storing the env in UBI.
-
 config ENV_FAT_INTERFACE
 	string "Name of the block device for the environment"
 	depends on ENV_IS_IN_FAT

include/configs/am335x_igep003x.h +0 -3

index e00c73dab3..fe3f838598 100644
@@ -22,9 +22,6 @@
 
 #define CONFIG_ENV_SIZE			(96 << 10)	/*  96 KiB */
 
-/* Make the verbose messages from UBI stop printing */
-#define CONFIG_UBI_SILENCE_MSG
-
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 
 #ifndef CONFIG_SPL_BUILD

include/configs/omap3_igep00x0.h +0 -1

index ab54a25d1a..e2a7f63e4f 100644
@@ -136,7 +136,6 @@
 #define CONFIG_ENV_UBI_PART		"UBI"
 #define CONFIG_ENV_UBI_VOLUME		"config"
 #define CONFIG_ENV_UBI_VOLUME_REDUND	"config_r"
-#define CONFIG_UBI_SILENCE_MSG		1
 #define CONFIG_ENV_SIZE			(32*1024)
 
 #endif /* __IGEP00X0_H */

scripts/config_whitelist.txt +0 -1

index fce1391ac4..0c7db05274 100644
@@ -4629,7 +4629,6 @@ CONFIG_UART_OR_PRELIM
 CONFIG_UBIBLOCK
 CONFIG_UBIFS_VOLUME
 CONFIG_UBI_PART
-CONFIG_UBI_SILENCE_MSG
 CONFIG_UBI_SIZE
 CONFIG_UBOOT1_ENV_ADDR
 CONFIG_UBOOT2_ENV_ADDR

Signature · 1 line

2.16.2

Heiko Schocher

2018-03-24 10:15 UTC #6 lore raw

PATCH v3 3/3 Convert CONFIG_UBI_SILENCE_MSG to Kconfig

Hello Petr,

Am 24.03.2018 um 01:49 schrieb Petr Vorel:

Quoted 12 lines

Signed-off-by Petr Vorel <[email protected]>

---
  README                            | 6 ------
  configs/am335x_igep003x_defconfig | 1 +
  configs/igep0032_defconfig        | 1 +
  configs/igep00x0_defconfig        | 1 +
  drivers/mtd/ubi/Kconfig           | 7 +++++++
  env/Kconfig                       | 5 -----
  include/configs/am335x_igep003x.h | 3 ---
  include/configs/omap3_igep00x0.h  | 1 -
  scripts/config_whitelist.txt      | 1 -
  9 files changed, 10 insertions(+), 16 deletions(-)

Applied to u-boot-ubi.git master

Thanks!

bye,
Heiko

Signature · 3 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: hs at denx.de