From patchwork Sat May 26 10:32:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 920960 X-Patchwork-Delegate: sr@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="Pgkhz6EE"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40tKFk4q1Tz9s0w for ; Sat, 26 May 2018 20:32:57 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E5073C21DFD; Sat, 26 May 2018 10:32:49 +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 03BF3C21D56; Sat, 26 May 2018 10:32:47 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9D9D9C21D56; Sat, 26 May 2018 10:32:45 +0000 (UTC) Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by lists.denx.de (Postfix) with ESMTPS id 0BC99C21C27 for ; Sat, 26 May 2018 10:32:45 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id w3-v6so3313208pgv.12 for ; Sat, 26 May 2018 03:32:44 -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=m9/OHIVxnHOiSqzqdJhMg+HckCIKxM1d4iSBUNrCR24=; b=Pgkhz6EE0YoJBMB9b1Uo4Mhm0q5pFKlQ9Yxn51m6s68sieNTzU+1kg7A0GtrL4QJxX nwXYCuGp8kP6bVzenGN+jW7SDiho9SxWZypc5PFjy9NOPMWuCI+BYAf5PTMDWv46pEVI yxDLVEUCr9e/1jh32VKteyKq7nA1zkw1foGCFG6oIN0zRJgV507RECT9ek+hkR1EDh3Q Jv3QZ48q4sgWp0v0Ft6ClAYvMSl54MFmP7dGe8iOXGfS9pHTerJKqch1rsGm6WFLUK5+ pKlZPN5FJHOY/pJTVpe3iowt3OS/YoZeA3Ws2oNNqV+6IpmIUzalDj5v+SFw12cuZmew Pw9A== 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=m9/OHIVxnHOiSqzqdJhMg+HckCIKxM1d4iSBUNrCR24=; b=QE9/NGTplMITal4n32vZOP5UJ4IzMp9+qMYiGlK67vFBrXYu/65G99Puau8Q0VC/bx 9UZfgDuq0fqm9lvaXISXhZNyLPynSMFkSoUehPwwJb1evn6vr9u4J23mOFtw06zrpNuS invsNyvWyXZPM8UvYngOabr10JqUDI4ia/sU3dMh7eAbAkUcJI2ouPyDNEL3ueKyh687 3SlwG6+rghF+UojB+b8ArnWd5emxHQQz1nowUHl/MQSMJyCb9nCQT0NJZVEPQXFB+2/u cO6z50ncbqzEGHxAs7cg1Aj5JtOMil3rOHSyMmfvmb0Aev/MkRIAkUZOmglSalC1ASl0 tkWw== X-Gm-Message-State: ALKqPwfIgiioc9aa3c7UYeGHshuJ4fDknjV/pC+9rDhg7pRUKuORyzxD n5JNGS4NFoUXLlhY2gezAJtcV7Ot X-Google-Smtp-Source: AB8JxZpYTuRijfDjeCvEds3dIIxVpmrS18rbSZFFWx01MgIHlTkTb0qlUHlUMVvzf7AQlyLqaNThiw== X-Received: by 2002:a62:4b16:: with SMTP id y22-v6mr6003798pfa.29.1527330762880; Sat, 26 May 2018 03:32:42 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id x2-v6sm36209751pgc.53.2018.05.26.03.32.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 26 May 2018 03:32:42 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Sat, 26 May 2018 22:32:28 +1200 Message-Id: <20180526103229.4959-1-judge.packham@gmail.com> X-Mailer: git-send-email 2.17.0 Cc: Thomas Petazzoni , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH 1/2] configs: remove redundant comment sections 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" mv-common.h and mv-plug-common.h still had comments delimiting sections of configuration options that have all been moved to Kconfig by previous treewide efforts. Remove the redundant comment sections. Signed-off-by: Chris Packham Reviewed-by: Stefan Roese --- include/configs/mv-common.h | 4 ---- include/configs/mv-plug-common.h | 8 -------- 2 files changed, 12 deletions(-) diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 8c5350ea0cef..c7673838faf2 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -28,10 +28,6 @@ /* additions for new ARM relocation support */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 -/* - * CLKs configurations - */ - /* * NS16550 Configuration */ diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h index df686dbe4f6c..fa2b59559205 100644 --- a/include/configs/mv-plug-common.h +++ b/include/configs/mv-plug-common.h @@ -23,14 +23,6 @@ #define CONFIG_BZIP2 #endif /* CONFIG_SYS_MVFS */ -/* - * Commands configuration - */ - -/* - * Extra file system - */ - /* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros From patchwork Sat May 26 10:32:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 920974 X-Patchwork-Delegate: sr@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="r+O6levz"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40tNy536Y1z9s0w for ; Sat, 26 May 2018 23:19:41 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 174A6C21E26; Sat, 26 May 2018 13:18:59 +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, KHOP_BIG_TO_CC, 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 1E360C21E08; Sat, 26 May 2018 13:18:41 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 11930C21E3B; Sat, 26 May 2018 10:32:58 +0000 (UTC) Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by lists.denx.de (Postfix) with ESMTPS id 2BC70C21E08 for ; Sat, 26 May 2018 10:32:55 +0000 (UTC) Received: by mail-pl0-f68.google.com with SMTP id z9-v6so1197797plk.11 for ; Sat, 26 May 2018 03:32:55 -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=aV76Q1NSxQ7+36OmIR8CLWHyIXco2AwTguVJ7FqjWJo=; b=r+O6levzPO4TFZBveVThpSpv1mLZFkhN58eJn5FDmIhjDoRLQ4x1HZHeRwKZV0YvC6 ZQZ+zW8p+pxktnKBeOJmeEapDMhH6FNvgmv+RUeA2+mEOucXI9UM8fodUXEcWOQzmAeJ awdYxp8qqGDt7nc/qDdX65eL5ZONqW1/KelbShq05N18f36qBYhago4vS56djo24XfJq pWGrc2NBFB6DviYBS5KI1ZYOQtMRSuMcU8QpE/csFwpIyNM6Ys4MSuFp40VKDGog8a0f 6nCfoclR/T6z8CAupeNvnM3naC2lzxwIoa2PKV8LG3ZU5OsTrDb1WwgjD2NBgzBJe6/D xijQ== 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=aV76Q1NSxQ7+36OmIR8CLWHyIXco2AwTguVJ7FqjWJo=; b=juQ2PjCg+km19oOO+6sBMJ6fKpeCHgKeOprlnXQIoeX4t82M6SG3HIgX7Kc4GLql2D WY/nfzilzLuCsFBkkciFf0fuYJp1R6f6oiuymjyDDGqjL1jGMAcgf2BntLEWdM5DsViY yn4yQvIbaNwNymErA+PUm896/OyHNoK1BcA65rRZV/7Fy7IrxgbWbCcHH98FhpxlB5+Y MLgJekqhoxlD+YiyNCckanJiVqsrZ5hYaREJAjv0GSWML01SBAPhkAJcg50ZafCrJTwe 8GRlLDGUt4f9GZN1y7AaFoh9dBO5iYdBzIlsr9XnDEulAh57qc/KcMJd2Ei4JdHPQnsW pJJA== X-Gm-Message-State: ALKqPwc4ObK9HSST38Vvc/5ub68/bmCDWXnW5+AhhWdNuQ3fK5pY+sLC Whr4RsUh70MrOJ8iOCGoTZjm+21VO4k= X-Google-Smtp-Source: AB8JxZoh+6abrpedWWxjL8Sk1mIyYFzLvTZ3Lhia8j6miYG3bUpJnnRVgP/uT/D2WmXx+kWe5OCkJw== X-Received: by 2002:a17:902:380c:: with SMTP id l12-v6mr6083427plc.19.1527330773399; Sat, 26 May 2018 03:32:53 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id x2-v6sm36209751pgc.53.2018.05.26.03.32.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 26 May 2018 03:32:52 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Sat, 26 May 2018 22:32:29 +1200 Message-Id: <20180526103229.4959-2-judge.packham@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180526103229.4959-1-judge.packham@gmail.com> References: <20180526103229.4959-1-judge.packham@gmail.com> X-Mailman-Approved-At: Sat, 26 May 2018 13:18:37 +0000 Cc: Prafulla Wadaskar , Phil Sutter , Chris Packham , Stefan Roese , Albert ARIBAUD , Luka Perkov , Tony Dinh , Siddarth Gore , Gerald Kerma , Thomas Petazzoni , Dave Purdy , Suriyan Ramasami Subject: [U-Boot] [PATCH 2/2] configs: remove CONFIG_SYS_MVFS 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" This was being used by some Marvell boards to enable some file system related features (many of which have already been moved to Kconfig). Make the future migration of the final 2 or 3 config options easier by expanding #define CONFIG_SYS_MVFS into the options that it enables and remove CONFIG_SYS_MVFS. Signed-off-by: Chris Packham Reviewed-by: Simon Glass Reviewed-by: Stefan Roese --- README | 5 ----- include/configs/dns325.h | 3 ++- include/configs/ds414.h | 3 ++- include/configs/goflexhome.h | 3 ++- include/configs/guruplug.h | 4 +++- include/configs/ib62x0.h | 3 ++- include/configs/iconnect.h | 3 ++- include/configs/mv-common.h | 8 -------- include/configs/mv-plug-common.h | 7 ------- include/configs/nsa310s.h | 3 ++- include/configs/openrd.h | 3 ++- include/configs/pogo_e02.h | 3 ++- include/configs/sheevaplug.h | 4 +++- scripts/config_whitelist.txt | 1 - 14 files changed, 22 insertions(+), 31 deletions(-) diff --git a/README b/README index df1d5d67b4ad..fb331f910d0c 100644 --- a/README +++ b/README @@ -331,11 +331,6 @@ The following options need to be configured: - Board Type: Define exactly one, e.g. CONFIG_MPC8540ADS. -- Marvell Family Member - CONFIG_SYS_MVFS - define it if you want to enable - multiple fs option at one time - for marvell soc family - - 85xx CPU Options: CONFIG_SYS_PPC64 diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 5b78785ee255..dec71038bf21 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -27,7 +27,8 @@ /* * Commands configuration */ -#define CONFIG_SYS_MVFS +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 5b444542f4e9..27308c92ffb9 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -61,7 +61,8 @@ #endif /* why is this only defined in mv-common.h if CONFIG_DM is undefined? */ -#define CONFIG_SYS_MVFS +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index 1d9fe29f9ed4..8b05e0a53d71 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -41,7 +41,8 @@ * Commands configuration */ -#define CONFIG_SYS_MVFS /* Picks up Filesystem from mv-common.h */ +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index d59cddb002e5..9e7ca60f112f 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -17,7 +17,9 @@ /* * Standard filesystems */ -#define CONFIG_SYS_MVFS +#define CONFIG_BZIP2 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS /* * mv-plug-common.h should be defined after CMD configs since it used them diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 5f071d02b739..a7643166f417 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -26,7 +26,8 @@ /* * Commands configuration */ -#define CONFIG_SYS_MVFS +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index 66131cca622b..1fe4618da5e5 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -28,7 +28,8 @@ /* * Commands configuration */ -#define CONFIG_SYS_MVFS +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index c7673838faf2..79d61c599e54 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -97,12 +97,4 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #endif -/* - * File system - */ -#ifdef CONFIG_SYS_MVFS -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS -#endif - #endif /* _MV_COMMON_H */ diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h index fa2b59559205..81c07a889a36 100644 --- a/include/configs/mv-plug-common.h +++ b/include/configs/mv-plug-common.h @@ -16,13 +16,6 @@ /* Add target to build it automatically upon "make" */ #define CONFIG_BUILD_TARGET "u-boot.kwb" -/* - * Compression configuration - */ -#ifdef CONFIG_SYS_MVFS -#define CONFIG_BZIP2 -#endif /* CONFIG_SYS_MVFS */ - /* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index 4c320522d2f7..2f9043938341 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -22,7 +22,8 @@ #define CONFIG_BZIP2 /* commands configuration */ -#define CONFIG_SYS_MVFS +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/openrd.h b/include/configs/openrd.h index dfdad56dcc92..aa5425af02ea 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -23,7 +23,8 @@ /* * Commands configuration */ -#define CONFIG_SYS_MVFS +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index 0416baef452a..a654df6d6f85 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -27,7 +27,8 @@ /* * Commands configuration */ -#define CONFIG_SYS_MVFS +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 656db45adf19..23dd5ceb7cb9 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -21,7 +21,9 @@ /* * Standard filesystems */ -#define CONFIG_SYS_MVFS +#define CONFIG_BZIP2 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS /* * mv-plug-common.h should be defined after CMD configs since it used them diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 705ed89a659f..aa6dec0c7bf6 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3578,7 +3578,6 @@ CONFIG_SYS_MSC0_VAL CONFIG_SYS_MSC1_VAL CONFIG_SYS_MSC2_VAL CONFIG_SYS_MTDPARTS_RUNTIME -CONFIG_SYS_MVFS CONFIG_SYS_MX5_CLK32 CONFIG_SYS_MX5_HCLK CONFIG_SYS_MX6_CLK32