On 9/12/25 13:31, Anton Johansson wrote:
Changes kernel_start_addr from target_ulong to vaddr. Logically, the
argument represents the virtual address at which to load the kernel image,
which as a fallback gets treated as a hwaddr if elf/uimage loading fails.
(Note: callers of riscv_load_kernel() currently pass in a hwaddr as
kernel_start_addr, so I'm not 100% if hwaddr or vaddr is right here.
Please correct me if I'm wrong.)
IMHO they need to be updated, i.e.:
-- >8 --
diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c
index a17f62cd082..bc4f409c19c 100644
--- a/hw/riscv/microchip_pfsoc.c
+++ b/hw/riscv/microchip_pfsoc.c
@@ -521,7 +521,8 @@ static void
microchip_icicle_kit_machine_init(MachineState *machine)
uint64_t mem_low_size, mem_high_size;
hwaddr firmware_load_addr;
const char *firmware_name;
- hwaddr firmware_end_addr, kernel_start_addr;
+ hwaddr firmware_end_addr;
+ vaddr kernel_start_addr;
uint64_t kernel_entry;
uint64_t fdt_load_addr;
DriveInfo *dinfo = drive_get(IF_SD, 0, 0);
---
Suggested-by: Philippe Mathieu-Daudé <[email protected]>
Signed-off-by: Anton Johansson <[email protected]>
---
include/hw/riscv/boot.h | 2 +-
hw/riscv/boot.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
