diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-10-13 22:57:43 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-10-13 22:57:43 +0200 |
| commit | 8f05a661e952f0edfefb985a5be4ad3c721a897e (patch) | |
| tree | 7f9eac58a81fe09f9d4922683407162577a4d994 /cpu | |
| parent | 86cc433e1b06aae6dcda399219009f2a2497a385 (diff) | |
| parent | 853643d8cf2ca80cb2e25c53ad5dc580abafe166 (diff) | |
| download | u-boot-imx-8f05a661e952f0edfefb985a5be4ad3c721a897e.zip u-boot-imx-8f05a661e952f0edfefb985a5be4ad3c721a897e.tar.gz u-boot-imx-8f05a661e952f0edfefb985a5be4ad3c721a897e.tar.bz2 | |
Merge branch 'merge' of git://www.denx.de/git/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, 10 insertions, 5 deletions
diff --git a/cpu/microblaze/cache.c b/cpu/microblaze/cache.c index 6ce0b55..4b7866f 100644 --- a/cpu/microblaze/cache.c +++ b/cpu/microblaze/cache.c @@ -1,7 +1,7 @@ /* * (C) Copyright 2007 Michal Simek * - * Michal SIMEK <moonstr@monstr.eu> + * Michal SIMEK <monstr@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 3c027ff..8740284 100644 --- a/cpu/microblaze/start.S +++ b/cpu/microblaze/start.S @@ -33,15 +33,13 @@ _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, 0xb000 /* hex b000 opcode imm */ - bslli r6, r6, 16 /* shift */ + addi r6, r0, 0xb0000000 /* hex b000 opcode imm */ 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, 0xb808 /* hew b808 opcode brai*/ - bslli r6, r6, 16 + addi r6, r0, 0xb8080000 /* hew b808 opcode brai*/ 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 ab1cb12..b350453 100644 --- a/cpu/microblaze/timer.c +++ b/cpu/microblaze/timer.c @@ -33,10 +33,17 @@ 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) { |