[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-riscv] [Qemu-devel] [RFC v1 3/5] hw/riscv: Extend the kernel l
From: |
Bin Meng |
Subject: |
Re: [Qemu-riscv] [Qemu-devel] [RFC v1 3/5] hw/riscv: Extend the kernel loading support |
Date: |
Wed, 19 Jun 2019 23:16:11 +0800 |
On Wed, Jun 19, 2019 at 8:56 AM Alistair Francis
<address@hidden> wrote:
>
> Extend the RISC-V kernel loader to support uImage and Image files.
> A Linux kernel can now be booted with:
>
> qemu-system-riscv64 -machine virt -bios fw_jump.elf -kernel Image
>
> Signed-off-by: Alistair Francis <address@hidden>
> ---
> hw/riscv/boot.c | 19 ++++++++++++++-----
> 1 file changed, 14 insertions(+), 5 deletions(-)
>
> diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
> index 392ca0cb2e..7f68035a3f 100644
> --- a/hw/riscv/boot.c
> +++ b/hw/riscv/boot.c
> @@ -67,13 +67,22 @@ target_ulong riscv_load_kernel(MachineState *machine,
> uint64_t kernel_entry, kernel_high;
>
> if (load_elf(kernel_filename, NULL, kernel_translate, machine,
> - &kernel_entry, NULL, &kernel_high,
> - 0, EM_RISCV, 1, 0) < 0) {
> - error_report("could not load kernel '%s'", kernel_filename);
> - exit(1);
> + &kernel_entry, NULL, &kernel_high, 0, EM_RISCV, 1, 0) > 0) {
> + return kernel_entry;
> + }
> +
> + if (load_uimage_as(kernel_filename, &kernel_entry, NULL, NULL,
> + kernel_translate, machine, NULL) > 0) {
We should not set the 'kernel_translate' here for uImage.
In fact, the whole kernel_translate() is not necessary.
> + return kernel_entry;
> + }
> +
Regards,
Bin
[Qemu-riscv] [RFC v1 1/5] hw/riscv: Split out the boot functions, Alistair Francis, 2019/06/18