From 9ba8c3f41d47f2051ea4bdb7156978f941ea7324 Mon Sep 17 00:00:00 2001 From: Lars Munch Date: Sat, 8 May 2010 22:42:43 +0200 Subject: arm: prevent coprocessor IO reset This prevent coprocessor IO structure from being reset on cpu reset. This was a problem for PXA which uses coprocessor 6 and 14. Signed-off-by: Lars Munch Signed-off-by: Aurelien Jarno --- target-arm/cpu.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'target-arm/cpu.h') diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 1e34541733..f3d138de6b 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -148,13 +148,6 @@ typedef struct CPUARMState { int pending_exception; } v7m; - /* Coprocessor IO used by peripherals */ - struct { - ARMReadCPFunc *cp_read; - ARMWriteCPFunc *cp_write; - void *opaque; - } cp[15]; - /* Thumb-2 EE state. */ uint32_t teecr; uint32_t teehbr; @@ -204,6 +197,13 @@ typedef struct CPUARMState { CPU_COMMON /* These fields after the common ones so they are preserved on reset. */ + + /* Coprocessor IO used by peripherals */ + struct { + ARMReadCPFunc *cp_read; + ARMWriteCPFunc *cp_write; + void *opaque; + } cp[15]; void *nvic; struct arm_boot_info *boot_info; } CPUARMState; -- cgit v1.2.3