Commit 7a65c8cc authored by Peter Maydell's avatar Peter Maydell Committed by Paul Brook
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parent a6421530

hw/realview.c

+1 −1
Original line number Diff line number Diff line
@@ -217,8 +217,8 @@ static void realview_init(ram_addr_t ram_size, 
    sys_id = is_pb ? 0x01780500 : 0xc1400400;

    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);



    if (is_mpcore) {

hw/versatilepb.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

hw/vexpress.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */