diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2007-10-18 10:02:16 -0500 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2007-10-18 10:02:16 -0500 |
| commit | f147dd15e840230a3911c649b2a81c749d32db1c (patch) | |
| tree | 03023c12770b6c33c4e9f75615c4a3319d497c90 /common/cmd_fpga.c | |
| parent | 8ffc774993725a0646aa8d1995d968c95aee9e3c (diff) | |
| parent | eff786a9b89144478f478c4193fcad5b498feb72 (diff) | |
| download | u-boot-imx-f147dd15e840230a3911c649b2a81c749d32db1c.zip u-boot-imx-f147dd15e840230a3911c649b2a81c749d32db1c.tar.gz u-boot-imx-f147dd15e840230a3911c649b2a81c749d32db1c.tar.bz2 | |
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'common/cmd_fpga.c')
| -rw-r--r-- | common/cmd_fpga.c | 2 |
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; |