summaryrefslogtreecommitdiff
path: root/hw/versatilepb.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/versatilepb.c
parenta642153013b2d0af106c0d4b9a637677d1e2c010 (diff)
downloadqemu-7a65c8cc315c76bde6d692845c12e7ba06f44f89.tar.gz
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/versatilepb.c')
-rw-r--r--hw/versatilepb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/versatilepb.c b/hw/versatilepb.c
index 6e28e78f44..6ea0ce5fb3 100644
--- a/hw/versatilepb.c
+++ b/hw/versatilepb.c
@@ -198,8 +198,8 @@ static void versatile_init(ram_addr_t ram_size,
sysctl = qdev_create(NULL, "realview_sysctl");
qdev_prop_set_uint32(sysctl, "sys_id", 0x41007004);
- qdev_init_nofail(sysctl);
qdev_prop_set_uint32(sysctl, "proc_id", 0x02000000);
+ qdev_init_nofail(sysctl);
sysbus_mmio_map(sysbus_from_qdev(sysctl), 0, 0x10000000);
cpu_pic = arm_pic_init_cpu(env);