summaryrefslogtreecommitdiff
path: root/arch/powerpc/cpu/mpc83xx
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-01-25 16:45:00 -0500
committerTom Rini <trini@konsulko.com>2016-01-25 16:45:00 -0500
commitd82477748d641e60ba3e1a0b55d98362aed70f80 (patch)
treed03d9455317fcf9a01905160e1d47bfed2a5f896 /arch/powerpc/cpu/mpc83xx
parentac01603da4598b4b34ff3a5c428aa925daa12b60 (diff)
parent2f66a828f7621958b6925fc763380fa87be55ee6 (diff)
downloadu-boot-imx-d82477748d641e60ba3e1a0b55d98362aed70f80.zip
u-boot-imx-d82477748d641e60ba3e1a0b55d98362aed70f80.tar.gz
u-boot-imx-d82477748d641e60ba3e1a0b55d98362aed70f80.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/cpu/mpc83xx')
-rw-r--r--arch/powerpc/cpu/mpc83xx/law.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/law.c b/arch/powerpc/cpu/mpc83xx/law.c
index 997aea4..5659ab8 100644
--- a/arch/powerpc/cpu/mpc83xx/law.c
+++ b/arch/powerpc/cpu/mpc83xx/law.c
@@ -19,7 +19,7 @@ int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id)
if (start == 0)
start_align = 1ull << (LAW_SIZE_2G + 1);
else
- start_align = 1ull << (__ffs64(start) - 1);
+ start_align = 1ull << (__ffs64(start));
law_sz = min(start_align, sz);
law_sz_enc = __ilog2_u64(law_sz) - 1;
@@ -39,7 +39,7 @@ int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id)
if (sz) {
start += law_sz;
- start_align = 1ull << (__ffs64(start) - 1);
+ start_align = 1ull << (__ffs64(start));
law_sz = min(start_align, sz);
law_sz_enc = __ilog2_u64(law_sz) - 1;
ecm = &immap->sysconf.ddrlaw[1];