From 706872a56630a206897742b70c69ff99727672d3 Mon Sep 17 00:00:00 2001 From: Christoffer Dall Date: Wed, 30 Jan 2013 15:39:01 +0000 Subject: hw/arm_sysctl: Clear sysctl cfgctrl start bit The start bit should only be set to indicate that a function call is underway, right now. When done with function, clear it. Signed-off-by: Christoffer Dall Signed-off-by: Peter Maydell --- hw/arm_sysctl.c | 1 + 1 file changed, 1 insertion(+) 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) { -- cgit v1.2.1 From f61850bffbd0bb8b15aa55ebc3470bf1f8ce8664 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Wed, 30 Jan 2013 15:39:02 +0000 Subject: hw/vexpress: Use correct HBI (board model number) for vexpress-a15 The vexpress-a15 QEMU model is supposed to be a V2P-CA15; the HBI (a kind of board model number) for this coretile is 237, not 217. Signed-off-by: Peter Maydell --- hw/vexpress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- cgit v1.2.1