[U-Boot,v1] spl: Remove unused CONFIG_SPL_SPI_* definitions

Message ID	20160822051729.6880-1-judge.packham@gmail.com
State	Accepted
Commit	148f00e7a7f6bf28cf38c61a25056e1f2c465166
Delegated to:	Stefan Roese
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Chris Packham <judge.packham@gmail.com> To: u-boot@lists.denx.de Date: Mon, 22 Aug 2016 17:17:29 +1200 Message-Id: <20160822051729.6880-1-judge.packham@gmail.com> Cc: Stefan Roese <sr@denx.de>, Chris Packham <judge.packham@gmail.com>, Phil Sutter <phil@nwl.cc> Subject: [U-Boot] [PATCH v1] spl: Remove unused CONFIG_SPL_SPI_* definitions Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Message ID

20160822051729.6880-1-judge.packham@gmail.com

State

Accepted

Commit

148f00e7a7f6bf28cf38c61a25056e1f2c465166

Delegated to:

Stefan Roese

Headers

show

Return-Path: <u-boot-bounces@lists.denx.de>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from theia.denx.de (theia.denx.de [85.214.87.163])
	by ozlabs.org (Postfix) with ESMTP id 3sHhfV3zWQz9stc
	for <incoming@patchwork.ozlabs.org>;
	Mon, 22 Aug 2016 15:17:53 +1000 (AEST)
Authentication-Results: ozlabs.org;
	dkim=fail reason="signature verification failed" (2048-bit key;
	unprotected) header.d=gmail.com header.i=@gmail.com header.b=KZeSNy4A;
	dkim-atps=neutral
Received: from localhost (localhost [127.0.0.1])
	by theia.denx.de (Postfix) with ESMTP id 5FECBA7534;
	Mon, 22 Aug 2016 07:17:49 +0200 (CEST)
Received: from theia.denx.de ([127.0.0.1])
	by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id X2ItyiZWjYxn; Mon, 22 Aug 2016 07:17:49 +0200 (CEST)
Received: from theia.denx.de (localhost [127.0.0.1])
	by theia.denx.de (Postfix) with ESMTP id D6C6BA751E;
	Mon, 22 Aug 2016 07:17:48 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
	by theia.denx.de (Postfix) with ESMTP id 991A4A751E
	for <u-boot@lists.denx.de>; Mon, 22 Aug 2016 07:17:45 +0200 (CEST)
Received: from theia.denx.de ([127.0.0.1])
	by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id C_1neIjV5vDi for <u-boot@lists.denx.de>;
	Mon, 22 Aug 2016 07:17:45 +0200 (CEST)
X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5
	NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested)
Received: from mail-pa0-f65.google.com (mail-pa0-f65.google.com
	[209.85.220.65]) by theia.denx.de (Postfix) with ESMTPS id 167984BF90
	for <u-boot@lists.denx.de>; Mon, 22 Aug 2016 07:17:41 +0200 (CEST)
Received: by mail-pa0-f65.google.com with SMTP id ez1so7383885pab.3
	for <u-boot@lists.denx.de>; Sun, 21 Aug 2016 22:17:41 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
	h=from:to:cc:subject:date:message-id;
	bh=op9rQstdB24eAzktyOvTfd56TyuEOSQrL6kJs2QQi24=;
	b=KZeSNy4Atv0Ye0YxTP//dfOe8yqgGrUA2sSh7hwGv12fPs9aB/toDLQojU51UFhXG0
	D/OJxfwJU52QjVrS+a0RjX9RJ2aDd3eM6euWDrLRW+NU0Z90O4Uyd9C0rs+zqe9BwGa3
	2VBfCrbYHyzgOo1QD7W6ysOZAGs9F76kG/w0u0aE2o3G01NSZnu7YvmWG+x2DG5FtEB3
	DHnS9OIwGRpt6nYur1i/XBAppeJWb1lUst/kexcip7zlBq3oPxZwCXg4SVaRev4V9af6
	iXUZvnBAlFrCqifiAlEzrylvraEtf8sTPVc+1eb4Z2rMpOTnIWrFvYg0S/m1wD0/oN6W
	JI6w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:from:to:cc:subject:date:message-id;
	bh=op9rQstdB24eAzktyOvTfd56TyuEOSQrL6kJs2QQi24=;
	b=U6Rgx4RaxWmRBZa0oO4AjjmXbm8vVDxzGnV/B/eSV+jqCZbGjZFpEsgjYczRHvw6Bj
	vhSnfNYZWpjyGsPndL14pJNfql3f3aFVfHcvoZ3NL4Z85m2HIjwucHdGSLz6urHhssS/
	mvOotAn/an7uIw9vk0Yn6T7INljc8c6Q/1zFJMiuCjDtOJXdXZYZCkd42EbRaQd8Y1gC
	vBTY+mvYtGoLSaTuY6NqcScLn5DhNDS2HKC6hai4wklnHGwhg50ut6QzkuuWiyIH9bVp
	Ffn/gFIeNNAOLEbNOWDOl2omH2BmYvdtKWqlrSnqYe3AwgdYyKFfq+ZI9xkFKyd/iMvB
	Dzug==
X-Gm-Message-State: AEkoouvQG5yDGPG2bO8SVqriDqq2+BA5I5HRN+dJ7vwVj9WHGltTVbAwxbtkYbJOoDmyyw==
X-Received: by 10.66.32.131 with SMTP id j3mr39478737pai.58.1471843059895;
	Sun, 21 Aug 2016 22:17:39 -0700 (PDT)
