diff options
| author | Michal Simek <monstr@monstr.eu> | 2010-11-08 12:37:40 +0100 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2011-03-15 10:59:00 +0100 |
| commit | 0b9b0200b0922c29dc251b99700f96dade92214a (patch) | |
| tree | 23aa052508da168745cddca2a650e1627e29ec4d /arch/microblaze/kernel/entry.S | |
| parent | microblaze: Fix _reset function (diff) | |
| download | linux-0b9b0200b0922c29dc251b99700f96dade92214a.tar.xz linux-0b9b0200b0922c29dc251b99700f96dade92214a.zip | |
microblaze: Do not copy reset vectors/manual reset vector setup
Reset vector can be setup by bootloader and kernel doens't need
to touch it. If you require to setup reset vector, please use
CONFIG_MANUAL_RESET_VECTOR throught menuconfig.
It is not possible to setup address 0x0 as reset address because
make no sense to set it up at all.
Signed-off-by: Michal Simek <monstr@monstr.eu>
Signed-off-by: John Williams <john.williams@petalogix.com>
Diffstat (limited to 'arch/microblaze/kernel/entry.S')
| -rw-r--r-- | arch/microblaze/kernel/entry.S | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/microblaze/kernel/entry.S b/arch/microblaze/kernel/entry.S index 6b4052459d5a..ca15bc5c7449 100644 --- a/arch/microblaze/kernel/entry.S +++ b/arch/microblaze/kernel/entry.S @@ -993,11 +993,10 @@ ENTRY(_reset) /* These are compiled and loaded into high memory, then * copied into place in mach_early_setup */ .section .init.ivt, "ax" +#if CONFIG_MANUAL_RESET_VECTOR .org 0x0 - /* this is very important - here is the reset vector */ - /* in current MMU branch you don't care what is here - it is - * used from bootloader site - but this is correct for FS-BOOT */ - brai 0x70 + brai CONFIG_MANUAL_RESET_VECTOR +#endif .org 0x8 brai TOPHYS(_user_exception); /* syscall handler */ .org 0x10 |