leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert CONFIG_UBIFS_SILENCE_MSG to Kconfig

Browse Source 
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>
This commit is contained in:
Petr Vorel 2018-03-24 01:49:23 +01:00 committed by Heiko Schocher
parent e995128158
commit afb6fda2ae
10 changed files with 15 additions and 11 deletions

6
README
View File

@ -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.

1
configs/am335x_igep003x_defconfig
View File

@ -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

1
configs/igep0032_defconfig
View File

@ -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

1
configs/igep00x0_defconfig
View File

@ -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

1
env/Kconfig vendored
View File

@ -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.

6
fs/ubifs/Kconfig
View File

@ -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.

7
fs/ubifs/super.c
View File

@ -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);

1
include/configs/am335x_igep003x.h
View File

@ -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

1
include/configs/omap3_igep00x0.h
View File

@ -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 */

1
scripts/config_whitelist.txt
View File

@ -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