OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
626afa3
)
microblaze: Fix _reset function
author
Michal Simek
<monstr@monstr.eu>
Thu, 10 Mar 2011 09:56:21 +0000
(10:56 +0100)
committer
Michal Simek
<monstr@monstr.eu>
Tue, 15 Mar 2011 09:58:44 +0000
(10:58 +0100)
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>
arch/microblaze/kernel/entry.S
patch
|
blob
|
history
diff --git
a/arch/microblaze/kernel/entry.S
b/arch/microblaze/kernel/entry.S
index
d68a397
..
6b40524
100644
(file)
--- a/
arch/microblaze/kernel/entry.S
+++ b/
arch/microblaze/kernel/entry.S
@@
-988,7
+988,7
@@
ENTRY(_switch_to)
nop
ENTRY(_reset)
- brai 0
x70; /* 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 */