Convert CONFIG_UBIFS_SILENCE_MSG to Kconfig

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 <petr.vorel@gmail.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Heiko Schocher <hs@denx.de>

diff --git a/README b/README
index 5fd6428c5cdc462d0f8d5b9c7c370b4e337a746a..af7fbb6561ba5062b4662fc3145945599db664aa 100644 (file)
--- a/README
+++ b/README
@@ -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.

diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig
index d2026da7b34f3dcbb210a43a634f95fa6142ffaa..e4292b549b8deb051a80930532933f777ef8e5a5 100644 (file)
--- a/configs/am335x_igep003x_defconfig
+++ b/configs/am335x_igep003x_defconfig
@@ -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

diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig
index 0a3dff77968e5d151267511487f2dcba5559f981..cd6423409c90d053019f45a9f802c1adceecf3d4 100644 (file)
--- a/configs/igep0032_defconfig
+++ b/configs/igep0032_defconfig
@@ -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

diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig
index 872766939ae6a2261f31b56c805335bd7f29cbcb..9fb4b91452159ba5a2a6f4ac6a9be1ef77b0b942 100644 (file)
--- a/configs/igep00x0_defconfig
+++ b/configs/igep00x0_defconfig
@@ -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

diff --git a/env/Kconfig b/env/Kconfig
index a3c6298273ed8709e51e1d2b97cbac37484a8520..36d6e799fc4c427328e628c2eab65cea3cd9b750 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -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.

diff --git a/fs/ubifs/Kconfig b/fs/ubifs/Kconfig
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..9da35b8a3794a44f6f57fc7301cc230330ebb82d 100644 (file)
--- a/fs/ubifs/Kconfig
+++ b/fs/ubifs/Kconfig
@@ -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.

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index effa8d933fe9d0db7d7b91085e39e826f3b4f804..2c478cba963914af65c8c9c6c9d5f49fcaf47c15 100644 (file)
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -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);

diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h
index 50fd46a589e0ddfa28f3cbd3e7361947ffceaa9f..e00c73dab334f87366b2cb8b21939f4a122489dc 100644 (file)
--- a/include/configs/am335x_igep003x.h
+++ b/include/configs/am335x_igep003x.h
@@ -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
 

diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index 76d8e13d52c107d1d5bc79bb062d4d241d894627..ab54a25d1a0f4ea8df66838c9726bd44421608c5 100644 (file)
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -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 */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d6fd15061422a917d628550efe201940ce39ec95..fce1391ac407a63b828e4c3173fcb18883252e4a 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -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