Received: from chrisp-dl.ws.atlnz.lc
	(2-163-36-202-static.alliedtelesis.co.nz. [202.36.163.2])
	by smtp.gmail.com with ESMTPSA id
	r2sm28730967pal.14.2016.08.21.22.17.36
	(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
	Sun, 21 Aug 2016 22:17:39 -0700 (PDT)
From: Chris Packham <judge.packham@gmail.com>
To: u-boot@lists.denx.de
Date: Mon, 22 Aug 2016 17:17:29 +1200
Message-Id: <20160822051729.6880-1-judge.packham@gmail.com>
X-Mailer: git-send-email 2.9.2.518.ged577c6.dirty
Cc: Stefan Roese <sr@denx.de>, Chris Packham <judge.packham@gmail.com>,
	Phil Sutter <phil@nwl.cc>
Subject: [U-Boot] [PATCH v1] spl: Remove unused CONFIG_SPL_SPI_* definitions
X-BeenThere: u-boot@lists.denx.de
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: U-Boot discussion <u-boot.lists.denx.de>
List-Unsubscribe: <http://lists.denx.de/mailman/options/u-boot>,
	<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
List-Archive: <http://lists.denx.de/pipermail/u-boot/>
List-Post: <mailto:u-boot@lists.denx.de>
List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
List-Subscribe: <http://lists.denx.de/mailman/listinfo/u-boot>,
	<mailto:u-boot-request@lists.denx.de?subject=subscribe>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Commit Message

Chris Packham Aug. 22, 2016, 5:17 a.m. UTC

As of commit 88e34e5 ("spl: replace CONFIG_SPL_SPI_* with
CONFIG_SF_DEFAULT_*") these defines are not used. Remove them to avoid
confusion.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
I decided to go with a single patch as with the exception of ds414 these
all appear to be Armada based boards. I can split this into multiple
patches if board maintainers wish me to.

 include/configs/clearfog.h      | 2 --
 include/configs/db-88f6720.h    | 2 --
 include/configs/db-88f6820-gp.h | 2 --
 include/configs/db-mv784mp-gp.h | 2 --
 include/configs/ds414.h         | 2 --
 include/configs/maxbcm.h        | 2 --
 include/configs/theadorable.h   | 2 --
 7 files changed, 14 deletions(-)

Comments

Stefan Roese Aug. 26, 2016, 6:37 a.m. UTC | #1

On 22.08.2016 07:17, Chris Packham wrote:
> As of commit 88e34e5 ("spl: replace CONFIG_SPL_SPI_* with
> CONFIG_SF_DEFAULT_*") these defines are not used. Remove them to avoid
> confusion.
>
> Signed-off-by: Chris Packham <judge.packham@gmail.com>

Applied to u-boot-marvell/master.

Thanks,
Stefan

diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index ffaeedb..6cbdee2 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -133,8 +133,6 @@ 
 #define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_FLASH_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
-#define CONFIG_SPL_SPI_BUS		0
-#define CONFIG_SPL_SPI_CS		0
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
 #define CONFIG_SYS_U_BOOT_OFFS		CONFIG_SYS_SPI_U_BOOT_OFFS
 #endif
diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h
index 01c7895..4e00812 100644
--- a/include/configs/db-88f6720.h
+++ b/include/configs/db-88f6720.h
@@ -100,8 +100,6 @@ 
 #define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_FLASH_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
-#define CONFIG_SPL_SPI_BUS		0
-#define CONFIG_SPL_SPI_CS		0
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
 #define CONFIG_SYS_U_BOOT_OFFS		CONFIG_SYS_SPI_U_BOOT_OFFS
 
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index 3539a62..88614b3 100644
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -134,8 +134,6 @@ 
 #define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_FLASH_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
-#define CONFIG_SPL_SPI_BUS		0
-#define CONFIG_SPL_SPI_CS		0
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x24000
 #define CONFIG_SYS_U_BOOT_OFFS		CONFIG_SYS_SPI_U_BOOT_OFFS
 #endif
diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
index d6acbbc..5cdfd1c 100644
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -125,8 +125,6 @@ 
 #define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_FLASH_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
-#define CONFIG_SPL_SPI_BUS		0
-#define CONFIG_SPL_SPI_CS		0
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
 #define CONFIG_SYS_U_BOOT_OFFS		CONFIG_SYS_SPI_U_BOOT_OFFS
 
diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index 23373cd..ff188e2 100644
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -132,8 +132,6 @@ 
 #define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_FLASH_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
-#define CONFIG_SPL_SPI_BUS		0
-#define CONFIG_SPL_SPI_CS		0
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x24000
 
 /* DS414 bus width is 32bits */
diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h
index fed310f..47d2948 100644
--- a/include/configs/maxbcm.h
+++ b/include/configs/maxbcm.h
@@ -93,8 +93,6 @@ 
 #define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_FLASH_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
-#define CONFIG_SPL_SPI_BUS		0
-#define CONFIG_SPL_SPI_CS		0
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
 
 /* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */
diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index 1caa858..8bbf879 100644
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -158,8 +158,6 @@ 
 #define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_FLASH_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
-#define CONFIG_SPL_SPI_BUS		0
-#define CONFIG_SPL_SPI_CS		0
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x1a000
 #define CONFIG_SYS_U_BOOT_OFFS		CONFIG_SYS_SPI_U_BOOT_OFFS

[U-Boot,v1] spl: Remove unused CONFIG_SPL_SPI_* definitions

Commit Message

Comments

Patch