summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2007-09-25 15:48:05 -0600
committerWolfgang Denk <wd@denx.de>2007-09-26 00:10:26 +0200
commit0d38effc6e359e6b1b0c78d66e8bc1a4dc15a2ae (patch)
tree71ba08d294e956c4bf773e1a5a6d74693959f4fc
parent66dcad3a9a53e0766d90e0084123bd8529522fb0 (diff)
downloadu-boot-imx-0d38effc6e359e6b1b0c78d66e8bc1a4dc15a2ae.zip
u-boot-imx-0d38effc6e359e6b1b0c78d66e8bc1a4dc15a2ae.tar.gz
u-boot-imx-0d38effc6e359e6b1b0c78d66e8bc1a4dc15a2ae.tar.bz2
Fpga: fix incorrect test of CFG_FPGA_XILINX macro
CFG_FPGA_XILINX is a bit value used to test against the value in CONFIG_FPGA. Testing for a value will always return TRUE. I don't think that is the intention in this code. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
-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;