ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ppc405_boards: use qdev properties instead of legacy m48t59_init() function 

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20201016182739.22875-5-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This commit is contained in:
Mark Cave-Ayland 2020-10-16 19:27:38 +01:00
parent dc7a05da69
commit e8a02431ec
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/ppc/ppc405_boards.c
View File

@ -28,6 +28,8 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "cpu.h" #include "cpu.h"
#include "hw/ppc/ppc.h" #include "hw/ppc/ppc.h"
#include "hw/qdev-properties.h"
#include "hw/sysbus.h"
#include "ppc405.h" #include "ppc405.h"
#include "hw/rtc/m48t59.h" #include "hw/rtc/m48t59.h"
#include "hw/block/flash.h" #include "hw/block/flash.h"
@ -145,6 +147,8 @@ static void ref405ep_init(MachineState *machine)
char *filename; char *filename;
ppc4xx_bd_info_t bd; ppc4xx_bd_info_t bd;
CPUPPCState *env; CPUPPCState *env;
DeviceState *dev;
SysBusDevice *s;
qemu_irq *pic; qemu_irq *pic;
MemoryRegion *bios; MemoryRegion *bios;
MemoryRegion *sram = g_new(MemoryRegion, 1); MemoryRegion *sram = g_new(MemoryRegion, 1);
@ -227,7 +231,11 @@ static void ref405ep_init(MachineState *machine)
/* Register FPGA */ /* Register FPGA */
ref405ep_fpga_init(sysmem, 0xF0300000); ref405ep_fpga_init(sysmem, 0xF0300000);
/* Register NVRAM */ /* Register NVRAM */
m48t59_init(NULL, 0xF0000000, 0, 8192, 1968, 8); dev = qdev_new("sysbus-m48t08");
qdev_prop_set_int32(dev, "base-year", 1968);
s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal);
sysbus_mmio_map(s, 0, 0xF0000000);
/* Load kernel */ /* Load kernel */
linux_boot = (kernel_filename != NULL); linux_boot = (kernel_filename != NULL);
if (linux_boot) { if (linux_boot) {