diff options
| author | Michal Simek <monstr@monstr.eu> | 2011-03-10 04:56:21 -0500 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2011-03-15 05:58:44 -0400 |
| commit | 7574349cee0b1cddc0aa1104d9b2fc5152d318d9 (patch) | |
| tree | a2f0057c9ae45b7ea0a8e2cdb5f7528c23eb3bb4 /arch/microblaze | |
| parent | 626afa35c1d39be43fc2b225d21973daf1c7e299 (diff) | |
microblaze: Fix _reset function
If soft reset falls through with no hardware assisted reset, the best
we can do is jump to the reset vector and see what the bootloader left
for us.
Signed-off-by: Michal Simek <monstr@monstr.eu>
Signed-off-by: John Williams <john.williams@petalogix.com>
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/entry.S b/arch/microblaze/kernel/entry.S index d68a397e3936..6b4052459d5a 100644 --- a/arch/microblaze/kernel/entry.S +++ b/arch/microblaze/kernel/entry.S | |||
| @@ -988,7 +988,7 @@ ENTRY(_switch_to) | |||
| 988 | nop | 988 | nop |
| 989 | 989 | ||
| 990 | ENTRY(_reset) | 990 | ENTRY(_reset) |
| 991 | brai 0x70; /* Jump back to FS-boot */ | 991 | brai 0; /* Jump to reset vector */ |
| 992 | 992 | ||
| 993 | /* These are compiled and loaded into high memory, then | 993 | /* These are compiled and loaded into high memory, then |
| 994 | * copied into place in mach_early_setup */ | 994 | * copied into place in mach_early_setup */ |