[U-Boot,3/3] Convert CONFIG_UBI_SILENCE_MSG to Kconfig

Message ID 20180210132415.19725-3-petr.vorel@gmail.com
State Superseded
Delegated to: Heiko Schocher
Headers show
Series
  • [U-Boot,1/3] ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG
Related show

Commit Message

Petr Vorel Feb. 10, 2018, 1:24 p.m.
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(-)

Patch

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