summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorPeter Pearse <peter.pearse@arm.com>2007-05-18 14:33:23 +0100
committerPeter Pearse <peter.pearse@arm.com>2007-05-18 14:33:23 +0100
commitfdda367561f0f6fb21d5b575402c0f9d2fd08e76 (patch)
treeafb703e6e43ff91e6f456f12fbb43fb598373fd5 /drivers
parent1443a31457d68f7e8f0b9403e9832ec1e79dc59d (diff)
parent70124c2602ae2d4c5d3dba05b482d91548242de8 (diff)
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'drivers')
-rw-r--r--drivers/systemace.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/systemace.c b/drivers/systemace.c
index 3848d9c59c..7d82c27c6e 100644
--- a/drivers/systemace.c
+++ b/drivers/systemace.c
@@ -211,10 +211,16 @@ static unsigned long systemace_read(int dev, unsigned long start,
/* Write sector count | ReadMemCardData. */
ace_writew((trans & 0xff) | 0x0300, 0x14);
+/*
+ * For FPGA configuration via SystemACE is reset unacceptable
+ * CFGDONE bit in STATUSREG is not set to 1.
+ */
+#ifndef SYSTEMACE_CONFIG_FPGA
/* Reset the configruation controller */
val = ace_readw(0x18);
val |= 0x0080;
ace_writew(val, 0x18);
+#endif
retry = trans * 16;
while (retry > 0) {