summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-01-30 10:51:47 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2013-01-30 10:51:47 -0600
commit321f211707822b4c87f0bb89e4f46586fff43163 (patch)
tree1eed37bdbcf7f4b9da3b48d9fd14019c6b0b4dc7
parentb0df98f3a2968eb5aba3075d1cf9b1a3931907e0 (diff)
parentf61850bffbd0bb8b15aa55ebc3470bf1f8ce8664 (diff)
downloadqemu-321f211707822b4c87f0bb89e4f46586fff43163.tar.gz
Merge remote-tracking branch 'pmaydell/arm-devs.next' into staging
# By Christoffer Dall (1) and Peter Maydell (1) # Via Peter Maydell * pmaydell/arm-devs.next: hw/vexpress: Use correct HBI (board model number) for vexpress-a15 hw/arm_sysctl: Clear sysctl cfgctrl start bit
-rw-r--r--hw/arm_sysctl.c1
-rw-r--r--hw/vexpress.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/hw/arm_sysctl.c b/hw/arm_sysctl.c
index da36f8a435..7ecb7da54b 100644
--- a/hw/arm_sysctl.c
+++ b/hw/arm_sysctl.c
@@ -334,6 +334,7 @@ static void arm_sysctl_write(void *opaque, hwaddr offset,
default:
s->sys_cfgstat |= 2; /* error */
}
+ s->sys_cfgctrl &= ~(1 << 31);
return;
case 0xa8: /* SYS_CFGSTAT */
if (board_id(s) != BOARD_ID_VEXPRESS) {
diff --git a/hw/vexpress.c b/hw/vexpress.c
index 7f0897c773..741b044f1d 100644
--- a/hw/vexpress.c
+++ b/hw/vexpress.c
@@ -271,7 +271,7 @@ static void a15_daughterboard_init(const VEDBoardInfo *daughterboard,
cpu_model = "cortex-a15";
}
- *proc_id = 0x14000217;
+ *proc_id = 0x14000237;
for (n = 0; n < smp_cpus; n++) {
ARMCPU *cpu;