From patchwork Sat Mar 24 00:49:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 890362 X-Patchwork-Delegate: hs@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TlwevHlA"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 407MLY1VQGz9s02 for ; Sat, 24 Mar 2018 11:52:05 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id EA429C21E3B; Sat, 24 Mar 2018 00:50:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 72AE7C21E4E; Sat, 24 Mar 2018 00:50:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id ABABBC21E3B; Sat, 24 Mar 2018 00:49:56 +0000 (UTC) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by lists.denx.de (Postfix) with ESMTPS id CC309C21E6A for ; Sat, 24 Mar 2018 00:49:52 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id l16so6386814wmh.3 for ; Fri, 23 Mar 2018 17:49:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lbfwu8Kv0ABrYFMOEwItvgF0HHoMPcLA8/gXedAVVdc=; b=TlwevHlATyvQ5FF14wZKqQVgJiNJ1lPVpvnnEopxeAcg81kNHn3RSnfIzZNuZFwh2I wstm3fSWyEjB6P2CieynoJh8aZ30PEl0pANJzggyO5SQ4TeB5CSJns9fu5+A+kQKI2Mm 5GXtk6BrWysRq+EP4HMsgsEJ4GxzConQrEnT/TjIXj3qbY7rkEdb/qYMbbJIPHAqfFDe EYfjB8ENyfE1i2S4AcVFMFnSuiLA1F8D1gjNLNfAobfhqraU6nAYDypkj2wqrB7bI2pH ROTDLx0JL8LwddGVUnBW0nzgOD20hUVT+95PG3q4POilLKN/WrdmFTvrnvi29qjMBOIJ MzzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lbfwu8Kv0ABrYFMOEwItvgF0HHoMPcLA8/gXedAVVdc=; b=JSN3foL8v2T5toaapDhJKB67cX2Ca07gNu6vKbg0UUP6zz5D+muJ/SiC7q+WzcM2Yt p6GH8HKacsxk0Sux29ss6dxF0tQjWwatkVfSKhu5Tzyu+hGFg+pzqOsB3hkFy1OXt2Ed 4MZcru1oX9EfzFoMbiX9vH+DBfCgkYSho8W+4rVsI5NrrkdD7jghUkh44MWhbbvFOTwT 2Ro1hERPM7wRMXf5s+hcxPzxZe6hokcIRm6WYzhYmL66SEMYr6kTz+xrESBoMBdhS4Rx pc7LBc3ZWxisPo/7kpuSJ2Q87JVPUc5E4Mt7RKAbIcizBaAG8EK0AHcRJ23AfyyeTPgT E7bA== X-Gm-Message-State: AElRT7GPG3X+SJIYz6Jlc0IMmscewwWGvB4z7535Ka8SSZmcVsczh2Q3 W4p59LFsdORyg82RPtqek4ul1A== X-Google-Smtp-Source: AG47ELtmuIB/cTwdMA9kd68BgVCTeTySG6/tcscaUf2LKygcjxYaA3zcSnno6IF8O1vuA/dS8Z0Ihw== X-Received: by 10.28.176.132 with SMTP id z126mr9205409wme.122.1521852592251; Fri, 23 Mar 2018 17:49:52 -0700 (PDT) Received: from localhost.localdomain ([85.119.94.113]) by smtp.gmail.com with ESMTPSA id f22sm20765565wmi.39.2018.03.23.17.49.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Mar 2018 17:49:51 -0700 (PDT) From: Petr Vorel To: u-boot@lists.denx.de Date: Sat, 24 Mar 2018 01:49:24 +0100 Message-Id: <20180324004924.7376-4-petr.vorel@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180324004924.7376-1-petr.vorel@gmail.com> References: <20180324004924.7376-1-petr.vorel@gmail.com> Subject: [U-Boot] [PATCH v3 3/3] Convert CONFIG_UBI_SILENCE_MSG to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Petr Vorel --- README | 6 ------ configs/am335x_igep003x_defconfig | 1 + configs/igep0032_defconfig | 1 + configs/igep00x0_defconfig | 1 + drivers/mtd/ubi/Kconfig | 7 +++++++ env/Kconfig | 5 ----- include/configs/am335x_igep003x.h | 3 --- include/configs/omap3_igep00x0.h | 1 - scripts/config_whitelist.txt | 1 - 9 files changed, 10 insertions(+), 16 deletions(-) diff --git a/README b/README index af7fbb6561..ed79298fd4 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 e4292b549b..be4f112286 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 cd6423409c..7683e7412b 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 9fb4b91452..fef1331c0a 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 caa5197df5..cf84783356 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 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 e00c73dab3..fe3f838598 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 fce1391ac4..0c7db05274 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