From patchwork Sat Mar 24 00:49: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: 890361 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="ZSvZWt0H"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 407MKs1VRFz9s02 for ; Sat, 24 Mar 2018 11:51:29 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id DACC7C21E57; Sat, 24 Mar 2018 00:50:27 +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 57579C21E73; Sat, 24 Mar 2018 00:49:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A8462C21E85; Sat, 24 Mar 2018 00:49:54 +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 49A77C21E4E for ; Sat, 24 Mar 2018 00:49:51 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id i75so6411899wmf.0 for ; Fri, 23 Mar 2018 17:49:51 -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=huN0egLoHhSb3y0o06oZQnuSR+WcDmhfX32UdJMGJ7s=; b=ZSvZWt0Ht3y67GKzlkezhHPdtxMviAXDfrY7CgoPXS9mugToxvm7l86h0Tt65pFDy+ 1e88QzYrjRxLi/X3TOZN6zALcZBctCSbcoEzSt35uAX2cc6s7fstp40FcctePCdNq/3M PL+qMPtM2UmIViphUx2Dw+rl6QNPmuJmYBSnDYwlQMpD9oIl7R91WPjQJqxyKMHuKhCz AM63GLo27qYO+F8z5sWpPJDwQVrdpcyhG/KmUrF5mAWAo/qbJybBjoE/VSIifLCwko3Y GDtfVTmG3MMRG0TvRblGkvpVlMsooK9d914NzMQc+TXIbnRmCb9gRaLSAWoP/HZTaMMd 4HHQ== 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=huN0egLoHhSb3y0o06oZQnuSR+WcDmhfX32UdJMGJ7s=; b=fuZ4aIwQEP2umSGn0lTb9PwYQAA8wlQNs50Yqw7JH6ODvTNXZIA1MU+KevScKctJxB BSAB/m+IdJmmiPgMNLUb+8MXzkv85jTsQxvV1+VW9OmgVzZObmBmBX5NnmtdLQ8oOfXL JEULVxtiM+b5l8Zv3RrwC++9+vAAIa9w8vwcLa+9cA5UkTRQL/D3Chzx93tw7C/SM8dh gp2mtaXey2LNdsgtqRzsGaakJR3QZYsTk6Lf85VB9SFavTfqCO4VqYCQaRk4+E59f4gF EvQmUZtlCKUk0VUQl/lfxfeO0L/Xzrf2rka/OMsecC7PY1i1mcT4mJQM5SFeZL3Wp7o8 Rp6A== X-Gm-Message-State: AElRT7Hj025bSk/jSaf+C9kkgYOKkNP+hXvxwDCKhc79wwCPqpYHmKNd tKtRs1GHM3M3QyvXoKpfHDDi6g== X-Google-Smtp-Source: AG47ELvWZtezu9TstbdQjkoziN8wQ0wYCYD9X6FhpP31Na2fKBJg+vnmjrXW9UU9ElW4JSRX7Bhb2w== X-Received: by 10.28.195.10 with SMTP id t10mr7703969wmf.121.1521852590700; Fri, 23 Mar 2018 17:49:50 -0700 (PDT) Received: from localhost.localdomain ([85.119.94.113]) by smtp.gmail.com with ESMTPSA id f22sm20765565wmi.39.2018.03.23.17.49.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Mar 2018 17:49:49 -0700 (PDT) From: Petr Vorel To: u-boot@lists.denx.de Date: Sat, 24 Mar 2018 01:49:23 +0100 Message-Id: <20180324004924.7376-3-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> Cc: Joe Hershberger Subject: [U-Boot] [PATCH v3 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" Introduce another difference from upstream (kernel) source in fs/ubifs/super.c: adding preprocessor condition as y variable in mount_ubifs() depends on CONFIG_UBIFS_SILENCE_MSG: fs/ubifs/super.c:1337:15: error: variable ?y? set but not used [-Werror=unused-but-set-variable] long long x, y; Not setting CONFIG_UBIFS_SILENCE_MSG in am335x_igep003x_defconfig and igep0032_defconfig. Although it was defined in their config headers, it depends on CMD_UBIFS which is not set for them. Signed-off-by: Petr Vorel Cc: Joe Hershberger Cc: Heiko Schocher --- README | 6 ------ configs/am335x_igep003x_defconfig | 1 + configs/igep0032_defconfig | 1 + configs/igep00x0_defconfig | 1 + env/Kconfig | 1 - fs/ubifs/Kconfig | 6 ++++++ fs/ubifs/super.c | 7 ++++++- include/configs/am335x_igep003x.h | 1 - include/configs/omap3_igep00x0.h | 1 - scripts/config_whitelist.txt | 1 - 10 files changed, 15 insertions(+), 11 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..e4292b549b 100644 --- a/configs/am335x_igep003x_defconfig +++ b/configs/am335x_igep003x_defconfig @@ -39,6 +39,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(SPL),-(UBI)" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_UBI=y +CONFIG_UBIFS_SILENCE_MSG=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index 0a3dff7796..cd6423409c 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=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig index 872766939a..9fb4b91452 100644 --- a/configs/igep00x0_defconfig +++ b/configs/igep00x0_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=y 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..9da35b8a37 100644 --- a/fs/ubifs/Kconfig +++ b/fs/ubifs/Kconfig @@ -0,0 +1,6 @@ +config UBIFS_SILENCE_MSG + bool "UBIFS silence verbose messages" + default ENV_IS_IN_UBI + help + Make the verbose messages from UBIFS stop printing. This leaves + warnings and errors enabled. diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index effa8d933f..2c478cba96 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -1334,7 +1334,10 @@ static int check_free_space(struct ubifs_info *c) static int mount_ubifs(struct ubifs_info *c) { int err; - long long x, y; + long long x; +#ifndef CONFIG_UBIFS_SILENCE_MSG + long long y; +#endif size_t sz; c->ro_mount = !!(c->vfs_sb->s_flags & MS_RDONLY); @@ -1613,7 +1616,9 @@ static int mount_ubifs(struct ubifs_info *c) c->vi.ubi_num, c->vi.vol_id, c->vi.name, c->ro_mount ? ", R/O mode" : ""); x = (long long)c->main_lebs * c->leb_size; +#ifndef CONFIG_UBIFS_SILENCE_MSG y = (long long)c->log_lebs * c->leb_size + c->max_bud_bytes; +#endif ubifs_msg(c, "LEB size: %d bytes (%d KiB), min./max. I/O unit sizes: %d bytes/%d bytes", c->leb_size, c->leb_size >> 10, c->min_io_size, c->max_write_size); 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 d6fd150614..fce1391ac4 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4627,7 +4627,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