[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/6] sun4m: use qdev instead of legacy m48t59_init() function
From: |
BALATON Zoltan |
Subject: |
[PATCH 3/6] sun4m: use qdev instead of legacy m48t59_init() function |
Date: |
Sat, 17 Oct 2020 22:13:41 +0200 |
Also declare nvram variable with the correct type.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
hw/sparc/sun4m.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 54a2b2f9ef..7f1a48440c 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -837,7 +837,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
{
DeviceState *slavio_intctl;
unsigned int i;
- void *nvram;
+ Nvram *nvram;
qemu_irq *cpu_irqs[MAX_CPUS], slavio_irq[32], slavio_cpu_irq[MAX_CPUS];
qemu_irq fdc_tc;
unsigned long kernel_size;
@@ -966,7 +966,8 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
create_unimplemented_device("SUNW,sx", hwdef->sx_base, 0x2000);
}
- nvram = m48t59_init(slavio_irq[0], hwdef->nvram_base, 0, 0x2000, 1968, 8);
+ nvram = NVRAM(sysbus_create_simple("sysbus-m48t08", hwdef->nvram_base,
+ slavio_irq[0]));
slavio_timer_init_all(hwdef->counter_base, slavio_irq[19], slavio_cpu_irq,
smp_cpus);
--
2.21.3
- [PATCH 0/6] m48t59: remove legacy init functions, BALATON Zoltan, 2020/10/17
- [PATCH 5/6] ppc405_boards: use qdev instead of legacy m48t59_init() function, BALATON Zoltan, 2020/10/17
- [PATCH 4/6] sun4u: use qdev instead of legacy m48t59_init() function, BALATON Zoltan, 2020/10/17
- [PATCH 1/6] m48t59-isa: remove legacy m48t59_init_isa() function, BALATON Zoltan, 2020/10/17
- [PATCH 2/6] mt48t59: Set default value of base-year property to 1968, BALATON Zoltan, 2020/10/17
- [PATCH 6/6] m48t59: remove legacy m48t59_init() function, BALATON Zoltan, 2020/10/17
- [PATCH 3/6] sun4m: use qdev instead of legacy m48t59_init() function,
BALATON Zoltan <=
- Re: [PATCH 0/6] m48t59: remove legacy init functions, Mark Cave-Ayland, 2020/10/18