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

This commit is contained in:
Wolfgang Denk 2010-09-07 23:20:53 +02:00
commit 27130f133e
3 changed files with 3 additions and 3 deletions

View File

@ -81,7 +81,7 @@ unsigned int kw_winctrl_calcsize(unsigned int sizeval)
unsigned int j = 0;
u32 val = sizeval >> 1;
for (i = 0; val > 0x10000; i++) {
for (i = 0; val >= 0x10000; i++) {
j |= (1 << i);
val = val >> 1;
}

View File

@ -61,7 +61,7 @@ unsigned int orion5x_winctrl_calcsize(unsigned int sizeval)
unsigned int j = 0;
u32 val = sizeval >> 1;
for (i = 0; val > 0x10000; i++) {
for (i = 0; val >= 0x10000; i++) {
j |= (1 << i);
val = val >> 1;
}

View File

@ -76,7 +76,7 @@ enum orion5x_cpu_attrib {
/*
* Device Address MAP BAR values
/*
*
* All addresses and sizes not defined by board code
* will be given default values here.
*/