diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-05-16 00:11:53 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-05-16 00:11:53 +0200 |
| commit | d6022573746856861f86f4f514dd1c1c14aaec9a (patch) | |
| tree | 5d07b2e0f2acdb4e640aeb886f127c7a5c6c47b6 /drivers | |
| parent | e73865897fe9e2b111d7f9ef32fe428438771b11 (diff) | |
| parent | e69f66c6ebe82bbbd1da766bc4eda40ec7ee5af1 (diff) | |
| download | u-boot-imx-d6022573746856861f86f4f514dd1c1c14aaec9a.zip u-boot-imx-d6022573746856861f86f4f514dd1c1c14aaec9a.tar.gz u-boot-imx-d6022573746856861f86f4f514dd1c1c14aaec9a.tar.bz2 | |
Merge with /home/wd/git/u-boot/custodian/u-boot-microblaze
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..c9fd5f1 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) { |