From patchwork Mon Jun 18 01:35:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peter A. G. Crosthwaite" X-Patchwork-Id: 165368 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 33AF8B72C1 for ; Mon, 18 Jun 2012 11:26:11 +1000 (EST) Received: from localhost ([::1]:42714 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SgQjI-0006k7-WE for incoming@patchwork.ozlabs.org; Sun, 17 Jun 2012 21:26:09 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60407) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SgQj1-0006XX-MP for qemu-devel@nongnu.org; Sun, 17 Jun 2012 21:25:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SgQiy-0003MA-UE for qemu-devel@nongnu.org; Sun, 17 Jun 2012 21:25:51 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:49564) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SgQiy-0003Kb-OY for qemu-devel@nongnu.org; Sun, 17 Jun 2012 21:25:48 -0400 Received: by dadn2 with SMTP id n2so5625846dad.4 for ; Sun, 17 Jun 2012 18:25:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references:x-gm-message-state; bh=nxdnKH25VnvyCQ9F06EY8JtffOgmX3hHD6Woe64vSM0=; b=hDurJTI8SBKhcdDIZpDUMo6GBPNFyf1VMO25vwjN4RfkC+mM4+A285K98a9ihNnArz GvkeI8ZeUOCeRHjPiI69Ib1+vu2uHzTL9G4TD5rnrvTe7mGN9tKpi0f/zxLG+AR1ipRt zJxysRSm6avyWNy2TqvhSn1UZZi2M8SAhoW1qx78V64kOEomclQ/ZESqZBIttb1DrWN+ oNkbWpny4ybtpoBP7v2iVBhOiel7yn0xPdjMcDx/n7e8FkoKXl6VuwYw4XwEi+PfEycN 1kRDkUM5YORLkGEqEzBNVzq9h+saarR+IgMHNiloLd2jL7BztZvKiFRJ7a1SvTDhhh2S 2x+A== Received: by 10.68.225.170 with SMTP id rl10mr45921125pbc.13.1339982746438; Sun, 17 Jun 2012 18:25:46 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id ob9sm21957849pbb.28.2012.06.17.18.25.43 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 17 Jun 2012 18:25:45 -0700 (PDT) From: "Peter A. G. Crosthwaite" To: edgar.iglesias@gmail.com, qemu-devel@nongnu.org Date: Mon, 18 Jun 2012 11:35:35 +1000 Message-Id: <54bd7599198754771c6dc3f658f4cab74ede93b2.1339982763.git.peter.crosthwaite@petalogix.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQmRJ6XKeogJN6iiaHMxxvPtED+Hxks6FP/b42eOVTEG0T3EgYI15DIaw9aeN8zr6HfcHKtg X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.45 Cc: peter.crosthwaite@petalogix.com, peter.maydell@linaro.org, john.williams@petalogix.com Subject: [Qemu-devel] [PATCH v2 1/2] arm_boot: Assume Linux boot flow when -dtb given X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org If the user boots with a -dtb assume the Linux boot flow, even when handling an elf. Signed-off-by: Peter A. G. Crosthwaite --- hw/arm_boot.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/arm_boot.c b/hw/arm_boot.c index 7447f5c..f0fa23c 100644 --- a/hw/arm_boot.c +++ b/hw/arm_boot.c @@ -360,6 +360,11 @@ void arm_load_kernel(CPUARMState *env, struct arm_boot_info *info) exit(1); } info->entry = entry; + + if (info->dtb_filename) { + is_linux = 1; + } + if (is_linux) { if (info->initrd_filename) { initrd_size = load_image_targphys(info->initrd_filename,