From: John Linn Date: Tue, 20 Dec 2011 19:16:44 +0000 (-0800) Subject: Xilinx: ARM: Adding board support for FMC daughter cards X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a99505e09eaae6b9e58cf8b5ac9a73071157476e;p=thirdparty%2Fu-boot.git Xilinx: ARM: Adding board support for FMC daughter cards The NAND working caused u-boot to lockup when there was no NAND so now there's CONFIGs for each board permutation of the ZC770. The default is for DC1 (XM010) card. --- diff --git a/include/configs/xpele.h b/include/configs/xpele.h index d372925262a..5f74733f410 100644 --- a/include/configs/xpele.h +++ b/include/configs/xpele.h @@ -11,12 +11,12 @@ #define CONFIG_DFE 1 /* Board sub-type ("flavor"?) */ #define CONFIG_PELE 1 /* SoC? */ -//#define CONFIG_ZYNQ_MIO_INIT 1 /* for use without FSBL */ -//#define CONFIG_ZYNQ_PLL_INIT 1 /* for use without FSBL */ -//#define CONFIG_ZYNQ_DDR_533_INIT 1 /* for use without FSBL */ +/* Select board: comment out all but one. */ -/* Select target configuration: comment out for ZC770 instead of EP107. */ //#define CONFIG_EP107 1 +#define CONFIG_ZC770_XM010 +//#define CONFIG_ZC770_XM011 +//#define CONFIG_ZC770_XM010_XM011 #ifdef CONFIG_EP107 # include "../board/xilinx/dfe/xparameters.h" @@ -213,11 +213,13 @@ /* * NAND Flash settings */ +#if defined(CONFIG_ZC770_XM011) || defined(CONFIG_ZC770_XM010_XM011) #define CONFIG_CMD_NAND #define CONFIG_CMD_NAND_LOCK_UNLOCK #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE XPSS_NAND_BASEADDR #define CONFIG_MTD_DEVICE +#endif /* Place a Xilinx Boot ROM header in u-boot image? */ #define CONFIG_PELE_XILINX_FLASH_HEADER