[U-Boot,2/3] Convert CONFIG_UBIFS_SILENCE_MSG to Kconfig

Message ID 20180210132415.19725-2-petr.vorel@gmail.com
State New
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>
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(-)

Patch

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