On 2016-10-21 23:36, [email protected] wrote: > From: Andreas Kölbl <[email protected]> > > Signed-off-by: Andreas Kölbl <[email protected]> > --- > hypervisor/arch/arm-common/{dbg-write-pl011.c => uart-pl011.c} | 2 +- > hypervisor/arch/arm/Makefile | 2 +- > hypervisor/arch/arm/include/asm/{uart_pl011.h => uart-pl011.h} | 0 > inmates/lib/arm/uart-pl011.c | 2 +- > 4 files changed, 3 insertions(+), 3 deletions(-) > rename hypervisor/arch/arm-common/{dbg-write-pl011.c => uart-pl011.c} (94%) > rename hypervisor/arch/arm/include/asm/{uart_pl011.h => uart-pl011.h} (100%) > > diff --git a/hypervisor/arch/arm-common/dbg-write-pl011.c > b/hypervisor/arch/arm-common/uart-pl011.c > similarity index 94% > rename from hypervisor/arch/arm-common/dbg-write-pl011.c > rename to hypervisor/arch/arm-common/uart-pl011.c > index b682f30..6fc9495 100644 > --- a/hypervisor/arch/arm-common/dbg-write-pl011.c > +++ b/hypervisor/arch/arm-common/uart-pl011.c > @@ -10,7 +10,7 @@ > * the COPYING file in the top-level directory. > */ > > -#include <asm/uart_pl011.h> > +#include <asm/uart-pl011.h> > > /* All the helpers are in the header, to make them re-usable by the inmates > */ > void uart_chip_init(struct uart_chip *chip) > diff --git a/hypervisor/arch/arm/Makefile b/hypervisor/arch/arm/Makefile > index 786f96b..87805cd 100644 > --- a/hypervisor/arch/arm/Makefile > +++ b/hypervisor/arch/arm/Makefile > @@ -26,7 +26,7 @@ obj-y += $(COMMON)/irqchip.o $(COMMON)/gic-common.o > obj-y += $(COMMON)/control.o > obj-$(CONFIG_ARM_GIC_V2) += $(COMMON)/gic-v2.o > obj-$(CONFIG_ARM_GIC_V3) += gic-v3.o > -obj-$(CONFIG_SERIAL_AMBA_PL011) += $(COMMON)/dbg-write-pl011.o > +obj-$(CONFIG_SERIAL_AMBA_PL011) += $(COMMON)/uart-pl011.o > obj-$(CONFIG_SERIAL_8250_DW) += uart-8250-dw.o > obj-$(CONFIG_SERIAL_TEGRA) += uart-tegra.o > obj-$(CONFIG_MACH_VEXPRESS) += smp-vexpress.o > diff --git a/hypervisor/arch/arm/include/asm/uart_pl011.h > b/hypervisor/arch/arm/include/asm/uart-pl011.h > similarity index 100% > rename from hypervisor/arch/arm/include/asm/uart_pl011.h > rename to hypervisor/arch/arm/include/asm/uart-pl011.h > diff --git a/inmates/lib/arm/uart-pl011.c b/inmates/lib/arm/uart-pl011.c > index 29e1975..98fcc09 100644 > --- a/inmates/lib/arm/uart-pl011.c > +++ b/inmates/lib/arm/uart-pl011.c > @@ -9,7 +9,7 @@ > * This work is licensed under the terms of the GNU GPL, version 2. See > * the COPYING file in the top-level directory. > */ > -#include <asm/uart_pl011.h> > +#include <asm/uart-pl011.h> > #include <mach/uart.h> > > void uart_chip_init(struct uart_chip *chip) >
Broke ARM64 - fixed in next already. Jan -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
