Merge with git://www.denx.de/git/u-boot.git

[oweals/u-boot.git] / drivers / systemace.c

diff --git a/drivers/systemace.c b/drivers/systemace.c
index 3848d9c59c24fcbc3beae3f39ffd97ec676b3ab6..7d82c27c6edd7d35c9b15fc3ec6f62dce4f035bb 100644 (file)
--- 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) {