Commit 90b9508e authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc.for-upstream-20180820' into staging 



qemu-sparc.for-upstream queue

# gpg: Signature made Mon 20 Aug 2018 19:38:04 BST
# gpg:                using RSA key 5BC2C56FAE0F321F
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>"
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C  C9C4 5BC2 C56F AE0F 321F

* remotes/mcayland/tags/qemu-sparc.for-upstream-20180820:
  sun4m: don't use legacy fw_cfg_init_mem() function
  sun4u: ensure kernel_top is always initialised

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d0092d90 84983214

hw/sparc/sun4m.c

+11 −1
Original line number Diff line number Diff line
@@ -1035,7 +1035,17 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, 
        ecc_init(hwdef->ecc_base, slavio_irq[28],

                 hwdef->ecc_version);



    fw_cfg = fw_cfg_init_mem(CFG_ADDR, CFG_ADDR + 2);

    dev = qdev_create(NULL, TYPE_FW_CFG_MEM);

    fw_cfg = FW_CFG(dev);

    qdev_prop_set_uint32(dev, "data_width", 1);

    qdev_prop_set_bit(dev, "dma_enabled", false);

    object_property_add_child(OBJECT(qdev_get_machine()), TYPE_FW_CFG,

                              OBJECT(fw_cfg), NULL);

    qdev_init_nofail(dev);

    s = SYS_BUS_DEVICE(dev);

    sysbus_mmio_map(s, 0, CFG_ADDR);

    sysbus_mmio_map(s, 1, CFG_ADDR + 2);



    fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, (uint16_t)smp_cpus);

    fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, (uint16_t)max_cpus);

    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);

hw/sparc64/sun4u.c

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static uint64_t sun4u_load_kernel(const char *kernel_filename, 
    unsigned int i;

    long kernel_size;

    uint8_t *ptr;

    uint64_t kernel_top;

    uint64_t kernel_top = 0;



    linux_boot = (kernel_filename != NULL);
@@ -172,7 +172,7 @@ static uint64_t sun4u_load_kernel(const char *kernel_filename, 
        }

        /* load initrd above kernel */

        *initrd_size = 0;

        if (initrd_filename) {

        if (initrd_filename && kernel_top) {

            *initrd_addr = TARGET_PAGE_ALIGN(kernel_top);



            *initrd_size = load_image_targphys(initrd_filename,