From patchwork Sat Feb 10 13:24:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 871708 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="X1MHfH+Q"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zf5Pg3Q7dz9sQm for ; Sun, 11 Feb 2018 08:57:11 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 2A112C21EC2; Sat, 10 Feb 2018 21:56:19 +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_H3, RCVD_IN_MSPIKE_WL, 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 B4769C21E3B; Sat, 10 Feb 2018 21:55:39 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 457AEC21C57; Sat, 10 Feb 2018 13:25:53 +0000 (UTC) Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by lists.denx.de (Postfix) with ESMTPS id C5396C21C4A for ; Sat, 10 Feb 2018 13:25:52 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id f71so2173242wmf.0 for ; Sat, 10 Feb 2018 05:25:52 -0800 (PST) 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=JWIH+YygPaJBTlbwZtI8nhHodWotNS4mrxivhyVMHOs=; b=X1MHfH+QJKIsQtMKHgXKdvcTj3MtPQWvVC8e1rT+Q4Bjx0Bg96XmG4x0wksV5UNY2E 7iMSMO0y6EOmIeQRSiHeValsF6YsTuahVhUgeiQvTWiIaOnLcuG6NK8a+Pqt/rknnoZY QDeVTJdqxjfw42kPafbw4+AiXGFdngVvnDi/KRprYDQCvliiCYYJ708bylnUwktRyzRB 5vDb9GuR52bF35P5y+6EL8BZv6fiL7Dpz1m2sLO+s+cKRwVwe5UwF1N+8MK8k0TR1uU/ ehsH+iQKZpP4ZoyzGtssbNAiRFzKva0PvPYhNGvRl5dX0cOseVpJYHUNi4CwKowTGdHU QoAA== 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=JWIH+YygPaJBTlbwZtI8nhHodWotNS4mrxivhyVMHOs=; b=jMUXi4XRAviHBFeIDQCespEDurdYEHxQ8HaAb8J+gRs+aJYMXIMHAbKbr7f3uxOCyt +4vcUJL1xCdAYqAmO7Upa/oOlSQtc2PEkxXma478Yp5GZ+JQJED9HyQvfHY0rl0++Otu 39euv2o4kle3h/noIISeb6LvgrnSQOCBynXa7bVSZ+wVIEzi/4qfkolSDug/nAmNHdH9 Au6N3/ZoTBE1X+MbyUjG/Uvc0uHkYgYnCqT5tnzUrh5oFXASCaIpMjIHHbm1Ng44ixe2 d6/ioyXyvy/k0GG8SBG0i0Yp1HCbgcIzR8NMPV85G011HnZXfeotIMM3EzV2gn8OoNUx f/8g== X-Gm-Message-State: APf1xPC3vVNAFCPwolDxuvxhaAAJQncuZqRNzZ4s1HX6Turl9rf76y2V eSfzE/RwVGMi2UdGFgczouCuTw== X-Google-Smtp-Source: AH8x225wMppa4E0HdhgCLGpQ/Xc5s28mKVSGvg6wyd29kZgO3Cd8dcCFasrA5+GzsiHJs+yGVSfgTQ== X-Received: by 10.28.126.138 with SMTP id z132mr4364330wmc.139.1518269152132; Sat, 10 Feb 2018 05:25:52 -0800 (PST) Received: from localhost.localdomain ([85.119.94.113]) by smtp.gmail.com with ESMTPSA id a6sm11081197wri.10.2018.02.10.05.25.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 10 Feb 2018 05:25:51 -0800 (PST) From: Petr Vorel To: u-boot@lists.denx.de Date: Sat, 10 Feb 2018 14:24:15 +0100 Message-Id: <20180210132415.19725-3-petr.vorel@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180210132415.19725-1-petr.vorel@gmail.com> References: <20180210132415.19725-1-petr.vorel@gmail.com> X-Mailman-Approved-At: Sat, 10 Feb 2018 21:55:36 +0000 Subject: [U-Boot] [PATCH 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 + 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(-) 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