diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-09-07 23:20:53 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-09-07 23:20:53 +0200 |
| commit | 27130f133eda205b07d97b475a2ef96ec3f46b0f (patch) | |
| tree | 3a8cbe311baab489cfd304a7197e00baaa9a10bd | |
| parent | f91506e28387fece392b5dd3bb3aa309e4ce7e4d (diff) | |
| parent | 438c37e1b3493c800fd50924d0b492f96d5c66bb (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-marvell
| -rw-r--r-- | arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/orion5x/cpu.c | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-orion5x/cpu.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c index c63e8641f21..82c978bd93e 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c @@ -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; } diff --git a/arch/arm/cpu/arm926ejs/orion5x/cpu.c b/arch/arm/cpu/arm926ejs/orion5x/cpu.c index 3740e33e9d8..260f88b46e0 100644 --- a/arch/arm/cpu/arm926ejs/orion5x/cpu.c +++ b/arch/arm/cpu/arm926ejs/orion5x/cpu.c @@ -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; } diff --git a/arch/arm/include/asm/arch-orion5x/cpu.h b/arch/arm/include/asm/arch-orion5x/cpu.h index 80717f8a579..6ce02a92125 100644 --- a/arch/arm/include/asm/arch-orion5x/cpu.h +++ b/arch/arm/include/asm/arch-orion5x/cpu.h @@ -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. */ |