GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-28 10:01:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

Browse source
This commit is contained in:
Wolfgang Denk 2008-10-15 11:31:50 +02:00
commit 6971009217
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cpu/mpc83xx/cpu.c
View file

@ -124,8 +124,8 @@ int checkcpu(void)
* The 'dummy' variable is used to increment the MAD. 'dummy' is * The 'dummy' variable is used to increment the MAD. 'dummy' is
* supposed to be a pointer to the memory of the device being * supposed to be a pointer to the memory of the device being
* programmed by the UPM. The data in the MDR is written into * programmed by the UPM. The data in the MDR is written into
* memory and the MAD is incremented every time there's a read * memory and the MAD is incremented every time there's a write
* from 'dummy'. Unfortunately, the current prototype for this * to 'dummy'. Unfortunately, the current prototype for this
* function doesn't allow for passing the address of this * function doesn't allow for passing the address of this
* device, and changing the prototype will break a number lots * device, and changing the prototype will break a number lots
* of other code, so we need to use a round-about way of finding * 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++) { for (i = 0; i < size; i++) {
lbus->mdr = table[i]; lbus->mdr = table[i];
__asm__ __volatile__ ("sync"); __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"); __asm__ __volatile__ ("sync");
while(((*mxmr & 0x3f) != ((i + 1) & 0x3f)));
} }
/* Set the OP field in the MxMR to "normal" and the MAD field to 000000 */ /* Set the OP field in the MxMR to "normal" and the MAD field to 000000 */