[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/10] hw/arm: Use 'load_ramdisk()' for loading ramdi
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 10/10] hw/arm: Use 'load_ramdisk()' for loading ramdisks w/ U-Boot header |
Date: |
Mon, 22 Jul 2013 12:43:47 +0100 |
From: Soren Brinkmann <address@hidden>
The load_ramdisk function is used to load ramdisk featuring a U-Boot
header.
Signed-off-by: Soren Brinkmann <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
hw/arm/boot.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index 9fbe5d2..2cbeefd 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -411,10 +411,16 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info
*info)
info->entry = entry;
if (is_linux) {
if (info->initrd_filename) {
- initrd_size = load_image_targphys(info->initrd_filename,
- info->initrd_start,
- info->ram_size -
- info->initrd_start);
+ initrd_size = load_ramdisk(info->initrd_filename,
+ info->initrd_start,
+ info->ram_size -
+ info->initrd_start);
+ if (initrd_size < 0) {
+ initrd_size = load_image_targphys(info->initrd_filename,
+ info->initrd_start,
+ info->ram_size -
+ info->initrd_start);
+ }
if (initrd_size < 0) {
fprintf(stderr, "qemu: could not load initrd '%s'\n",
info->initrd_filename);
--
1.7.9.5
- [Qemu-devel] [PULL 00/10] arm-devs queue, Peter Maydell, 2013/07/22
- [Qemu-devel] [PULL 08/10] vexpress: Add virtio-mmio transports, Peter Maydell, 2013/07/22
- [Qemu-devel] [PULL 10/10] hw/arm: Use 'load_ramdisk()' for loading ramdisks w/ U-Boot header,
Peter Maydell <=
- [Qemu-devel] [PULL 01/10] device_tree: Add qemu_devtree_setprop_sized_cells() utility functions, Peter Maydell, 2013/07/22
- [Qemu-devel] [PULL 06/10] arm/boot: Allow boards to modify the FDT blob, Peter Maydell, 2013/07/22
- [Qemu-devel] [PULL 05/10] virtio: Implement MMIO based virtio transport, Peter Maydell, 2013/07/22
- [Qemu-devel] [PULL 04/10] virtio: Support transports which can specify the vring alignment, Peter Maydell, 2013/07/22
- [Qemu-devel] [PULL 09/10] hw/loader: Support ramdisk with u-boot header, Peter Maydell, 2013/07/22
- [Qemu-devel] [PULL 03/10] virtio: Add support for guest setting of queue size, Peter Maydell, 2013/07/22
- [Qemu-devel] [PULL 02/10] arm/boot: Use qemu_devtree_setprop_sized_cells(), Peter Maydell, 2013/07/22
- [Qemu-devel] [PULL 07/10] vexpress: Make VEDBoardInfo extend arm_boot_info, Peter Maydell, 2013/07/22