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