diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-15 11:31:50 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-15 11:31:50 +0200 |
| commit | 69710092172409cfcc43b84cd71287f428a4e319 (patch) | |
| tree | a139e7075dc4b6f002ec41b69e4c728b71050bd1 /cpu | |
| parent | 374b9038293d01d8744a46af9b7854a6fd99b228 (diff) | |
| parent | 9724555755a6f1066636481b41f7094e0ce93a69 (diff) | |
| download | u-boot-imx-69710092172409cfcc43b84cd71287f428a4e319.zip u-boot-imx-69710092172409cfcc43b84cd71287f428a4e319.tar.gz u-boot-imx-69710092172409cfcc43b84cd71287f428a4e319.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/mpc83xx/cpu.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c index 5862acd..99ab216 100644 --- a/cpu/mpc83xx/cpu.c +++ b/cpu/mpc83xx/cpu.c @@ -124,8 +124,8 @@ int checkcpu(void) * The 'dummy' variable is used to increment the MAD. 'dummy' is * supposed to be a pointer to the memory of the device being * programmed by the UPM. The data in the MDR is written into - * memory and the MAD is incremented every time there's a read - * from 'dummy'. Unfortunately, the current prototype for this + * memory and the MAD is incremented every time there's a write + * to 'dummy'. Unfortunately, the current prototype for this * function doesn't allow for passing the address of this * device, and changing the prototype will break a number lots * of other code, so we need to use a round-about way of finding @@ -174,8 +174,9 @@ void upmconfig (uint upm, uint *table, uint size) for (i = 0; i < size; i++) { lbus->mdr = table[i]; __asm__ __volatile__ ("sync"); - *dummy; /* Write the value to memory and increment MAD */ + *dummy = 0; /* Write the value to memory and increment MAD */ __asm__ __volatile__ ("sync"); + while(((*mxmr & 0x3f) != ((i + 1) & 0x3f))); } /* Set the OP field in the MxMR to "normal" and the MAD field to 000000 */ |