From patchwork Mon Mar 19 10:08:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 887657 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="DsTN7Bxs"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 404Wx64Mjcz9sW7 for ; Mon, 19 Mar 2018 21:08:42 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CDE02C21E12; Mon, 19 Mar 2018 10:08:39 +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_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 B84BEC21D8E; Mon, 19 Mar 2018 10:08:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8D43EC21D8E; Mon, 19 Mar 2018 10:08:34 +0000 (UTC) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by lists.denx.de (Postfix) with ESMTPS id 36F17C21C2C for ; Mon, 19 Mar 2018 10:08:34 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id z73so13680722wrb.0 for ; Mon, 19 Mar 2018 03:08:34 -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; bh=29GVKNBkcRlFihkmB3H8iq74OX3dkQ1NoOOLUMb972s=; b=DsTN7BxsLGgzwBYdEdqDL+7IMmQiC1M6SzkHC5YgAm56+d0crU/6BgFTL+Dpv+oFZg FUj25oxlV91MD1sgOpAXjs5zqaWB3qhVDrNawAy8NPAHCBQ45Fz+2npYUV564rZMmNt/ EWLjZk5iru22E5dQHrtSCl/TM6qncYSzsBfxQmXirIFSXsNyq+2XwSzVQqqLuoWVAmsi VxFMjcsE5g6qxF+ApOErYp5dp/WJg7Fxc+ZS5cDwM5/qvjS894VeoEj14Ck4IYFTEi+E JmkxxxRts/+FEVPzLW9dTnseOg6vVjaqbbTvUEYDNYSLk/JZNsnUn6XiCCO6OA1+1XnH WdjQ== 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=29GVKNBkcRlFihkmB3H8iq74OX3dkQ1NoOOLUMb972s=; b=ZQmUu3B786o6XngxiX6ZmzXHNs+EXYOaaNCHaJNj0VpnDDlLyRzr18X9eBg0P3cij+ MvG32znMEBDE73z08maHfoEEpoVdmZhxKe5JyWXNdFcXhl8eeKdHVEBM9fFNNSZR6K4k ZXyOzB4cC8cayz+O/MMdTO7B1FeeYd9Qi/wKOa2SI8bm635vBk+MygySF68FmpifY76z QEkw4FcchjrBsBF2x3IIKPnAxkOT8f+DtTpCPh1Go6bjaVYkWjE2ZBTiAzVKShn24fr+ ncZb8YyIO0xMPhIyfC4P2SIIHXcnIIma7C3NqLLskaBiiCRbbODrs6CmXTYhJKffcItK 7ioQ== X-Gm-Message-State: AElRT7Gv0ufjRyeNXOt4edtKKOyB51ORj3mwxgjlrwovp5BBf4LG5x3M PAiWL+LsVpPHPJMyX51DVUziMpS5 X-Google-Smtp-Source: AG47ELsYrXGz99oNgfbSxBPwTQHuwWaSXnghxmvxCMwHBUzUMp7Qq3FP4CVBQQ39RP1R/gWDKTFJEQ== X-Received: by 10.223.154.47 with SMTP id z44mr6440049wrb.239.1521454113632; Mon, 19 Mar 2018 03:08:33 -0700 (PDT) Received: from localhost.localdomain ([85.119.94.113]) by smtp.gmail.com with ESMTPSA id u89sm12369106wma.10.2018.03.19.03.08.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Mar 2018 03:08:33 -0700 (PDT) From: Petr Vorel To: u-boot@lists.denx.de Date: Mon, 19 Mar 2018 11:08:23 +0100 Message-Id: <20180319100825.16049-1-petr.vorel@gmail.com> X-Mailer: git-send-email 2.16.2 Cc: Joe Hershberger Subject: [U-Boot] [PATCH v2 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 --- Changes v1->v2: Rebased to current master as requested by Heiko Schocher. --- 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 Mon Mar 19 10:08: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: 887659 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="JZ6HN0+U"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 404Wyp2HJFz9sW7 for ; Mon, 19 Mar 2018 21:10:10 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 003D6C21DD7; Mon, 19 Mar 2018 10:09:16 +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_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 AB518C21E18; Mon, 19 Mar 2018 10:08:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 50727C21DC1; Mon, 19 Mar 2018 10:08:40 +0000 (UTC) Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by lists.denx.de (Postfix) with ESMTPS id 4C129C21DE8 for ; Mon, 19 Mar 2018 10:08:36 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id c24so6120811wrc.6 for ; Mon, 19 Mar 2018 03:08:36 -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=rBpw2IBa+h3uDf1nr/N5pZg9HV/bymZDmlgy3ealmkQ=; b=JZ6HN0+UDYvrTuZyw89e0Xlbc7zo7Z91wSNU6TlvWTM6Z1k4vlcSbpCpLqjAVrQdD5 IusoC8dw0xhdGAVoYNwqjF0offGhF74er4xMIJhfRvHiNUi7QkNEousJfHYht38hfW4H oi+A19Au40mLCLwpOCAT4JAWGNXMHp12nSSg5eAD4BsSHAgM96Zgh+C3cM/lkjfuvy7n EAy40fqLePp85Vt3iQ3Jws/MjD1af9Dy/X/ovZRi0GFGmczwRH5/VovppNeOeCVodVwr isMNc8gae2HnTJvylQdVsjxdRaQ+XVQTHgFRmi+xC7Y7Cv330MBLxWKWvUFUlGpiRHEP B32g== 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=rBpw2IBa+h3uDf1nr/N5pZg9HV/bymZDmlgy3ealmkQ=; b=MZV30WtNJbXJibYBYb99nucckRqba4zzO/xYFI1Q7SNSSdAq38myFQphfFFr37/64j j9cVasXrephMuxOwbDAjks/5fXjunDO3MIuKJJBrkEaIYUOEqF9nG+j6TuZJWAvclDpW 1HipMD3WlgZSCWt0l0iRl62itK66O6lEcFiaRSaX+yNEtg0Dk2Y8gE5MrXNEo2s8JEuo 94RJnKD7damTv2kHAhMZSgBp+TLPTcl8Qj8YVcun90BULGsMHNPqDuq7F+Y8FVZTMQNm ljNnLWcse52ef8zN2t6H7prMSxnvhhfrB1Thz62KtVZ7J7uxmPAQoN0RoX9bvC8faju2 v7HQ== X-Gm-Message-State: AElRT7GdA6BD3wLygmpqMSgL6mMqMvXI6btZsRG/BABXwHpgQbzh55du 0l6oUoe/qojILuMTy0YfhXXnNZoI X-Google-Smtp-Source: AG47ELuS2fGaCvmfwkVnJASFnhk/fB4F6N7e5bPEJyuFJbWgewaiibt7fjGnM1X92fR3pN7qp8Kqgg== X-Received: by 10.223.146.133 with SMTP id 5mr9309458wrn.109.1521454115759; Mon, 19 Mar 2018 03:08:35 -0700 (PDT) Received: from localhost.localdomain ([85.119.94.113]) by smtp.gmail.com with ESMTPSA id u89sm12369106wma.10.2018.03.19.03.08.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Mar 2018 03:08:35 -0700 (PDT) From: Petr Vorel To: u-boot@lists.denx.de Date: Mon, 19 Mar 2018 11:08:24 +0100 Message-Id: <20180319100825.16049-2-petr.vorel@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319100825.16049-1-petr.vorel@gmail.com> References: <20180319100825.16049-1-petr.vorel@gmail.com> Cc: Joe Hershberger Subject: [U-Boot] [PATCH v2 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 5fd6428c5c..af7fbb6561 100644 --- a/README +++ b/README @@ -2549,12 +2549,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 d2026da7b3..324f6e5289 100644 --- a/configs/am335x_igep003x_defconfig +++ b/configs/am335x_igep003x_defconfig @@ -38,6 +38,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_ENV_IS_IN_UBI=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index 0a3dff7796..0199250812 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 50fd46a589..e00c73dab3 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 b0958d7a80..84c1e4a822 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4629,7 +4629,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 Mon Mar 19 10:08:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 887658 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="pVxyolyP"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 404Wxz0KlVz9sWL for ; Mon, 19 Mar 2018 21:09:26 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id AB5CCC21DF9; Mon, 19 Mar 2018 10:08:55 +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_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 AEF37C21E15; Mon, 19 Mar 2018 10:08:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1EECFC21E29; Mon, 19 Mar 2018 10:08:41 +0000 (UTC) Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by lists.denx.de (Postfix) with ESMTPS id 5359BC21E0B for ; Mon, 19 Mar 2018 10:08:38 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id l8so17933761wrg.5 for ; Mon, 19 Mar 2018 03:08:38 -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=vRNZN3bJwaT3zhsHUEwOuLnPly1nUT4oa0gMasdgTxU=; b=pVxyolyPlmgyHVGl/c1M13otDdbk+wxs4lqjWr/208hQndfR5PJOIkkbiaG61lbaD9 xVFMktGU7yrRhZTlM+yAqm1gHVXwmsp7YbcZZatycOE6zEcDrAgJNIzYuHmIlteMUq7w xnxSpL7SkjhcLf+ZHBf2lY31L7xLzG0j1X3pJARs6zmCdPs1stOVzmq4e5wTlAK2zr0S Zex4BRWUmlvDcCUTiNYx60SmvLmKHH8KteUFwGQkYrlaSTHUgDVReKCygV12qU1a4z04 FG+/0TJElTowC3CGSyxjzpqnLikqswRqq7jMG4uOp18K4JqpJXCDBKjSe0M/IA6EB6OA buTQ== 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=vRNZN3bJwaT3zhsHUEwOuLnPly1nUT4oa0gMasdgTxU=; b=X6RC+hnRSbiVrt/LzXaAfc3IOsj+FZ9INjAeyxGlpXYtEK+IeXQPmV3vzkPxQ5Ciwd ErzYLeo0tLhV/zideq1/XxyxMTOgMxkR2v+cw9/vcVCnZMKmUNUudo4bllhcu9i80nQ3 aOyaaHn4VD8rHCOX5c4eybYZTnaQrjJzFqsEz9bSlHLqmjurNNXzZtA3FSWhiEOkKQAI la3cLmbse9Gscicn2H038ch50ASc48XLwTk8swpagWBBLf1mGn7noLlEC4jdn9w7T+Hw 4iG4jM2omzylM8qEiBqOYG0QKozt9C9lU9jXuhfgZusyvV0KjaWsFutWUMn3TGpg3isz 3rPA== X-Gm-Message-State: AElRT7EpzFay4pTQNYBEoj/1D0jj4ismcdecAGiuMxdtpm0QajqvyP/d IC+gPtYF26EHFSwZ/01CY2u7TTs9 X-Google-Smtp-Source: AG47ELtqeX2xPMHe2qoOAbyocRL0V3zMSJqYldS0E2uQWvv1BjkwjpbBbYA8dP0dUjzKv9n3hZNh4Q== X-Received: by 10.223.161.77 with SMTP id r13mr9091099wrr.1.1521454117741; Mon, 19 Mar 2018 03:08:37 -0700 (PDT) Received: from localhost.localdomain ([85.119.94.113]) by smtp.gmail.com with ESMTPSA id u89sm12369106wma.10.2018.03.19.03.08.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Mar 2018 03:08:37 -0700 (PDT) From: Petr Vorel To: u-boot@lists.denx.de Date: Mon, 19 Mar 2018 11:08:25 +0100 Message-Id: <20180319100825.16049-3-petr.vorel@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319100825.16049-1-petr.vorel@gmail.com> References: <20180319100825.16049-1-petr.vorel@gmail.com> Subject: [U-Boot] [PATCH v2 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 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 324f6e5289..b185d0df5a 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_UBIFS_SILENCE_MSG is not set CONFIG_ENV_IS_IN_UBI=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index 0199250812..b44a56eec0 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 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 84c1e4a822..b8c1b62ab0 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4631,7 +4631,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