From f86474e28185a1f31a2c993fa0f34b1a94c8c6e0 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 26 Nov 2017 09:21:23 +0200 Subject: [PATCH] arm64: mvebu: armada-7k/8k: drop useless #ifdef 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 been removed in commit 91c868fe7cd (Convert CONFIG_ENV_IS_IN_SPI_FLASH to Kconfig). The environment #ifdef is now empty. Remove it. Signed-off-by: Baruch Siach Signed-off-by: Stefan Roese --- 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 fd60a9bfd4..d85527434a 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 */ -- 2.25.1