diff options
| author | Andy Fleming <afleming@freescale.com> | 2007-10-19 11:24:22 -0500 |
|---|---|---|
| committer | Andrew Fleming-AFLEMING <afleming@freescale.com> | 2007-10-19 11:24:22 -0500 |
| commit | d4d1e9bee7c45ea8c513d3af697c864107f1c4d1 (patch) | |
| tree | 3cd7eba359e6729454f4fac5b96209eb959ecf72 /common/cmd_fpga.c | |
| parent | 1487adbdcf9594bb2eb686325a6f9540dad1b70a (diff) | |
| parent | 27d2b1ed216b457a66c17d38ce5ffdf3c2c32d1e (diff) | |
Merge branch 'denx'
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 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; |