diff options
| author | Stefan Roese <sr@denx.de> | 2007-05-18 11:20:02 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-05-18 11:20:02 +0200 |
| commit | ee96088ca59d871ec096aefce04b741d1b02cb30 (patch) | |
| tree | 6a97720507c4bbd57ec5f6a8faf09e0971e5449d /drivers | |
| parent | ada4697d0230d6da552867777f98a67ec3ba2579 (diff) | |
| parent | 70124c2602ae2d4c5d3dba05b482d91548242de8 (diff) | |
| download | blackbird-obmc-uboot-ee96088ca59d871ec096aefce04b741d1b02cb30.tar.gz blackbird-obmc-uboot-ee96088ca59d871ec096aefce04b741d1b02cb30.zip | |
Merge with git://www.denx.de/git/u-boot.git
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 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) { |
