From patchwork Mon Jun 20 15:09:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 9187759 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 7018C6075E for ; Mon, 20 Jun 2016 15:10:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 600DB2766D for ; Mon, 20 Jun 2016 15:10:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54E3E27A98; Mon, 20 Jun 2016 15:10:58 +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 36BF32766D for ; Mon, 20 Jun 2016 15:10:57 +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 1bF0oy-0003u4-Mv; Mon, 20 Jun 2016 15:09:04 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bF0ox-0003rS-OU for xen-devel@lists.xenproject.org; Mon, 20 Jun 2016 15:09:03 +0000 Received: from [85.158.143.35] by server-1.bemta-6.messagelabs.com id FC/AC-09256-F0708675; Mon, 20 Jun 2016 15:09:03 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHLMWRWlGSWpSXmKPExsVysyfVTZefPSP cYO0CDovvWyYzOTB6HP5whSWAMYo1My8pvyKBNWPt/8yCY+wV/8+dYm1gvMPWxcjFISSwiVHi 69prjBDOCkaJDfc3MHcxcnKwCehK7Lj5GswWEVCX6Nn1hQWkiFngD6PE33ntbCAJYQFTif0/z rOD2CwCqhItX0+C2bwCVhK3m7YygdgSAnISDefvgw3iFLCWmLtzEiOILQRU8+HPIpYJjNwLGB lWMaoXpxaVpRbpGuklFWWmZ5TkJmbm6BoamOnlphYXJ6an5iQmFesl5+duYgT6lwEIdjAu++t 0iFGSg0lJlHf6k/RwIb6k/JTKjMTijPii0pzU4kOMGhwcApvXrr7AKMWSl5+XqiTBm8KWES4k WJSanlqRlpkDDECYUgkOHiUR3h+sQGne4oLE3OLMdIjUKUZdjgU/bq9lEgKbISXOWwAyQwCkK KM0D24ELBouMcpKCfMyAh0oxFOQWpSbWYIq/4pRnINRSZjXFmQKT2ZeCdymV0BHMAEdsaw/He SIkkSElFQDo2GkqMj+M5MKX5/6vJL7jQLPe7EZ/TE1WpI7dG5nyExsNPy18r6QrdtuFcEL9Q9 mNV6e9eyS0IrKWc9ctd9KqhdYxRy9c3zxdk+XfJkLLmx++0qyOBaJNmWKzmt66GwVH3Txvxxn 4XpDE74ZvC7z3066Nil+Q5/1xxt5Zj3Bzs/zswMnzp1brcRSnJFoqMVcVJwIAK5bcN2BAgAA X-Env-Sender: andre.przywara@arm.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1466435342!19804199!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12067 invoked from network); 20 Jun 2016 15:09:02 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-14.tower-21.messagelabs.com with SMTP; 20 Jun 2016 15:09:02 -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 C3CEA95D; Mon, 20 Jun 2016 08:09:46 -0700 (PDT) Received: from e104803-lin.lan (unknown [10.1.203.153]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0F5693F246; Mon, 20 Jun 2016 08:08:59 -0700 (PDT) From: Andre Przywara To: Mark Rutland Date: Mon, 20 Jun 2016 16:09:33 +0100 Message-Id: <20160620150934.1729-4-andre.przywara@arm.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160620150934.1729-1-andre.przywara@arm.com> References: <20160620150934.1729-1-andre.przywara@arm.com> Cc: Jean-Philippe Brucker , Julien Grall , Christoffer Dall , Ian Campbell , xen-devel@lists.xenproject.org, linux-arm-kernel@lists.infradead.org Subject: [Xen-devel] [PATCH 3/4] 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 --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b001939..f381a80 100644 --- a/configure.ac +++ b/configure.ac @@ -89,7 +89,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])