diff options
| -rw-r--r-- | README | 6 | ||||
| -rw-r--r-- | configs/am335x_igep003x_defconfig | 1 | ||||
| -rw-r--r-- | configs/igep0032_defconfig | 1 | ||||
| -rw-r--r-- | configs/igep00x0_defconfig | 1 | ||||
| -rw-r--r-- | env/Kconfig | 1 | ||||
| -rw-r--r-- | fs/ubifs/Kconfig | 6 | ||||
| -rw-r--r-- | fs/ubifs/super.c | 7 | ||||
| -rw-r--r-- | include/configs/am335x_igep003x.h | 1 | ||||
| -rw-r--r-- | include/configs/omap3_igep00x0.h | 1 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
10 files changed, 15 insertions, 11 deletions
@@ -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 d2026da7b3..e4292b549b 100644 --- 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 0a3dff7796..cd6423409c 100644 --- 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 872766939a..9fb4b91452 100644 --- 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 a3c6298273..36d6e799fc 100644 --- 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 e69de29bb2..9da35b8a37 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 effa8d933f..2c478cba96 100644 --- 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 50fd46a589..e00c73dab3 100644 --- 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 76d8e13d52..ab54a25d1a 100644 --- 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 d6fd150614..fce1391ac4 100644 --- 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 |