aboutsummaryrefslogtreecommitdiffstats
path: root/hw/vexpress.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2012-02-09 06:11:16 +0000
committerPaul Brook <paul@codesourcery.com>2012-02-09 12:10:35 +0000
commit7a65c8cc315c76bde6d692845c12e7ba06f44f89 (patch)
treed3929788c6d5005aee61d30f2411a7b74aaec1a8 /hw/vexpress.c
parenta642153013b2d0af106c0d4b9a637677d1e2c010 (diff)
ARM devboards: Set arm_sysctl properties before init, not after
The ARM devboard models (vexpress-a9, realview, versatilepb, etc) were accidentally trying to set one of the arm_sysctl properties after device init. This has now become a fatal error; set the property before device init where it should be done instead. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/vexpress.c')
-rw-r--r--hw/vexpress.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/vexpress.c b/hw/vexpress.c
index 64fab4574..43f47a65c 100644
--- a/hw/vexpress.c
+++ b/hw/vexpress.c
@@ -123,8 +123,8 @@ static void vexpress_a9_init(ram_addr_t ram_size,
/* 0x10000000 System registers */
sysctl = qdev_create(NULL, "realview_sysctl");
qdev_prop_set_uint32(sysctl, "sys_id", sys_id);
- qdev_init_nofail(sysctl);
qdev_prop_set_uint32(sysctl, "proc_id", proc_id);
+ qdev_init_nofail(sysctl);
sysbus_mmio_map(sysbus_from_qdev(sysctl), 0, 0x10000000);
/* 0x10001000 SP810 system control */