[U-Boot] [PATCH 1/3] ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG
Use of CONFIG_UBIFS_SILENCE_MSG was added in 147162dac6 ("ubi: ubifs: Turn off verbose prints")
Then it was removed in ff94bc40af ("mtd, ubi, ubifs: resync with Linux-3.14")
Cc: Joe Hershberger joe.hershberger@ni.com Cc: Heiko Schocher hs@denx.de Signed-off-by: Petr Vorel petr.vorel@gmail.com --- Note, not sure whether we need to keep this workaround. If not, it might be better to get rid of both CONFIG_UBI_SILENCE_MSG and CONFIG_UBIFS_SILENCE_MSG.
Petr --- fs/ubifs/ubifs.h | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 1d89465205..b4ce706a8e 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -618,9 +618,13 @@ static inline ino_t parent_ino(struct dentry *dentry) #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, ...) \
Signed-off-by: Petr Vorel petr.vorel@gmail.com Cc: Joe Hershberger joe.hershberger@ni.com Cc: Heiko Schocher hs@denx.de --- README | 6 ------ configs/am335x_igep003x_defconfig | 1 + configs/igep0032_defconfig | 1 + env/Kconfig | 1 - fs/ubifs/Kconfig | 7 +++++++ include/configs/am335x_igep003x.h | 1 - include/configs/omap3_igep00x0.h | 1 - scripts/config_whitelist.txt | 1 - 8 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/README b/README index 81b7ee1ce8..25614bd6dc 100644 --- a/README +++ b/README @@ -2644,12 +2644,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 04f2d33747..ac07744ffe 100644 --- a/configs/am335x_igep003x_defconfig +++ b/configs/am335x_igep003x_defconfig @@ -46,6 +46,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(SPL),-(UBI)" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set +# CONFIG_UBIFS_SILENCE_MSG is not set CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y CONFIG_ENV_IS_IN_UBI=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index b0daee1a61..8398e064bf 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 is not set 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..1a8f084e36 100644 --- a/fs/ubifs/Kconfig +++ b/fs/ubifs/Kconfig @@ -0,0 +1,7 @@ +config UBIFS_SILENCE_MSG + bool "UBIFS silence verbose messages" + depends on CMD_UBIFS + default ENV_IS_IN_UBI + help + Make the verbose messages from UBIFS stop printing. This leaves + warnings and errors enabled. diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h index d5b63e630e..6f53f42ac8 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 1be3f23432..58278d1c40 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4711,7 +4711,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
Signed-off-by: Petr Vorel petr.vorel@gmail.com --- README | 6 ------ configs/am335x_igep003x_defconfig | 1 + configs/igep0032_defconfig | 1 + drivers/mtd/ubi/Kconfig | 8 ++++++++ env/Kconfig | 5 ----- include/configs/am335x_igep003x.h | 3 --- include/configs/omap3_igep00x0.h | 1 - scripts/config_whitelist.txt | 1 - 8 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/README b/README index 25614bd6dc..84ff94de45 100644 --- a/README +++ b/README @@ -2577,12 +2577,6 @@ FIT uImage format: 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 diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig index ac07744ffe..0affd3feef 100644 --- a/configs/am335x_igep003x_defconfig +++ b/configs/am335x_igep003x_defconfig @@ -45,6 +45,7 @@ CONFIG_CMD_FS_GENERIC=y 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_UBIFS_SILENCE_MSG is not set CONFIG_ISO_PARTITION=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index 8398e064bf..a3f938a328 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_SPI=y 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 is not set CONFIG_NET_RANDOM_ETHADDR=y diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig index caa5197df5..d5c656730b 100644 --- a/drivers/mtd/ubi/Kconfig +++ b/drivers/mtd/ubi/Kconfig @@ -1,5 +1,13 @@ menu "UBI support"
+config CONFIG_UBI_SILENCE_MSG + bool "UBI silence verbose messages" + depends on CMD_UBI + 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 36d6e799fc..35548721bd 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -360,11 +360,6 @@ config ENV_IS_IN_UBI 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 - - 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/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h index 6f53f42ac8..89dc1608de 100644 --- a/include/configs/am335x_igep003x.h +++ b/include/configs/am335x_igep003x.h @@ -22,9 +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_ENV_VARS_UBOOT_RUNTIME_CONFIG
#ifndef CONFIG_SPL_BUILD diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index ab54a25d1a..e2a7f63e4f 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -136,7 +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_ENV_SIZE (32*1024)
#endif /* __IGEP00X0_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 58278d1c40..8dbf0270cc 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4713,7 +4713,6 @@ CONFIG_UART_OR_PRELIM CONFIG_UBIBLOCK CONFIG_UBIFS_VOLUME CONFIG_UBI_PART -CONFIG_UBI_SILENCE_MSG CONFIG_UBI_SIZE CONFIG_UBOOT1_ENV_ADDR CONFIG_UBOOT2_ENV_ADDR
participants (1)
-
Petr Vorel