summaryrefslogtreecommitdiff
path: root/common/cmd_fpga.c
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2007-10-14 14:33:32 +0200
committerMichal Simek <monstr@monstr.eu>2007-10-14 14:33:32 +0200
commite58ade3a5c0df399f13dffb897ee9ddbc30d7302 (patch)
tree5e6e1e7cd2b97e3ca9c4eed122327327d09dfda8 /common/cmd_fpga.c
parent95df6f4ebaaa3972e312be1acf7650a18b84bf3d (diff)
parent636400198228d96983c06657b17f760f5989958e (diff)
downloadu-boot-imx-e58ade3a5c0df399f13dffb897ee9ddbc30d7302.zip
u-boot-imx-e58ade3a5c0df399f13dffb897ee9ddbc30d7302.tar.gz
u-boot-imx-e58ade3a5c0df399f13dffb897ee9ddbc30d7302.tar.bz2
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'common/cmd_fpga.c')
-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 3fc4fca..cce23ad 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;