Re: [Qemu-devel] [PATCH v1 1/5] microblaze: Support loading of u-boot initrd images

[Peter Crosthwaite]

On Thu, May 8, 2014 at 11:35 AM, Edgar E. Iglesias
<address@hidden> wrote:
> From: "Edgar E. Iglesias" <address@hidden>
>
> Signed-off-by: Edgar E. Iglesias <address@hidden>

Reviewed-by: Peter Crosthwaite <address@hidden>

> ---
>  hw/microblaze/boot.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
> index 48d9e7a..deeecfc 100644
> --- a/hw/microblaze/boot.c
> +++ b/hw/microblaze/boot.c
> @@ -174,9 +174,15 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr 
> ddr_base,
>              high = ROUND_UP(high + kernel_size, 4);
>              boot_info.initrd_start = high;
>              initrd_offset = boot_info.initrd_start - ddr_base;
> -            initrd_size = load_image_targphys(initrd_filename,
> -                                              boot_info.initrd_start,
> -                                              ram_size - initrd_offset);
> +
> +            initrd_size = load_ramdisk(initrd_filename,
> +                                       boot_info.initrd_start,
> +                                       ram_size - initrd_offset);
> +            if (initrd_size < 0) {
> +                initrd_size = load_image_targphys(initrd_filename,
> +                                                  boot_info.initrd_start,
> +                                                  ram_size - initrd_offset);
> +            }
>              if (initrd_size < 0) {
>                  error_report("qemu: could not load initrd '%s'\n",
>                               initrd_filename);
> --
> 1.8.3.2
>
>