From patchwork Sat Feb 10 13:24:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 871706 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="L7BJFQ9b"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zf5N34XHzz9sQm for ; Sun, 11 Feb 2018 08:55:46 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id D3852C21ECF; Sat, 10 Feb 2018 21:55:40 +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 B9D6DC21CB6; Sat, 10 Feb 2018 21:55:37 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 18EE1C21C57; Sat, 10 Feb 2018 13:25:01 +0000 (UTC) Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by lists.denx.de (Postfix) with ESMTPS id 81293C21C4A for ; Sat, 10 Feb 2018 13:25:01 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id g4so992884wrb.6 for ; Sat, 10 Feb 2018 05:25:01 -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; bh=2k37FLwcugivqVLro7zhV1aaqkhz3tFoUKKOO2BmFLU=; b=L7BJFQ9bExFeTca5Q0TvhXnYlHlCxBEYy5ss8SxP2eQRwqmEvBPnuT8/MC1g3No1Cw mHT6X2MlHJBQA48mi8yzsh0olwwH7YtFH++fJayuKPHg3D3EY6Qr5AFqO2wq0lYXCjMi gV3wc1UBX/Xi6INci20IUUcNkOtxHnYxLAdfjiz9HfzMhxC5sKUPg9edUc/kN56lgyjv WXa71F6lYlA2agKkuNHb5XrwkrsCVtRiDPOZJplW6LuNS67HdN0sX75vGJ+UPTZGvBTt MZv4LkbOZ6Rn3y9545yalEJ78MSjQm9GWtG4N8iqIK4UYt5Pz0DBhBV6CIrcX2iccaHq I6gA== 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; bh=2k37FLwcugivqVLro7zhV1aaqkhz3tFoUKKOO2BmFLU=; b=Lid4WXEZbnqpqEti0GcqGu2ydZHWpLTW0fMlvy1I6Xkyi+DO5PyXNcW+AL4pQy8qiT 6bdG6uq2HjiCImEBKHQ8UcY3mbpQvFhHipIWvjwJzoZi6aC4FGT52tNGUAJ1ehTXsBJP DRx/31MnGozT+AehLlR6pTyEBlrJB25/IswUsz97qzde5VbjbOl/o9Z1YI2GQ13sth/c nbdlIa8UYLvj5Sl1zG6Ewhv7uKLW8dYjAFZ0IGL65ThyUWUUIC5zm9OPjxh2FOdQz6AN 5Ka6fZtFbmTJDObgJn7qqsJMcuVqHkoLt5mkdOUMOqYpnCMxGRLJYeh011s9jDG6TvBI buSg== X-Gm-Message-State: APf1xPA+jsxRhtdn93FIUMKu2fOXB93wXnVKqMUy+PKLZY54UQZFNgLY 1Tl5v0GdDFLw1Czt3o93ICBgnA== X-Google-Smtp-Source: AH8x225GgiI2ZOaRqvH1dYmUPRKU/3j0R19tpOnauqLvEdp56Tj6+iWRyncZUg12Q8DC7dnJWNnCsw== X-Received: by 10.223.164.199 with SMTP id h7mr5492078wrb.83.1518269100804; Sat, 10 Feb 2018 05:25:00 -0800 (PST) Received: from localhost.localdomain ([85.119.94.113]) by smtp.gmail.com with ESMTPSA id a6sm11081197wri.10.2018.02.10.05.25.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 10 Feb 2018 05:25:00 -0800 (PST) From: Petr Vorel To: u-boot@lists.denx.de Date: Sat, 10 Feb 2018 14:24:13 +0100 Message-Id: <20180210132415.19725-1-petr.vorel@gmail.com> X-Mailer: git-send-email 2.16.1 X-Mailman-Approved-At: Sat, 10 Feb 2018 21:55:36 +0000 Cc: Joe Hershberger Subject: [U-Boot] [PATCH 1/3] ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG 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" Use of CONFIG_UBIFS_SILENCE_MSG was added in 147162dac6 ("ubi: ubifs: Turn off verbose prints") Then it was removed in ff94bc40af ("mtd, ubi, ubifs: resync with Linux-3.14") Cc: Joe Hershberger Cc: Heiko Schocher Signed-off-by: Petr Vorel --- Note, not sure whether we need to keep this workaround. If not, it might be better to get rid of both CONFIG_UBI_SILENCE_MSG and CONFIG_UBIFS_SILENCE_MSG. Petr --- fs/ubifs/ubifs.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 1d89465205..b4ce706a8e 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -618,9 +618,13 @@ static inline ino_t parent_ino(struct dentry *dentry) #define UBIFS_VERSION 1 /* Normal UBIFS messages */ +#ifdef CONFIG_UBIFS_SILENCE_MSG +#define ubifs_msg(c, fmt, ...) +#else #define ubifs_msg(c, fmt, ...) \ pr_notice("UBIFS (ubi%d:%d): " fmt "\n", \ (c)->vi.ubi_num, (c)->vi.vol_id, ##__VA_ARGS__) +#endif /* UBIFS error messages */ #ifndef __UBOOT__ #define ubifs_err(c, fmt, ...) \ From patchwork Sat Feb 10 13:24:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 871707 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="nuu+CtTK"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zf5NZ1Tqrz9sQm for ; Sun, 11 Feb 2018 08:56:13 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 6F46CC21E4B; Sat, 10 Feb 2018 21:56:02 +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 A5301C21E35; Sat, 10 Feb 2018 21:55:38 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CE6ADC21C57; Sat, 10 Feb 2018 13:25:50 +0000 (UTC) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by lists.denx.de (Postfix) with ESMTPS id 67884C21C4A for ; Sat, 10 Feb 2018 13:25:50 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id b21so2194238wme.4 for ; Sat, 10 Feb 2018 05:25:50 -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=pYk1+FlWRvvUPrcgR7mtO70XISojKbVbo2xr80LDIWo=; b=nuu+CtTKDk5ajZzkOZIU49Yg2cgsI+vp2+ACyE26wj08tnOqL3qSKzbRh33EIWVlVg ++X47r9HQNL+w3eCB+8xDS71uejyfRZgdddcEFQyG32q2SipXUmdLuUJyn6f23kzhQsV Bhp0w6QegQcgIh+zDk2W7D3lVx/trhR4aXTjRUXHU5tsAiNbO3srSOn8e3fny1pvym4i pgzE3fxfUnMd7KoxT/yEXtWe8BJv+XJ1iz7G96aAuOyGJID2r/MUpNNP1oJpTXQHLj46 N8ubRBBeSqYX49qITPJIzQqQvENRkvvE4rw4i5ejd3tl8iKphpERDwrHms8ZL/Djdai1 zaww== 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=pYk1+FlWRvvUPrcgR7mtO70XISojKbVbo2xr80LDIWo=; b=Vm0rFX05fixWk/zfhIkcurEDZT5wJERVpyiUf1j2OzR9pDs7MolgkwWcVekiA5bfGD Kg3oG8RTKNg7jOH0HQTfpxflTMYJE3k0NoEGbSZVQDVnqpICIf6SFl1yse+xPuL4/TQJ 5qQ+Z3jI6gmvDGeefzpOTIL7SgNJkNmUJouCdGrlzZTdQ8U3e0JIlwfC6vgblWYcjDc8 hdZ3R5f6SvPk5ZVrr3zhhoaxbCRX6O3JvWQZDkR57rTE9YEuderOF3twkeKodZwBou1V 25W2oqKyckXHLi/REeMYvfJ4Ta6REtPDtY9H1IP2yJHGGFDgWwkH44GvpimjdekAbqQW USuA== X-Gm-Message-State: APf1xPCVq6994eamCv9AVaHHKKgOingRUe/ZMDTLZU8BpbwiMSfubh1H Jc2XzPWiv9HRzVxKuRiWNwU4sw== X-Google-Smtp-Source: AH8x226JIBhByb11egyyafGAjBLxmeOIYp0N+xOQdJwijnKTGD2/OJV/NyQmfVMIihfFrw99WbOngA== X-Received: by 10.28.86.131 with SMTP id k125mr4537055wmb.83.1518269149734; Sat, 10 Feb 2018 05:25:49 -0800 (PST) Received: from localhost.localdomain ([85.119.94.113]) by smtp.gmail.com with ESMTPSA id a6sm11081197wri.10.2018.02.10.05.25.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 10 Feb 2018 05:25:49 -0800 (PST) From: Petr Vorel To: u-boot@lists.denx.de Date: Sat, 10 Feb 2018 14:24:14 +0100 Message-Id: <20180210132415.19725-2-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 Cc: Joe Hershberger Subject: [U-Boot] [PATCH 2/3] Convert CONFIG_UBIFS_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 Cc: Joe Hershberger Cc: Heiko Schocher --- 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(-) 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 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