From: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Date: Fri, 3 May 2013 13:19:45 +0000 (+0200)
Subject: microblaze: Support loading of u-boot initrd images
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1b939d922737fac86a854dbc5e186fe9fb7b0573;p=qemu.git

microblaze: Support loading of u-boot initrd images

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
---

diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index 48d9e7afa4..deeecfca6f 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);