diff options
author | Stefan Roese <sr@denx.de> | 2007-07-11 12:16:04 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2007-07-11 12:16:04 +0200 |
commit | 53629f439cc9daba166812749d2cf3102aca7aac (patch) | |
tree | f82264c99a124f2cbfeca96820290c46c88e0ad9 /post/cpu/ppc4xx | |
parent | 334043f601a90ac53e5ecc846fbb73a1ef38cb1f (diff) | |
parent | 4ef218f6fdf8d747f4589da5252b004e7d2c2876 (diff) |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'post/cpu/ppc4xx')
-rw-r--r-- | post/cpu/ppc4xx/cache_4xx.S | 2 | ||||
-rw-r--r-- | post/cpu/ppc4xx/fpu.c | 2 | ||||
-rw-r--r-- | post/cpu/ppc4xx/spr.c | 13 |
3 files changed, 8 insertions, 9 deletions
diff --git a/post/cpu/ppc4xx/cache_4xx.S b/post/cpu/ppc4xx/cache_4xx.S index 785b8d60b9..dddd76b235 100644 --- a/post/cpu/ppc4xx/cache_4xx.S +++ b/post/cpu/ppc4xx/cache_4xx.S @@ -438,7 +438,7 @@ cache_post_test6_reloc: blr /* Test instructions. - */ + */ cache_post_test_inst: li r3, 0 li r3, -1 diff --git a/post/cpu/ppc4xx/fpu.c b/post/cpu/ppc4xx/fpu.c index c2eb4a9bf0..27e9ed01af 100644 --- a/post/cpu/ppc4xx/fpu.c +++ b/post/cpu/ppc4xx/fpu.c @@ -37,7 +37,7 @@ int fpu_status(void) { if (mfspr(ccr0) & CCR0_DAPUIB) return 0; /* Disabled */ - else + else return 1; /* Enabled */ } diff --git a/post/cpu/ppc4xx/spr.c b/post/cpu/ppc4xx/spr.c index be5a701f31..3e746343d1 100644 --- a/post/cpu/ppc4xx/spr.c +++ b/post/cpu/ppc4xx/spr.c @@ -43,12 +43,11 @@ #include <asm/processor.h> -static struct -{ - int number; - char * name; - unsigned long mask; - unsigned long value; +static struct { + int number; + char * name; + unsigned long mask; + unsigned long value; } spr_test_list [] = { /* Standard Special-Purpose Registers */ @@ -65,7 +64,7 @@ static struct {0x11f, "PVR", 0x00000000, 0x00000000}, /* Additional Special-Purpose Registers. - * The values must match the initialization + * The values must match the initialization * values from cpu/ppc4xx/start.S */ {0x30, "PID", 0x00000000, 0x00000000}, |