From: Michal Simek <michal.simek@xilinx.com>
Date: Wed, 13 Jan 2016 13:32:43 +0000 (+0100)
Subject: ARM: zynq: Do not select options if SPL is not enabled
X-Git-Tag: v2016.03-rc1~46^2~38
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=eb04ab3492297941b285ff552645cc1c0ed72edb;p=oweals%2Fu-boot.git

ARM: zynq: Do not select options if SPL is not enabled

Zynq setups some default options for SPL but not all targets are
enabling SPL.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 876a620cf1..d2dbb1a5c2 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -558,15 +558,15 @@ config ARCH_ZYNQ
 	select CPU_V7
 	select SUPPORT_SPL
 	select OF_CONTROL
-	select SPL_OF_CONTROL
+	select SPL_OF_CONTROL if SPL
 	select DM
 	select DM_ETH
-	select SPL_DM
+	select SPL_DM if SPL
 	select DM_MMC
 	select DM_SPI
 	select DM_SERIAL
 	select DM_SPI_FLASH
-	select SPL_SEPARATE_BSS
+	select SPL_SEPARATE_BSS if SPL
 
 config ARCH_ZYNQMP
 	bool "Support Xilinx ZynqMP Platform"