diff options
author | Peter Pearse <peter.pearse@arm.com> | 2007-10-04 11:00:44 +0100 |
---|---|---|
committer | Peter Pearse <peter.pearse@arm.com> | 2007-10-04 11:00:44 +0100 |
commit | e81a95a9e7cb68ab611e074cd65790015520ea99 (patch) | |
tree | 8ca6d8dc1ec2d6db1f4fdabdb17baf5ad9c37650 /common/cmd_fpga.c | |
parent | bd86220f58b99d6896198c385fda132f0c980915 (diff) | |
parent | 527c80f012030fa0b51f8594847ec56c9317e9b1 (diff) | |
download | talos-obmc-uboot-e81a95a9e7cb68ab611e074cd65790015520ea99.tar.gz talos-obmc-uboot-e81a95a9e7cb68ab611e074cd65790015520ea99.zip |
Merge with git://www.denx.de/git/u-boot.git
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; |