]> xenbits.xensource.com Git - people/julieng/boot-wrapper-aarch64.git/commitdiff
Xen: Select correct dom0 console
authorIan Campbell <ian.campbell@citrix.com>
Mon, 20 Jun 2016 15:09:33 +0000 (16:09 +0100)
committerJulien Grall <julien.grall@arm.com>
Wed, 29 Jun 2016 09:59:56 +0000 (10:59 +0100)
If Xen is enabled, tell Dom0 to use the 'hvc0' console, and fall back to
the usual ttyAMA0 otherwise.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
configure.ac

index b0019399c12649ae75493e39e291123f2ea7b415..f381a8053f947bd9fae1a0d4c7ccda2e23852909 100644 (file)
@@ -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])