From patchwork Thu Dec 15 12:27:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 9476003 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 21ECB60825 for ; Thu, 15 Dec 2016 12:29:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E15F28764 for ; Thu, 15 Dec 2016 12:29:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 02C8328766; Thu, 15 Dec 2016 12:29:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 898B928764 for ; Thu, 15 Dec 2016 12:29:00 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cHV7S-0005qM-Uk; Thu, 15 Dec 2016 12:26:42 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cHV7R-0005nu-05 for xen-devel@lists.xenproject.org; Thu, 15 Dec 2016 12:26:41 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id 40/7E-25093-00C82585; Thu, 15 Dec 2016 12:26:40 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRWlGSWpSXmKPExsVysyfVTZehJyj C4NImEYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNePvindMBZs5Kr7/3MbSwHiAvYuRi0NIYDOj xOYf2xkhnOWMEkf7J7J1MXJysAnoSuy4+ZoZxBYRUJfo2fWFBaSIWeA8k8TaHUdYuxg5OIQFL CReLokBqWERUJVo3jEbrJdXwFriXRPIUE4OCQE5iYbz95lByjkFbCSOTwoECQsBlbR9vcE6gZ F7ASPDKkaN4tSistQiXSNDvaSizPSMktzEzBxdQwMzvdzU4uLE9NScxKRiveT83E2MQP8yAME Oxj/LAg4xSnIwKYnyXmwMihDiS8pPqcxILM6ILyrNSS0+xKjBwSGwee3qC4xSLHn5ealKErw8 3UB1gkWp6akVaZk5wACEKZXg4FES4VUBSfMWFyTmFmemQ6ROMSpKifPu7wJKCIAkMkrz4NpgQ X+JUVZKmJcR6CghnoLUotzMElT5V4ziHIxKwryzQabwZOaVwE1/BbSYCWix6BJ/kMUliQgpqQ bGbe1Tkzunxh5p7Dgff3DaH4VynRPTza2/xR68tOrSRp4v/K8EPq2rDVuSw3Hi/6VqryUx99w fR9xuO2V7V/Ze7t7LWvd2lyXHF/zL/C1yVXGnm43rdF22k0p3lXi8DIQStK8yRDn/+OHOa8I5 4URE3XP1/klPVwdnim8oK3wkesWw5+cCS6vrSizFGYmGWsxFxYkAWw6Yi3UCAAA= X-Env-Sender: andre.przywara@arm.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1481804799!67252124!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 48717 invoked from network); 15 Dec 2016 12:26:40 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-8.tower-27.messagelabs.com with SMTP; 15 Dec 2016 12:26:40 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 966F515B2; Thu, 15 Dec 2016 04:26:39 -0800 (PST) Received: from e104803-lin.lan (unknown [10.1.207.46]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0BB5A3F3D6; Thu, 15 Dec 2016 04:26:37 -0800 (PST) From: Andre Przywara To: Mark Rutland Date: Thu, 15 Dec 2016 12:27:17 +0000 Message-Id: <20161215122718.21422-5-andre.przywara@arm.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20161215122718.21422-1-andre.przywara@arm.com> References: <20161215122718.21422-1-andre.przywara@arm.com> Cc: Stefano Stabellini , Catalin Marinas , Julien Grall , linux-arm-kernel@lists.infradead.org, Ian Campbell , xen-devel@lists.xenproject.org, Christoffer Dall Subject: [Xen-devel] [PATCH v3 4/5] Xen: Select correct dom0 console X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Ian Campbell If Xen is enabled, tell Dom0 to use the 'hvc0' console, and fall back to the usual ttyAMA0 otherwise. Signed-off-by: Ian Campbell Signed-off-by: Christoffer Dall Signed-off-by: Andre Przywara Reviewed-by: Julien Grall Tested-by: Konrad Rzeszutek Wilk --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ea02dca..d23cced 100644 --- a/configure.ac +++ b/configure.ac @@ -105,7 +105,8 @@ AC_ARG_WITH([initrd], AC_SUBST([FILESYSTEM], [$USE_INITRD]) AM_CONDITIONAL([INITRD], [test "x$USE_INITRD" != "x"]) -C_CMDLINE="console=ttyAMA0 earlyprintk=pl011,0x1c090000" +AS_IF([test "x$X_IMAGE" = "x"],[C_CONSOLE="ttyAMA0"],[C_CONSOLE="hvc0"]) +C_CMDLINE="console=$C_CONSOLE earlyprintk=pl011,0x1c090000" AC_ARG_WITH([cmdline], AS_HELP_STRING([--with-cmdline], [set a command line for the kernel]), [C_CMDLINE=$withval])