Convert CONFIG_UBI_SILENCE_MSG to Kconfig

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
6 years ago · c0ce4ceaba
parent afb6fda2ae
commit c0ce4ceaba
9 changed files with 10 additions and 16 deletions
--- a/6
+++ b/6
@ -2482,12 +2482,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
--- a/configs/am335x_igep003x_defconfig
+++ b/configs/am335x_igep003x_defconfig
@ -37,6 +37,7 @@ CONFIG_CMD_EXT4_WRITE=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_ENV_IS_IN_UBI=y
 CONFIG_UBIFS_SILENCE_MSG=y
--- 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=y
 CONFIG_NET_RANDOM_ETHADDR=y
--- a/configs/igep00x0_defconfig
+++ b/configs/igep00x0_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=y
 CONFIG_NET_RANDOM_ETHADDR=y
--- 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
--- 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
--- 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
--- 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 */
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@ -4629,7 +4629,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