diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2007-05-29 16:37:57 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@pollux.denx.de> | 2007-05-29 16:37:57 +0200 |
| commit | 51d8e813222fa3063d423220f6ff1146df58a471 (patch) | |
| tree | a4951077af841bd87a90854b7fb390d12e37b851 /drivers | |
| parent | 3a619dd7bed03e8b4d22a3911f90fd12af5376c2 (diff) | |
| parent | 19bf91f9628f80a55d4f171df71041574882b3d6 (diff) | |
| download | u-boot-imx-51d8e813222fa3063d423220f6ff1146df58a471.zip u-boot-imx-51d8e813222fa3063d423220f6ff1146df58a471.tar.gz u-boot-imx-51d8e813222fa3063d423220f6ff1146df58a471.tar.bz2 | |
Merge git://www.denx.de/git/u-boot into 2007_05_15-testing
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/systemace.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/systemace.c b/drivers/systemace.c index 3848d9c..7d82c27 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) { |