From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnWzp-0003rV-TX for qemu-devel@nongnu.org; Fri, 14 Jun 2013 12:37:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UnWzd-0000gB-I5 for qemu-devel@nongnu.org; Fri, 14 Jun 2013 12:37:05 -0400 Received: from mail-pb0-x22e.google.com ([2607:f8b0:400e:c01::22e]:36366) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnWzd-0000e7-AD for qemu-devel@nongnu.org; Fri, 14 Jun 2013 12:36:53 -0400 Received: by mail-pb0-f46.google.com with SMTP id rq2so734262pbb.5 for ; Fri, 14 Jun 2013 09:36:52 -0700 (PDT) Sender: =?UTF-8?Q?S=C3=B6ren_Brinkmann?= From: Soren Brinkmann Date: Fri, 14 Jun 2013 09:36:23 -0700 Message-Id: <1371227783-23086-3-git-send-email-soren.brinkmann@xilinx.com> In-Reply-To: <1371227783-23086-1-git-send-email-soren.brinkmann@xilinx.com> References: <1371227783-23086-1-git-send-email-soren.brinkmann@xilinx.com> Subject: [Qemu-devel] [PATCH 2/2] hw/arm: Use 'load_ramdisk()' for loading ramdisk List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paul Brook , Peter Maydell , Paolo Bonzini Cc: Peter Crosthwaite , Edgar Iglesias , Soren Brinkmann , qemu-devel@nongnu.org The load_ramdisk function takes over loading traditional ramdisks images and does also load ramdisks with u-boot header. Signed-off-by: Soren Brinkmann --- hw/arm/boot.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index f310f73..ab2b234 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -436,10 +436,10 @@ 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) { fprintf(stderr, "qemu: could not load initrd '%s'\n", info->initrd_filename); -- 1.8.3.1