diff mbox

[U-Boot,v3,5/9] da850/omap-l138: Define SPI specific configs for SPL only when SPI is used

Message ID 1340265091-17301-6-git-send-email-prabhakar.lad@ti.com
State Accepted
Commit 42612104fcdeae952ad70cf3c35666c1bf8509cd
Delegated to: Tom Rini
Headers show

Commit Message

Prabhakar Lad June 21, 2012, 7:51 a.m. UTC 
From: Lad, Prabhakar <prabhakar.lad@ti.com>

define SPI specific configs for SPL only when CONFIG_USE_SPIFLASH
config is defined

Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: Rajashekhara, Sudhakar <sudhakar.raj@ti.com>
Signed-off-by: Hadli, Manjunath <manjunath.hadli@ti.com>
---
 Changes for v3:
 1: Created a new patch by splitting patch 6 of v2
    for better readability.

 include/configs/da850evm.h |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)
diff mbox

Patch

diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 4546e0f..4e5f160 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -155,6 +155,16 @@ 
 #define CONFIG_SF_DEFAULT_SPEED		30000000
 #define CONFIG_ENV_SPI_MAX_HZ	CONFIG_SF_DEFAULT_SPEED
 
+#ifdef CONFIG_USE_SPIFLASH
+#define CONFIG_SPL_SPI_SUPPORT
+#define CONFIG_SPL_SPI_FLASH_SUPPORT
+#define CONFIG_SPL_SPI_LOAD
+#define CONFIG_SPL_SPI_BUS 0
+#define CONFIG_SPL_SPI_CS 0
+#define CONFIG_SYS_SPI_U_BOOT_OFFS	0x8000
+#define CONFIG_SYS_SPI_U_BOOT_SIZE	0x30000
+#endif
+
 /*
  * I2C Configuration
  */
@@ -334,11 +344,6 @@ 
 
 /* defines for SPL */
 #define CONFIG_SPL
-#define CONFIG_SPL_SPI_SUPPORT
-#define CONFIG_SPL_SPI_FLASH_SUPPORT
-#define CONFIG_SPL_SPI_LOAD
-#define CONFIG_SPL_SPI_BUS 0
-#define CONFIG_SPL_SPI_CS 0
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
 #define CONFIG_SPL_LIBGENERIC_SUPPORT
@@ -346,8 +351,6 @@ 
 #define CONFIG_SPL_STACK	0x8001ff00
 #define CONFIG_SPL_TEXT_BASE	0x80000000
 #define CONFIG_SPL_MAX_SIZE	32768
-#define CONFIG_SYS_SPI_U_BOOT_OFFS	0x8000
-#define CONFIG_SYS_SPI_U_BOOT_SIZE	0x30000
 
 /* additions for new relocation code, must added to all boards */
 #define CONFIG_SYS_SDRAM_BASE		0xc0000000