summaryrefslogtreecommitdiff
path: root/arch/microblaze
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2011-03-10 10:56:21 +0100
committerMichal Simek <monstr@monstr.eu>2011-03-15 10:58:44 +0100
commit7574349cee0b1cddc0aa1104d9b2fc5152d318d9 (patch)
treea2f0057c9ae45b7ea0a8e2cdb5f7528c23eb3bb4 /arch/microblaze
parent626afa35c1d39be43fc2b225d21973daf1c7e299 (diff)
downloadlinux-3.10-7574349cee0b1cddc0aa1104d9b2fc5152d318d9.tar.gz
linux-3.10-7574349cee0b1cddc0aa1104d9b2fc5152d318d9.tar.bz2
linux-3.10-7574349cee0b1cddc0aa1104d9b2fc5152d318d9.zip
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.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/entry.S b/arch/microblaze/kernel/entry.S
index d68a397e393..6b4052459d5 100644
--- a/arch/microblaze/kernel/entry.S
+++ b/arch/microblaze/kernel/entry.S
@@ -988,7 +988,7 @@ ENTRY(_switch_to)
nop
ENTRY(_reset)
- brai 0x70; /* Jump back to FS-boot */
+ brai 0; /* Jump to reset vector */
/* These are compiled and loaded into high memory, then
* copied into place in mach_early_setup */