OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Merge remote-tracking branch 'pmaydell/arm-devs.next' into staging

Browse Source 
# 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
This commit is contained in:
Anthony Liguori 2013-01-30 10:51:47 -06:00
commit 321f211707
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/arm_sysctl.c
View File

@ -334,6 +334,7 @@ static void arm_sysctl_write(void *opaque, hwaddr offset,
default: default:
s->sys_cfgstat |= 2; /* error */ s->sys_cfgstat |= 2; /* error */
} }
s->sys_cfgctrl &= ~(1 << 31);
return; return;
case 0xa8: /* SYS_CFGSTAT */ case 0xa8: /* SYS_CFGSTAT */
if (board_id(s) != BOARD_ID_VEXPRESS) { if (board_id(s) != BOARD_ID_VEXPRESS) {

2
hw/vexpress.c
View File

@ -271,7 +271,7 @@ static void a15_daughterboard_init(const VEDBoardInfo *daughterboard,
cpu_model = "cortex-a15"; cpu_model = "cortex-a15";
} }
*proc_id = 0x14000217; *proc_id = 0x14000237;
for (n = 0; n < smp_cpus; n++) { for (n = 0; n < smp_cpus; n++) {
ARMCPU *cpu; ARMCPU *cpu;