From: Brian Hill <brian.hill@xilinx.com>
Date: Mon, 15 Nov 2010 17:37:05 +0000 (-0700)
Subject: Xilinx: ARM:  Provide a mechanism to specify the XIP header addres in xpele.h.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47185d144c71f7f8f5b3409b56fba0a6cdffcdd5;p=thirdparty%2Fu-boot.git

Xilinx: ARM:  Provide a mechanism to specify the XIP header addres in xpele.h.

CONFIG_PELE_XIP_START in include/configs/xpele.h is used to specify the XIP
address in the boot rom flash header.
---

diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
index 2edd6307dca..d2870d0e010 100644
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -51,7 +51,7 @@ _start: b	reset
 #define HDR_30 0x00000120
 #define HDR_34 0x00000000
 #define HDR_38 0x00000000
-#define HDR_3C CONFIG_SYS_FLASH_BASE
+#define HDR_3C CONFIG_PELE_XIP_START
 #define HDR_40 0x00000000
 #define HDR_44 0x00000001
 #define HDR_CSUM (~(HDR_20+HDR_24+HDR_28+HDR_2C+HDR_30+HDR_34+HDR_38+HDR_3C+HDR_40+HDR_44))
diff --git a/include/configs/xpele.h b/include/configs/xpele.h
index 72c7521daca..0a4028751bc 100644
--- a/include/configs/xpele.h
+++ b/include/configs/xpele.h
@@ -66,7 +66,7 @@
 
 //#define CONFIG_PELE_INIT_GEM	//this is to initialize GEM at uboot start
 #define CONFIG_PELE_IP_ENV	//this is to set ipaddr, ethaddr and serverip env variables.
-#define CONFIG_PELE_XILINX_FLASH_HEADER
+
 
 #ifndef CONFIG_SYS_NO_FLASH
 
@@ -151,4 +151,17 @@
 #define CONFIG_SYS_NAND_BASE XPSS_NAND_BASEADDR
 #define CONFIG_MTD_DEVICE
 
+/* Place a Xilinx Boot ROM header in u-boot image? */
+#define CONFIG_PELE_XILINX_FLASH_HEADER
+
+#ifdef CONFIG_PELE_XILINX_FLASH_HEADER
+/* Address Xilinx boot rom should use to launch u-boot */
+#ifdef CONFIG_PELE_XIL_LQSPI
+#define CONFIG_PELE_XIP_START XPSS_QSPI_LIN_BASEADDR
+#else
+/* NOR */
+#define CONFIG_PELE_XIP_START CONFIG_SYS_FLASH_BASE
+#endif
+#endif
+
 #endif /* __CONFIG_H */