diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2007-07-06 19:39:48 -0500 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2007-07-06 19:39:48 -0500 |
| commit | 0459e7d3a0a273064b738aa2e06fd7dcd35eec58 (patch) | |
| tree | 83b8a3044400cb1463e91410cf0f3732dedd7fb4 /post/lib_ppc/b.c | |
| parent | 30d5c04c93084fe0b144646b77eb873957872a8d (diff) | |
| parent | e80955f07de03fef0196353e77534b2300193c1c (diff) | |
| download | u-boot-imx-0459e7d3a0a273064b738aa2e06fd7dcd35eec58.zip u-boot-imx-0459e7d3a0a273064b738aa2e06fd7dcd35eec58.tar.gz u-boot-imx-0459e7d3a0a273064b738aa2e06fd7dcd35eec58.tar.bz2 | |
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'post/lib_ppc/b.c')
| -rw-r--r-- | post/lib_ppc/b.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/post/lib_ppc/b.c b/post/lib_ppc/b.c index b4b17c8..6e276c4 100644 --- a/post/lib_ppc/b.c +++ b/post/lib_ppc/b.c @@ -49,7 +49,7 @@ extern void cpu_post_exec_31 (ulong *code, ulong *ctr, ulong *lr, ulong *jump, ulong cr); static int cpu_post_test_bc (ulong cmd, ulong bo, ulong bi, - int pjump, int dec, int link, ulong pctr, ulong cr) + int pjump, int decr, int link, ulong pctr, ulong cr) { int ret = 0; ulong lr = 0; @@ -77,7 +77,7 @@ static int cpu_post_test_bc (ulong cmd, ulong bo, ulong bi, ret = pjump == jump ? 0 : -1; if (ret == 0) { - if (dec) + if (decr) ret = pctr == ctr + 1 ? 0 : -1; else ret = pctr == ctr ? 0 : -1; @@ -163,7 +163,7 @@ int cpu_post_test_b (void) { for (ctr = 1; ctr <= 2 && ret == 0; ctr++) { - int dec = cd < 2; + int decr = cd < 2; int cr = cond ? 0x80000000 : 0x00000000; int jumpc = cc >= 2 || (cc == 0 && !cond) || @@ -174,7 +174,7 @@ int cpu_post_test_b (void) int jump = jumpc && jumpd; ret = cpu_post_test_bc (link ? OP_BCL : OP_BC, - (cc << 3) + (cd << 1), 0, jump, dec, link, + (cc << 3) + (cd << 1), 0, jump, decr, link, ctr, cr); if (ret != 0) |