|
@@ -94,9 +94,10 @@ static const MemMapEntry sifive_u_memmap[] = {
|
|
#define GEM_REVISION 0x10070109
|
|
#define GEM_REVISION 0x10070109
|
|
|
|
|
|
static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,
|
|
static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,
|
|
- uint64_t mem_size, const char *cmdline, bool is_32_bit)
|
|
|
|
|
|
+ bool is_32_bit)
|
|
{
|
|
{
|
|
- MachineState *ms = MACHINE(qdev_get_machine());
|
|
|
|
|
|
+ MachineState *ms = MACHINE(s);
|
|
|
|
+ uint64_t mem_size = ms->ram_size;
|
|
void *fdt;
|
|
void *fdt;
|
|
int cpu, fdt_size;
|
|
int cpu, fdt_size;
|
|
uint32_t *cells;
|
|
uint32_t *cells;
|
|
@@ -560,8 +561,7 @@ static void sifive_u_machine_init(MachineState *machine)
|
|
qemu_allocate_irq(sifive_u_machine_reset, NULL, 0));
|
|
qemu_allocate_irq(sifive_u_machine_reset, NULL, 0));
|
|
|
|
|
|
/* create device tree */
|
|
/* create device tree */
|
|
- create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline,
|
|
|
|
- riscv_is_32bit(&s->soc.u_cpus));
|
|
|
|
|
|
+ create_fdt(s, memmap, riscv_is_32bit(&s->soc.u_cpus));
|
|
|
|
|
|
if (s->start_in_flash) {
|
|
if (s->start_in_flash) {
|
|
/*
|
|
/*
|