| Message ID | 20160620150934.1729-4-andre.przywara@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Andrew, On 20/06/16 16:09, Andre Przywara wrote: > From: Ian Campbell <ian.campbell@citrix.com> > > 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> Reviewed-by: Julien Grall <julien.grall@arm.com> Regards, > --- > 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]) >
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])