diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2012-04-20 17:58:35 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2012-04-21 18:12:27 +0000 |
| commit | 8092d2f031e70eb2664d5fa1d9ed00ef1113ee71 (patch) | |
| tree | 1f7e54065213a1ef08d1bfcf2df2b76078504c70 /target-arm/helper.c | |
| parent | 2e4d7e3e3e97c4e0e68aca6221e3e7cb10b6041c (diff) | |
| download | qemu-8092d2f031e70eb2664d5fa1d9ed00ef1113ee71.zip qemu-8092d2f031e70eb2664d5fa1d9ed00ef1113ee71.tar.gz qemu-8092d2f031e70eb2664d5fa1d9ed00ef1113ee71.tar.bz2 | |
target-arm: Move OMAP cp15_i_{max,min} reset to cpu_state_reset
Move the OMAP-specific cp15_i_{max,min} reset to cpu_state_reset;
since these registers are only accessible on CPUs with the
OMAPCP feature set there's no need to guard this reset with
either a CPUID or feature bit check.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-arm/helper.c')
| -rw-r--r-- | target-arm/helper.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/target-arm/helper.c b/target-arm/helper.c index 84830ff..fb618a7 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -47,8 +47,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id) break; case ARM_CPUID_TI915T: case ARM_CPUID_TI925T: - env->cp15.c15_i_max = 0x000; - env->cp15.c15_i_min = 0xff0; break; case ARM_CPUID_PXA250: case ARM_CPUID_PXA255: @@ -114,6 +112,7 @@ void cpu_state_reset(CPUARMState *env) env->cp15.c0_c2[3] = cpu->id_isar3; env->cp15.c0_c2[4] = cpu->id_isar4; env->cp15.c0_c2[5] = cpu->id_isar5; + env->cp15.c15_i_min = 0xff0; if (arm_feature(env, ARM_FEATURE_IWMMXT)) { env->iwmmxt.cregs[ARM_IWMMXT_wCID] = 0x69051000 | 'Q'; |