Merge git://git.denx.de/u-boot-ubi
diff --git a/README b/README
index 5fd6428..ed79298 100644
--- a/README
+++ b/README
@@ -2482,12 +2482,6 @@
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
@@ -2549,12 +2543,6 @@
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 d2026da..be4f112 100644
--- a/configs/am335x_igep003x_defconfig
+++ b/configs/am335x_igep003x_defconfig
@@ -37,8 +37,10 @@
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
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_MTD_UBI_FASTMAP=y
diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig
index 0a3dff7..7683e74 100644
--- a/configs/igep0032_defconfig
+++ b/configs/igep0032_defconfig
@@ -27,7 +27,9 @@
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
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig
index 8727669..fef1331 100644
--- a/configs/igep00x0_defconfig
+++ b/configs/igep00x0_defconfig
@@ -27,7 +27,9 @@
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
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig
index caa5197..cf84783 100644
--- a/drivers/mtd/ubi/Kconfig
+++ b/drivers/mtd/ubi/Kconfig
@@ -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
diff --git a/env/Kconfig b/env/Kconfig
index a3c6298..3554872 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -360,12 +360,6 @@
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
- - CONFIG_UBIFS_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
diff --git a/fs/ubifs/Kconfig b/fs/ubifs/Kconfig
index e69de29..9da35b8 100644
--- 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 effa8d9..2c478cb 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -1334,7 +1334,10 @@
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 @@
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/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index 1d89465..b4ce706 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -618,9 +618,13 @@
#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, ...) \
diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h
index 50fd46a..fe3f838 100644
--- a/include/configs/am335x_igep003x.h
+++ b/include/configs/am335x_igep003x.h
@@ -22,10 +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_UBIFS_SILENCE_MSG
-
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
#ifndef CONFIG_SPL_BUILD
diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index 76d8e13..e2a7f63 100644
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -136,8 +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_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 d6fd150..0c7db05 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4627,10 +4627,8 @@
CONFIG_UART_BR_PRELIM
CONFIG_UART_OR_PRELIM
CONFIG_UBIBLOCK
-CONFIG_UBIFS_SILENCE_MSG
CONFIG_UBIFS_VOLUME
CONFIG_UBI_PART
-CONFIG_UBI_SILENCE_MSG
CONFIG_UBI_SIZE
CONFIG_UBOOT1_ENV_ADDR
CONFIG_UBOOT2_ENV_ADDR