diff options
| author | Jon Loeliger <jdl@freescale.com> | 2008-06-06 10:48:31 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2008-06-06 10:48:31 -0500 |
| commit | 1a247ba7fa5fb09f56892a09a990f03ce564b3e2 (patch) | |
| tree | 9dab0ef013cc6dc7883454808ecf6ba4d7a7a94e /post/lib_ppc/twox.c | |
| parent | 2c289e320dcfb3760e99cf1d765cb067194a1202 (diff) | |
| parent | 8155efbd7ae9c65564ca98affe94631d612ae088 (diff) | |
| download | u-boot-imx-1a247ba7fa5fb09f56892a09a990f03ce564b3e2.zip u-boot-imx-1a247ba7fa5fb09f56892a09a990f03ce564b3e2.tar.gz u-boot-imx-1a247ba7fa5fb09f56892a09a990f03ce564b3e2.tar.bz2 | |
Merge commit 'wd/master'
Diffstat (limited to 'post/lib_ppc/twox.c')
| -rw-r--r-- | post/lib_ppc/twox.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/post/lib_ppc/twox.c b/post/lib_ppc/twox.c index 7417a36..519b432 100644 --- a/post/lib_ppc/twox.c +++ b/post/lib_ppc/twox.c @@ -51,32 +51,32 @@ static struct cpu_post_twox_s } cpu_post_twox_table[] = { { - OP_EXTSB, + OP_EXTSB, 3, 3 }, { - OP_EXTSB, + OP_EXTSB, 0xff, -1 }, { - OP_EXTSH, + OP_EXTSH, 3, 3 }, { - OP_EXTSH, + OP_EXTSH, 0xff, 0xff }, { - OP_EXTSH, + OP_EXTSH, 0xffff, -1 }, { - OP_CNTLZW, + OP_CNTLZW, 0x000fffff, 12 }, @@ -99,7 +99,7 @@ int cpu_post_test_twox (void) unsigned int reg0 = (reg + 0) % 32; unsigned int reg1 = (reg + 1) % 32; unsigned int stk = reg < 16 ? 31 : 15; - unsigned long code[] = + unsigned long code[] = { ASM_STW(stk, 1, -4), ASM_ADDI(stk, 1, -16), @@ -116,7 +116,7 @@ int cpu_post_test_twox (void) ASM_LWZ(stk, 1, -4), ASM_BLR, }; - unsigned long codecr[] = + unsigned long codecr[] = { ASM_STW(stk, 1, -4), ASM_ADDI(stk, 1, -16), @@ -138,26 +138,26 @@ int cpu_post_test_twox (void) if (ret == 0) { - cr = 0; - cpu_post_exec_21 (code, & cr, & res, test->op); + cr = 0; + cpu_post_exec_21 (code, & cr, & res, test->op); - ret = res == test->res && cr == 0 ? 0 : -1; + ret = res == test->res && cr == 0 ? 0 : -1; - if (ret != 0) - { + if (ret != 0) + { post_log ("Error at twox test %d !\n", i); - } + } } if (ret == 0) { - cpu_post_exec_21 (codecr, & cr, & res, test->op); + cpu_post_exec_21 (codecr, & cr, & res, test->op); - ret = res == test->res && + ret = res == test->res && (cr & 0xe0000000) == cpu_post_makecr (res) ? 0 : -1; - if (ret != 0) - { + if (ret != 0) + { post_log ("Error at twox test %d !\n", i); } } @@ -165,7 +165,7 @@ int cpu_post_test_twox (void) } if (flag) - enable_interrupts(); + enable_interrupts(); return ret; } |