diff options
| author | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2011-08-09 19:16:43 +0200 |
|---|---|---|
| committer | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2011-08-09 19:16:43 +0200 |
| commit | b9c6cbff76061537b722d55f0e321dde2a612a23 (patch) | |
| tree | 5eda80bfde43f96670abbe1e3922d10d817c517e /target-arm/cpu.h | |
| parent | 1da005b37482b51eaa4e5c6fa35d6d50687d83f1 (diff) | |
| parent | a492892cbee7ee3244fa63c993b55428b87fc093 (diff) | |
| download | qemu-b9c6cbff76061537b722d55f0e321dde2a612a23.tar.gz | |
Merge remote-tracking branch 'pm-arm/for-upstream' into pm
Diffstat (limited to 'target-arm/cpu.h')
| -rw-r--r-- | target-arm/cpu.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/target-arm/cpu.h b/target-arm/cpu.h index f17fd6b32c..6ab780d7ef 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -374,6 +374,7 @@ enum arm_features { ARM_FEATURE_V4T, ARM_FEATURE_V5, ARM_FEATURE_STRONGARM, + ARM_FEATURE_VAPA, /* cp15 VA to PA lookups */ }; static inline int arm_feature(CPUARMState *env, int feature) @@ -420,6 +421,7 @@ void cpu_arm_set_cp_io(CPUARMState *env, int cpnum, #define ARM_CPUID_PXA270_C5 0x69054117 #define ARM_CPUID_ARM1136 0x4117b363 #define ARM_CPUID_ARM1136_R2 0x4107b362 +#define ARM_CPUID_ARM1176 0x410fb767 #define ARM_CPUID_ARM11MPCORE 0x410fb022 #define ARM_CPUID_CORTEXA8 0x410fc080 #define ARM_CPUID_CORTEXA9 0x410fc090 |