diff --git a/README b/README index af7fbb6561ba5062b4662fc3145945599db664aa..ed79298fd4ea9f09911ac5bbc7860da870d9055a 100644 --- a/README +++ b/README @@ -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 diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig index e4292b549b8deb051a80930532933f777ef8e5a5..be4f1122861eab41a4459ca48fc07e071df09e7e 100644 --- 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 diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index cd6423409c90d053019f45a9f802c1adceecf3d4..7683e7412bdf7be200fb01f0cc088daa9243ba59 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=y CONFIG_NET_RANDOM_ETHADDR=y diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig index 9fb4b91452159ba5a2a6f4ac6a9be1ef77b0b942..fef1331c0a4cfbffb0d2ba72d43728d86528a33c 100644 --- 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 diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig index caa5197df5062b83fea37f8d77ad1015621ff627..cf847833562da1034b906fa78763a9f262acc3f8 100644 --- 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 diff --git a/env/Kconfig b/env/Kconfig index 36d6e799fc4c427328e628c2eab65cea3cd9b750..35548721bdd6b49cb116700505bd2b38049bf48b 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 e00c73dab334f87366b2cb8b21939f4a122489dc..fe3f838598fdb562d6d788e02f42c23afa2fd0dc 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 ab54a25d1a0f4ea8df66838c9726bd44421608c5..e2a7f63e4fa2b9dc160f2c11833b85d106bcf85e 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 fce1391ac407a63b828e4c3173fcb18883252e4a..0c7db05274f6ae2b4d7d9aedf5f4e3207ebdacc9 100644 --- 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