[U-Boot] [PATCH] arm64: mvebu: armada-7k/8k: drop useless #ifdef

[U-Boot] [PATCH] arm64: mvebu: armada-7k/8k: drop useless #ifdef

[Baruch Siach]

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 <baruch@tkos.co.il>
---
 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 */
-- 
2.15.0

[U-Boot] [PATCH] arm64: mvebu: armada-7k/8k: drop useless #ifdef

[Andreas Färber]

Am 26.11.2017 um 08:21 schrieb Baruch Siach:
> 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

"been"

> (Convert CONFIG_ENV_IS_IN_SPI_FLASH to Kconfig). The environemnt #ifdef

"environment"

> is now empty. Remove it.
> 
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>

Regards,
Andreas

-- 
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)

[U-Boot] [PATCH] arm64: mvebu: armada-7k/8k: drop useless #ifdef

[Stefan Roese]

On 26.11.2017 14:51, Andreas Färber wrote:
> Am 26.11.2017 um 08:21 schrieb Baruch Siach:
>> 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
> 
> "been"
> 
>> (Convert CONFIG_ENV_IS_IN_SPI_FLASH to Kconfig). The environemnt #ifdef
> 
> "environment"

Fixed up while applying.

Applied to u-boot-marvell/master.

Thanks,
Stefan