summaryrefslogtreecommitdiff
path: root/target-arm/cpu.h
diff options
context:
space:
mode:
authorPaul Brook <paul@codesourcery.com>2010-04-05 19:34:51 +0100
committerPaul Brook <paul@codesourcery.com>2010-04-05 19:43:12 +0100
commit983fe82611b87a1198d32f58636f6f38b88ad337 (patch)
tree5736751719ff68c4da6729108b1d1d524710a2a7 /target-arm/cpu.h
parent116348def2bb446d972bdc2f44bd77ff631f85de (diff)
downloadqemu-983fe82611b87a1198d32f58636f6f38b88ad337.tar.gz
ARMv7-M reset fixes
Move ARMv7-M PC/SP initialization to the CPU reset routine. Add a board reset routine to call this. Also load values directly from ROM as images have not been copied yet. Avoid clearing the NVIC pointer on cpu reset. Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'target-arm/cpu.h')
-rw-r--r--target-arm/cpu.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index 3892db44e0..1e34541733 100644
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -146,7 +146,6 @@ typedef struct CPUARMState {
int current_sp;
int exception;
int pending_exception;
- void *nvic;
} v7m;
/* Coprocessor IO used by peripherals */
@@ -205,6 +204,7 @@ typedef struct CPUARMState {
CPU_COMMON
/* These fields after the common ones so they are preserved on reset. */
+ void *nvic;
struct arm_boot_info *boot_info;
} CPUARMState;