From patchwork Sun Nov 26 07:21:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 841321 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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3yl1Zd6NTlz9s3w for ; Sun, 26 Nov 2017 18:21:44 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id B5488C21DDF; Sun, 26 Nov 2017 07:21:39 +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=none 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 ECBD5C21C4C; Sun, 26 Nov 2017 07:21:36 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1FB9AC21C4C; Sun, 26 Nov 2017 07:21:35 +0000 (UTC) Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by lists.denx.de (Postfix) with ESMTPS id A56A1C21C45 for ; Sun, 26 Nov 2017 07:21:34 +0000 (UTC) Received: from sapphire.lan (unknown [10.0.4.3]) by mx.tkos.co.il (Postfix) with ESMTPA id D2CE34403F3; Sun, 26 Nov 2017 09:21:32 +0200 (IST) From: Baruch Siach To: Stefan Roese , Konstantin Porotchkin Date: Sun, 26 Nov 2017 09:21:23 +0200 Message-Id: <625e7e8a7ed1debf4e28180857838b4589331eb3.1511680883.git.baruch@tkos.co.il> X-Mailer: git-send-email 2.15.0 Cc: u-boot@lists.denx.de, Baruch Siach Subject: [U-Boot] [PATCH] arm64: mvebu: armada-7k/8k: drop useless #ifdef 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" CONFIG_ENV_IS_IN_NAND has been removed in commit 2be296538e2e (Convert CONFIG_ENV_IS_IN_MMC/NAND/UBI and NOWHERE to Kconfig). CONFIG_ENV_IS_IN_SPI_FLASH has bee removed in commit 91c868fe7cd (Convert CONFIG_ENV_IS_IN_SPI_FLASH to Kconfig). The environemnt #ifdef is now empty. Remove it. Signed-off-by: Baruch Siach --- include/configs/mvebu_armada-8k.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index fd60a9bfd483..d85527434a0a 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -73,11 +73,6 @@ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE -/* Environment in SPI NOR flash */ -#ifdef CONFIG_MVEBU_SPI_BOOT -/* Environment in NAND flash */ -#endif - #define CONFIG_ENV_OFFSET 0x180000 /* as Marvell U-Boot version */ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ #define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64KiB sectors */