* [PATCH] hw/riscv: Drop the unused fdt pointer
@ 2021-03-20 9:35 Vijai Kumar K
2021-03-22 14:28 ` Alistair Francis
0 siblings, 1 reply; 2+ messages in thread
From: Vijai Kumar K @ 2021-03-20 9:35 UTC (permalink / raw)
To: qemu-riscv, alistair23; +Cc: Vijai Kumar K, qemu-devel
Drop the unused fdt pointer in riscv_setup_rom_reset_vec API.
Signed-off-by: Vijai Kumar K <vijai@behindbytes.com>
---
hw/riscv/boot.c | 2 +-
hw/riscv/spike.c | 2 +-
hw/riscv/virt.c | 2 +-
include/hw/riscv/boot.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
index 0d38bb7426..893e307da6 100644
--- a/hw/riscv/boot.c
+++ b/hw/riscv/boot.c
@@ -249,7 +249,7 @@ void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *harts
hwaddr start_addr,
hwaddr rom_base, hwaddr rom_size,
uint64_t kernel_entry,
- uint32_t fdt_load_addr, void *fdt)
+ uint32_t fdt_load_addr)
{
int i;
uint32_t start_addr_hi32 = 0x00000000;
diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
index ec7cb2f707..0b68710afb 100644
--- a/hw/riscv/spike.c
+++ b/hw/riscv/spike.c
@@ -298,7 +298,7 @@ static void spike_board_init(MachineState *machine)
riscv_setup_rom_reset_vec(machine, &s->soc[0], memmap[SPIKE_DRAM].base,
memmap[SPIKE_MROM].base,
memmap[SPIKE_MROM].size, kernel_entry,
- fdt_load_addr, s->fdt);
+ fdt_load_addr);
/* initialize HTIF using symbols found in load_kernel */
htif_mm_init(system_memory, mask_rom,
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index 0b39101a5e..7c247626c8 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -695,7 +695,7 @@ static void virt_machine_init(MachineState *machine)
riscv_setup_rom_reset_vec(machine, &s->soc[0], start_addr,
virt_memmap[VIRT_MROM].base,
virt_memmap[VIRT_MROM].size, kernel_entry,
- fdt_load_addr, machine->fdt);
+ fdt_load_addr);
/* SiFive Test MMIO device */
sifive_test_create(memmap[VIRT_TEST].base);
diff --git a/include/hw/riscv/boot.h b/include/hw/riscv/boot.h
index 11a21dd584..27b9569e2f 100644
--- a/include/hw/riscv/boot.h
+++ b/include/hw/riscv/boot.h
@@ -46,7 +46,7 @@ void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *harts
hwaddr saddr,
hwaddr rom_base, hwaddr rom_size,
uint64_t kernel_entry,
- uint32_t fdt_load_addr, void *fdt);
+ uint32_t fdt_load_addr);
void riscv_rom_copy_firmware_info(MachineState *machine, hwaddr rom_base,
hwaddr rom_size,
uint32_t reset_vec_size,
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] hw/riscv: Drop the unused fdt pointer
2021-03-20 9:35 [PATCH] hw/riscv: Drop the unused fdt pointer Vijai Kumar K
@ 2021-03-22 14:28 ` Alistair Francis
0 siblings, 0 replies; 2+ messages in thread
From: Alistair Francis @ 2021-03-22 14:28 UTC (permalink / raw)
To: Vijai Kumar K; +Cc: open list:RISC-V, qemu-devel@nongnu.org Developers
On Sat, Mar 20, 2021 at 5:35 AM Vijai Kumar K <vijai@behindbytes.com> wrote:
>
> Drop the unused fdt pointer in riscv_setup_rom_reset_vec API.
>
> Signed-off-by: Vijai Kumar K <vijai@behindbytes.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> hw/riscv/boot.c | 2 +-
> hw/riscv/spike.c | 2 +-
> hw/riscv/virt.c | 2 +-
> include/hw/riscv/boot.h | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
> index 0d38bb7426..893e307da6 100644
> --- a/hw/riscv/boot.c
> +++ b/hw/riscv/boot.c
> @@ -249,7 +249,7 @@ void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *harts
> hwaddr start_addr,
> hwaddr rom_base, hwaddr rom_size,
> uint64_t kernel_entry,
> - uint32_t fdt_load_addr, void *fdt)
> + uint32_t fdt_load_addr)
> {
> int i;
> uint32_t start_addr_hi32 = 0x00000000;
> diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
> index ec7cb2f707..0b68710afb 100644
> --- a/hw/riscv/spike.c
> +++ b/hw/riscv/spike.c
> @@ -298,7 +298,7 @@ static void spike_board_init(MachineState *machine)
> riscv_setup_rom_reset_vec(machine, &s->soc[0], memmap[SPIKE_DRAM].base,
> memmap[SPIKE_MROM].base,
> memmap[SPIKE_MROM].size, kernel_entry,
> - fdt_load_addr, s->fdt);
> + fdt_load_addr);
>
> /* initialize HTIF using symbols found in load_kernel */
> htif_mm_init(system_memory, mask_rom,
> diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
> index 0b39101a5e..7c247626c8 100644
> --- a/hw/riscv/virt.c
> +++ b/hw/riscv/virt.c
> @@ -695,7 +695,7 @@ static void virt_machine_init(MachineState *machine)
> riscv_setup_rom_reset_vec(machine, &s->soc[0], start_addr,
> virt_memmap[VIRT_MROM].base,
> virt_memmap[VIRT_MROM].size, kernel_entry,
> - fdt_load_addr, machine->fdt);
> + fdt_load_addr);
>
> /* SiFive Test MMIO device */
> sifive_test_create(memmap[VIRT_TEST].base);
> diff --git a/include/hw/riscv/boot.h b/include/hw/riscv/boot.h
> index 11a21dd584..27b9569e2f 100644
> --- a/include/hw/riscv/boot.h
> +++ b/include/hw/riscv/boot.h
> @@ -46,7 +46,7 @@ void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *harts
> hwaddr saddr,
> hwaddr rom_base, hwaddr rom_size,
> uint64_t kernel_entry,
> - uint32_t fdt_load_addr, void *fdt);
> + uint32_t fdt_load_addr);
> void riscv_rom_copy_firmware_info(MachineState *machine, hwaddr rom_base,
> hwaddr rom_size,
> uint32_t reset_vec_size,
> --
> 2.25.1
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-22 15:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-20 9:35 [PATCH] hw/riscv: Drop the unused fdt pointer Vijai Kumar K
2021-03-22 14:28 ` Alistair Francis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).