There is no reason why we should differentiate between ARM and ARM64 UART drivers.
Jetson TX1 comes with 8250 and is a ARM64, we will need that in future in any case. Signed-off-by: Ralf Ramsauer <[email protected]> --- hypervisor/arch/arm-common/Kbuild | 1 + hypervisor/arch/{arm => arm-common}/include/asm/uart-8250.h | 0 hypervisor/arch/{arm => arm-common}/uart-8250.c | 0 hypervisor/arch/arm/Kbuild | 1 - inmates/lib/arm64/Makefile | 1 + 5 files changed, 2 insertions(+), 1 deletion(-) rename hypervisor/arch/{arm => arm-common}/include/asm/uart-8250.h (100%) rename hypervisor/arch/{arm => arm-common}/uart-8250.c (100%) diff --git a/hypervisor/arch/arm-common/Kbuild b/hypervisor/arch/arm-common/Kbuild index 42c3a9d9cbfd..bf23f57d3efb 100644 --- a/hypervisor/arch/arm-common/Kbuild +++ b/hypervisor/arch/arm-common/Kbuild @@ -15,6 +15,7 @@ include $(CONFIG_MK) OBJS-y += dbg-write.o lib.o psci.o control.o paging.o mmu_cell.o OBJS-y += irqchip.o gic-common.o OBJS-$(CONFIG_ARM_GIC_V2) += gic-v2.o +OBJS-$(CONFIG_SERIAL_8250) += uart-8250.o OBJS-$(CONFIG_SERIAL_AMBA_PL011) += uart-pl011.o COMMON_OBJECTS = $(addprefix ../arm-common/,$(OBJS-y)) diff --git a/hypervisor/arch/arm/include/asm/uart-8250.h b/hypervisor/arch/arm-common/include/asm/uart-8250.h similarity index 100% rename from hypervisor/arch/arm/include/asm/uart-8250.h rename to hypervisor/arch/arm-common/include/asm/uart-8250.h diff --git a/hypervisor/arch/arm/uart-8250.c b/hypervisor/arch/arm-common/uart-8250.c similarity index 100% rename from hypervisor/arch/arm/uart-8250.c rename to hypervisor/arch/arm-common/uart-8250.c diff --git a/hypervisor/arch/arm/Kbuild b/hypervisor/arch/arm/Kbuild index 40dd89db71a1..e18fb04c4df7 100644 --- a/hypervisor/arch/arm/Kbuild +++ b/hypervisor/arch/arm/Kbuild @@ -21,6 +21,5 @@ obj-y += entry.o exception.o setup.o control.o traps.o mmio.o obj-y += mmu_hyp.o caches.o mach-stubs.o obj-$(CONFIG_ARM_GIC_V3) += gic-v3.o -obj-$(CONFIG_SERIAL_8250) += uart-8250.o obj-$(CONFIG_SERIAL_TEGRA) += uart-tegra.o obj-$(CONFIG_MACH_VEXPRESS) += mach-vexpress.o diff --git a/inmates/lib/arm64/Makefile b/inmates/lib/arm64/Makefile index b4f2bc868f47..89c6cc949922 100644 --- a/inmates/lib/arm64/Makefile +++ b/inmates/lib/arm64/Makefile @@ -19,3 +19,4 @@ lib-y += ../arm/gic.o ../arm/printk.o ../arm/timer.o lib-y += ../string.o ../cmdline.o lib-$(CONFIG_ARM_GIC_V2) += ../arm/gic-v2.o lib-$(CONFIG_SERIAL_AMBA_PL011) += ../arm/uart-pl011.o +lib-$(CONFIG_SERIAL_8250) += ../arm/uart-8250.o -- 2.10.2 -- 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.
