LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent f91506e283 438c37e1b3
commit 27130f133e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/arm926ejs/kirkwood/cpu.c
View File

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

2
arch/arm/cpu/arm926ejs/orion5x/cpu.c
View File

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

2
arch/arm/include/asm/arch-orion5x/cpu.h
View File

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