Message ID | 20190205170510.21984-22-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | 5614ca800e05dc07e4045b7738351058538c6079 |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp5429494jaa; Tue, 5 Feb 2019 09:27:44 -0800 (PST) X-Google-Smtp-Source: AHgI3Ia1kstDs8oU79u1crYniDl2hD4pa0qtp/2oDO8H14kt61lps+vQYBVCxB/EPQC+6kl9ZiQe X-Received: by 2002:a25:e4c3:: with SMTP id b186mr5005378ybh.289.1549387664937; Tue, 05 Feb 2019 09:27:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549387664; cv=none; d=google.com; s=arc-20160816; b=n4z6rhj+cmGeNmv1liwH7J+bWDKa6a2haXO9sdATBanQFfugzUYo1Xqhwh6dytBzv1 6wZFfE5WfG2CIpF8viGYEbnpyh46nTYCx6Hvz9KzUQiyViYa/s6272WzU1ZgCxxcdOom o89HMrzUNDBPu/flwiEs1Kh2A53K9OEnQhMdWGNAMLZImxcAp+8/jdNHyqWcml+dqwQN +BdbPYLz4tjbzVEp6YUa05/JY4rt0hoDXwFKe/68pTqZEQxzh4u5uryH+dPLuH6Qr5VQ vqYgQRpzBi29w08IHbyBlGCgrc2lh4WCJ0HOvvIhjjqfWj7dLu+z/QUs/kNnQWJ1JsXA bpgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=OfKY4K9BkMjjwiqunb7cujWZfwYnebUV8ouMZGLQAag=; b=nAjwKCMTlZJvySgSMIdEbFan9NOFtI6W+K13mTB05GVapGknetlvPA2PCQ4xIjvNoi kgc3oVABBXJ2dnt6C4/pzhzsksH2MO1oce16GbnGFt/jvx+HUDQ8j5fbRB2yW0qZXbvH +xFOYgNSgNocYN3JBve4FwQvVwhZUjc59IHyFydQX0peYqQlp/Wc4ouGKS1OwgpE+fzl 6igYE6nhMGVJQilxTnBr399PuU0xF/IBwNKHgQnGf8VT5D94h4TdWPAqJln/OR119Nlj IdgEg/QJ2MRzlm8jCcJ0Cvn4aRSxEtjyUURvVl23TZz3nwl5JGkdEdaiSxY9UdVGlLxV 6cJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=n3Ngm2jt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w19si2400868ywj.193.2019.02.05.09.27.44 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 05 Feb 2019 09:27:44 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=n3Ngm2jt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:35505 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1gr4Vc-0003Fy-Cn for patch@linaro.org; Tue, 05 Feb 2019 12:27:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35918) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1gr4AS-0001uV-M9 for qemu-devel@nongnu.org; Tue, 05 Feb 2019 12:05:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1gr4AR-0000Yx-I2 for qemu-devel@nongnu.org; Tue, 05 Feb 2019 12:05:52 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:35761) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1gr4AR-0000V1-7T for qemu-devel@nongnu.org; Tue, 05 Feb 2019 12:05:51 -0500 Received: by mail-wr1-x443.google.com with SMTP id z18so3712104wrh.2 for <qemu-devel@nongnu.org>; Tue, 05 Feb 2019 09:05:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=OfKY4K9BkMjjwiqunb7cujWZfwYnebUV8ouMZGLQAag=; b=n3Ngm2jtNtXEJPJ/m3Bmrj/n5p+Bzj1S99PEI4PCR4ejg8eIBlDPJcDzRAlzOsygJr T6eUh+yAKw1VoaQCQmBnFL9BxEHI0wK1Ja6I7vL3LE7o2E4mIuITlDMmMST95z2sxOas BbO6PBI0ipjzL1Y1yH/v+0sLjtJ9J7ViDl8/qjGHTlR0bu6MPDcTrJClKxoIESTXEQs+ mHaHdd5wQcwF7ZKcerdfwfvDoC05EF7O9VOnXTZ1jzGO6HkqaEfP3+hDyg9KNFeNXT1m ktFdPlgcoa3+Jin+VOjW/U/3oCR4UhoQSxYK6gaACwV7U5o+ZcnNPBArzAZ3+p+Evs9R rUlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OfKY4K9BkMjjwiqunb7cujWZfwYnebUV8ouMZGLQAag=; b=bDTz7H6JvqUmReWm2KTGwW1dAnEuJz0exMkACKkKXaC3z6qkxTm4rBcsIAXZgBIRRx Uobv0+HOkFCXf93yuPsMzlQA9a11v/5T3FwpzNsr1sv3ub2sds25Pzss9F1a8NuLiZTi 7PlYQgB1F/RpypkvR/kIj7DkKJXOsakdEEQQQ7lyv5ip57kNTZUKi/cleLjxGtNOObbo qQUTOrq8e/Tv8uPeRlU5Nzwfvogqi29vO084xmI7Fr75WtOaUIVxAx5K3Ogo71gFQkEj RMhOQQWqdhDUMDDLBBDZKIG8M6iNnyqa5cx9KmGZ8TQdjVuE8VW7M4ngsfG1tzKf+k+5 YTWA== X-Gm-Message-State: AHQUAuZSO6X6ZrC+s/BIH5ZSAaYGHBGyLbHrDkC40RxuPsanhS8tymgx rRCcvZ3nOU0go2RjZIswZJStLuuSgKIoyw== X-Received: by 2002:a5d:49cd:: with SMTP id t13mr4539111wrs.144.1549386343795; Tue, 05 Feb 2019 09:05:43 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id w13sm5583164wmf.5.2019.02.05.09.05.42 for <qemu-devel@nongnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Feb 2019 09:05:42 -0800 (PST) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Tue, 5 Feb 2019 17:05:09 +0000 Message-Id: <20190205170510.21984-22-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190205170510.21984-1-peter.maydell@linaro.org> References: <20190205170510.21984-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PULL 21/22] hw/arm/boot: Support DTB autoload for firmware-only boots X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 328cc6bd245..496c8c18b08 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -1215,7 +1215,6 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) /* Load the kernel. */ if (!info->kernel_filename || info->firmware_loaded) { arm_setup_firmware_boot(cpu, info); - return; } else { arm_setup_direct_kernel_boot(cpu, info); }