From patchwork Thu Jun 1 08:42:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Looijmans X-Patchwork-Id: 769531 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3wdgq43kBvz9s89 for ; Thu, 1 Jun 2017 18:43:27 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 1EE0CC21CD7; Thu, 1 Jun 2017 08:43:23 +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.7 required=5.0 tests=RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 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 63AD9C21C5E; Thu, 1 Jun 2017 08:43:20 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C47DEC21C5E; Thu, 1 Jun 2017 08:43:18 +0000 (UTC) Received: from atl4mhob08.registeredsite.com (atl4mhob08.registeredsite.com [209.17.115.46]) by lists.denx.de (Postfix) with ESMTPS id 456EFC21C4C for ; Thu, 1 Jun 2017 08:43:18 +0000 (UTC) Received: from mailpod.hostingplatform.com ([10.30.71.209]) by atl4mhob08.registeredsite.com (8.14.4/8.14.4) with ESMTP id v518hDcF005281 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Thu, 1 Jun 2017 04:43:15 -0400 Received: (qmail 13972 invoked by uid 0); 1 Jun 2017 08:43:13 -0000 X-TCPREMOTEIP: 37.74.225.130 X-Authenticated-UID: mike@milosoftware.com Received: from unknown (HELO mikebuntu.TOPIC.LOCAL) (mike@milosoftware.com@37.74.225.130) by 0 with ESMTPA; 1 Jun 2017 08:43:13 -0000 From: Mike Looijmans To: u-boot@lists.denx.de Date: Thu, 1 Jun 2017 10:42:58 +0200 Message-Id: <1496306578-4238-1-git-send-email-mike.looijmans@topic.nl> X-Mailer: git-send-email 1.9.1 Cc: michal.simek@xilinx.com Subject: [U-Boot] [PATCH] Move CONFIG_SF_DUAL_FLASH to defconfig 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" Move the only use of CONFIG_SF_DUAL_FLASH to defconfig. This makes the associated topic_miamiplus.h header obsolete, so remove that as well. Signed-off-by: Mike Looijmans --- configs/topic_miamiplus_defconfig | 3 ++- include/configs/topic_miamiplus.h | 2 -- scripts/config_whitelist.txt | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 include/configs/topic_miamiplus.h diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig index 10762f8..535ce6d 100644 --- a/configs/topic_miamiplus_defconfig +++ b/configs/topic_miamiplus_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_SYS_VENDOR="topic" -CONFIG_SYS_CONFIG_NAME="topic_miamiplus" +CONFIG_SYS_CONFIG_NAME="topic_miami" CONFIG_ARCH_ZYNQ=y CONFIG_SYS_TEXT_BASE=0x4000000 CONFIG_BOOT_INIT_FILE="board/topic/zynq/zynq-topic-miamiplus/ps7_regs.txt" @@ -28,6 +28,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_RAM=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y +CONFIG_SF_DUAL_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/include/configs/topic_miamiplus.h b/include/configs/topic_miamiplus.h deleted file mode 100644 index 46ca6bd..0000000 --- a/include/configs/topic_miamiplus.h +++ /dev/null @@ -1,2 +0,0 @@ -#include "topic_miami.h" -#define CONFIG_SF_DUAL_FLASH diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e8f49eb..642c433 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2401,7 +2401,6 @@ CONFIG_SF_DEFAULT_BUS CONFIG_SF_DEFAULT_CS CONFIG_SF_DEFAULT_MODE CONFIG_SF_DEFAULT_SPEED -CONFIG_SF_DUAL_FLASH CONFIG_SGI_IP28 CONFIG_SH4_PCI CONFIG_SH73A0