summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-09-26 00:13:14 +0200
committerWolfgang Denk <wd@denx.de>2007-09-26 00:13:14 +0200
commitc3c909a209d05f27ebd090f21c0b46d90925f990 (patch)
treec8cbcec531cc743677cd3980958301a0e0b30857
parent9147ca849e750a96108b13ee4be79c5293aa8060 (diff)
parent0d38effc6e359e6b1b0c78d66e8bc1a4dc15a2ae (diff)
downloadu-boot-c3c909a209d05f27ebd090f21c0b46d90925f990.tar.gz
u-boot-c3c909a209d05f27ebd090f21c0b46d90925f990.tar.xz
u-boot-c3c909a209d05f27ebd090f21c0b46d90925f990.zip
Merge with git+ssh://gemini_vpn/home/wd/git/u-boot/master
-rw-r--r--common/cmd_fpga.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/cmd_fpga.c b/common/cmd_fpga.c
index 3fc4fca9ae..cce23ad70d 100644
--- a/common/cmd_fpga.c
+++ b/common/cmd_fpga.c
@@ -60,6 +60,7 @@ static int fpga_get_op (char *opstr);
/* Convert bitstream data and load into the fpga */
int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
{
+#if (CONFIG_FPGA & CFG_FPGA_XILINX)
unsigned int length;
unsigned char* swapdata;
unsigned int swapsize;
@@ -72,7 +73,6 @@ int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
dataptr = (unsigned char *)fpgadata;
-#if CFG_FPGA_XILINX
/* skip the first bytes of the bitsteam, their meaning is unknown */
length = (*dataptr << 8) + *(dataptr+1);
dataptr+=2;