diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-09-16 20:32:10 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-09-16 20:32:10 +0200 |
| commit | 7201cfc4a79c0f55f5ebee73c5a626a49cb53f73 (patch) | |
| tree | 2c54f0a438a5ca915d88f8badab217b8ae993f11 /cpu | |
| parent | fd64975a882ca654f3139385791cdd237d6acc53 (diff) | |
| parent | 991b089d1ce5ad945725e3657a8f106dfa02a38e (diff) | |
Merge branch 'master' of /home/uboot/070912/u-boot-microblaze/
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/microblaze/cache.c | 2 | ||||
| -rw-r--r-- | cpu/microblaze/start.S | 6 | ||||
| -rw-r--r-- | cpu/microblaze/timer.c | 7 |
3 files changed, 5 insertions, 10 deletions
diff --git a/cpu/microblaze/cache.c b/cpu/microblaze/cache.c index 4b7866fae5..6ce0b55b24 100644 --- a/cpu/microblaze/cache.c +++ b/cpu/microblaze/cache.c @@ -1,7 +1,7 @@ /* * (C) Copyright 2007 Michal Simek * - * Michal SIMEK <monstr@monstr.eu> + * Michal SIMEK <moonstr@monstr.eu> * * See file CREDITS for list of people who contributed to this * project. diff --git a/cpu/microblaze/start.S b/cpu/microblaze/start.S index 8740284ad8..3c027ff9bb 100644 --- a/cpu/microblaze/start.S +++ b/cpu/microblaze/start.S @@ -33,13 +33,15 @@ _start: addi r1, r0, CFG_INIT_SP_OFFSET addi r1, r1, -4 /* Decrement SP to top of memory */ /* add opcode instruction for 32bit jump - 2 instruction imm & brai*/ - addi r6, r0, 0xb0000000 /* hex b000 opcode imm */ + addi r6, r0, 0xb000 /* hex b000 opcode imm */ + bslli r6, r6, 16 /* shift */ swi r6, r0, 0x0 /* reset address */ swi r6, r0, 0x8 /* user vector exception */ swi r6, r0, 0x10 /* interrupt */ swi r6, r0, 0x20 /* hardware exception */ - addi r6, r0, 0xb8080000 /* hew b808 opcode brai*/ + addi r6, r0, 0xb808 /* hew b808 opcode brai*/ + bslli r6, r6, 16 swi r6, r0, 0x4 /* reset address */ swi r6, r0, 0xC /* user vector exception */ swi r6, r0, 0x14 /* interrupt */ diff --git a/cpu/microblaze/timer.c b/cpu/microblaze/timer.c index b350453443..ab1cb12749 100644 --- a/cpu/microblaze/timer.c +++ b/cpu/microblaze/timer.c @@ -33,17 +33,10 @@ void reset_timer (void) timestamp = 0; } -#ifdef CFG_TIMER_0 ulong get_timer (ulong base) { return (timestamp - base); } -#else -ulong get_timer (ulong base) -{ - return (timestamp++ - base); -} -#endif void set_timer (ulong t) { |