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>
This commit is contained in:
parent
e995128158
commit
afb6fda2ae
6
README
6
README
|
@ -2549,12 +2549,6 @@ FIT uImage format:
|
||||||
Enable UBI fastmap debug
|
Enable UBI fastmap debug
|
||||||
default: 0
|
default: 0
|
||||||
|
|
||||||
- UBIFS support
|
|
||||||
CONFIG_UBIFS_SILENCE_MSG
|
|
||||||
|
|
||||||
Make the verbose messages from UBIFS stop printing. This leaves
|
|
||||||
warnings and errors enabled.
|
|
||||||
|
|
||||||
- SPL framework
|
- SPL framework
|
||||||
CONFIG_SPL
|
CONFIG_SPL
|
||||||
Enable building of SPL globally.
|
Enable building of SPL globally.
|
||||||
|
|
|
@ -39,6 +39,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(SPL),-(UBI)"
|
||||||
CONFIG_CMD_UBI=y
|
CONFIG_CMD_UBI=y
|
||||||
# CONFIG_CMD_UBIFS is not set
|
# CONFIG_CMD_UBIFS is not set
|
||||||
CONFIG_ENV_IS_IN_UBI=y
|
CONFIG_ENV_IS_IN_UBI=y
|
||||||
|
CONFIG_UBIFS_SILENCE_MSG=y
|
||||||
CONFIG_MMC_OMAP_HS=y
|
CONFIG_MMC_OMAP_HS=y
|
||||||
CONFIG_NAND=y
|
CONFIG_NAND=y
|
||||||
CONFIG_MTD_UBI_FASTMAP=y
|
CONFIG_MTD_UBI_FASTMAP=y
|
||||||
|
|
|
@ -28,6 +28,7 @@ CONFIG_CMD_CACHE=y
|
||||||
CONFIG_CMD_EXT4_WRITE=y
|
CONFIG_CMD_EXT4_WRITE=y
|
||||||
CONFIG_CMD_UBI=y
|
CONFIG_CMD_UBI=y
|
||||||
# CONFIG_CMD_UBIFS is not set
|
# CONFIG_CMD_UBIFS is not set
|
||||||
|
CONFIG_UBIFS_SILENCE_MSG=y
|
||||||
CONFIG_NET_RANDOM_ETHADDR=y
|
CONFIG_NET_RANDOM_ETHADDR=y
|
||||||
CONFIG_MMC_OMAP_HS=y
|
CONFIG_MMC_OMAP_HS=y
|
||||||
CONFIG_NAND=y
|
CONFIG_NAND=y
|
||||||
|
|
|
@ -28,6 +28,7 @@ CONFIG_CMD_CACHE=y
|
||||||
CONFIG_CMD_EXT4_WRITE=y
|
CONFIG_CMD_EXT4_WRITE=y
|
||||||
CONFIG_CMD_UBI=y
|
CONFIG_CMD_UBI=y
|
||||||
# CONFIG_CMD_UBIFS is not set
|
# CONFIG_CMD_UBIFS is not set
|
||||||
|
CONFIG_UBIFS_SILENCE_MSG=y
|
||||||
CONFIG_NET_RANDOM_ETHADDR=y
|
CONFIG_NET_RANDOM_ETHADDR=y
|
||||||
CONFIG_MMC_OMAP_HS=y
|
CONFIG_MMC_OMAP_HS=y
|
||||||
CONFIG_NAND=y
|
CONFIG_NAND=y
|
||||||
|
|
1
env/Kconfig
vendored
1
env/Kconfig
vendored
|
@ -361,7 +361,6 @@ config ENV_IS_IN_UBI
|
||||||
It is assumed that both volumes are in the same MTD partition.
|
It is assumed that both volumes are in the same MTD partition.
|
||||||
|
|
||||||
- CONFIG_UBI_SILENCE_MSG
|
- CONFIG_UBI_SILENCE_MSG
|
||||||
- CONFIG_UBIFS_SILENCE_MSG
|
|
||||||
|
|
||||||
You will probably want to define these to avoid a really noisy system
|
You will probably want to define these to avoid a really noisy system
|
||||||
when storing the env in UBI.
|
when storing the env in UBI.
|
||||||
|
|
|
@ -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.
|
|
@ -1334,7 +1334,10 @@ static int check_free_space(struct ubifs_info *c)
|
||||||
static int mount_ubifs(struct ubifs_info *c)
|
static int mount_ubifs(struct ubifs_info *c)
|
||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
long long x, y;
|
long long x;
|
||||||
|
#ifndef CONFIG_UBIFS_SILENCE_MSG
|
||||||
|
long long y;
|
||||||
|
#endif
|
||||||
size_t sz;
|
size_t sz;
|
||||||
|
|
||||||
c->ro_mount = !!(c->vfs_sb->s_flags & MS_RDONLY);
|
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->vi.ubi_num, c->vi.vol_id, c->vi.name,
|
||||||
c->ro_mount ? ", R/O mode" : "");
|
c->ro_mount ? ", R/O mode" : "");
|
||||||
x = (long long)c->main_lebs * c->leb_size;
|
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;
|
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",
|
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->leb_size, c->leb_size >> 10, c->min_io_size,
|
||||||
c->max_write_size);
|
c->max_write_size);
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
|
|
||||||
/* Make the verbose messages from UBI stop printing */
|
/* Make the verbose messages from UBI stop printing */
|
||||||
#define CONFIG_UBI_SILENCE_MSG
|
#define CONFIG_UBI_SILENCE_MSG
|
||||||
#define CONFIG_UBIFS_SILENCE_MSG
|
|
||||||
|
|
||||||
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
|
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
|
||||||
|
|
||||||
|
|
|
@ -137,7 +137,6 @@
|
||||||
#define CONFIG_ENV_UBI_VOLUME "config"
|
#define CONFIG_ENV_UBI_VOLUME "config"
|
||||||
#define CONFIG_ENV_UBI_VOLUME_REDUND "config_r"
|
#define CONFIG_ENV_UBI_VOLUME_REDUND "config_r"
|
||||||
#define CONFIG_UBI_SILENCE_MSG 1
|
#define CONFIG_UBI_SILENCE_MSG 1
|
||||||
#define CONFIG_UBIFS_SILENCE_MSG 1
|
|
||||||
#define CONFIG_ENV_SIZE (32*1024)
|
#define CONFIG_ENV_SIZE (32*1024)
|
||||||
|
|
||||||
#endif /* __IGEP00X0_H */
|
#endif /* __IGEP00X0_H */
|
||||||
|
|
|
@ -4627,7 +4627,6 @@ CONFIG_T_SH7706LSR
|
||||||
CONFIG_UART_BR_PRELIM
|
CONFIG_UART_BR_PRELIM
|
||||||
CONFIG_UART_OR_PRELIM
|
CONFIG_UART_OR_PRELIM
|
||||||
CONFIG_UBIBLOCK
|
CONFIG_UBIBLOCK
|
||||||
CONFIG_UBIFS_SILENCE_MSG
|
|
||||||
CONFIG_UBIFS_VOLUME
|
CONFIG_UBIFS_VOLUME
|
||||||
CONFIG_UBI_PART
|
CONFIG_UBI_PART
|
||||||
CONFIG_UBI_SILENCE_MSG
|
CONFIG_UBI_SILENCE_MSG
|
||||||
|
|
Loading…
Reference in New Issue
Block a user