Previous changes enable an architecture independent use of the uart interface and the 8250 uart driver in particular.
Signed-off-by: Ralf Ramsauer <[email protected]> --- hypervisor/Makefile | 1 + hypervisor/arch/arm-common/Kbuild | 2 +- hypervisor/arch/arm-common/include/asm/uart.h | 2 +- hypervisor/include/jailhouse/uart.h | 2 ++ hypervisor/{arch/arm-common => }/uart-8250.c | 0 5 files changed, 5 insertions(+), 2 deletions(-) rename hypervisor/{arch/arm-common => }/uart-8250.c (100%) diff --git a/hypervisor/Makefile b/hypervisor/Makefile index 51399915..f08e92d5 100644 --- a/hypervisor/Makefile +++ b/hypervisor/Makefile @@ -31,6 +31,7 @@ KBUILD_CFLAGS += -include $(obj)/include/jailhouse/config.h endif CORE_OBJECTS = setup.o printk.o paging.o control.o lib.o mmio.o pci.o ivshmem.o +CORE_OBJECTS += uart-8250.o define filechk_config_mk ( \ diff --git a/hypervisor/arch/arm-common/Kbuild b/hypervisor/arch/arm-common/Kbuild index f2f4ffe4..7188a999 100644 --- a/hypervisor/arch/arm-common/Kbuild +++ b/hypervisor/arch/arm-common/Kbuild @@ -13,7 +13,7 @@ include $(CONFIG_MK) OBJS-y += dbg-write.o lib.o psci.o control.o paging.o mmu_cell.o -OBJS-y += irqchip.o pci.o ivshmem.o uart-pl011.o uart-8250.o uart-xuartps.o +OBJS-y += irqchip.o pci.o ivshmem.o uart-pl011.o uart-xuartps.o OBJS-$(CONFIG_ARM_GIC_V2) += gic-v2.o COMMON_OBJECTS = $(addprefix ../arm-common/,$(OBJS-y)) diff --git a/hypervisor/arch/arm-common/include/asm/uart.h b/hypervisor/arch/arm-common/include/asm/uart.h index f3b05308..274b4a54 100644 --- a/hypervisor/arch/arm-common/include/asm/uart.h +++ b/hypervisor/arch/arm-common/include/asm/uart.h @@ -15,7 +15,7 @@ #ifndef __ASSEMBLY__ -extern struct uart_chip uart_8250_ops, uart_pl011_ops, uart_xuartps_ops; +extern struct uart_chip uart_pl011_ops, uart_xuartps_ops; #endif /* !__ASSEMBLY__ */ #endif /* !JAILHOUSE_ASM_UART_H_ */ diff --git a/hypervisor/include/jailhouse/uart.h b/hypervisor/include/jailhouse/uart.h index 2d8fffa1..7ae225f7 100644 --- a/hypervisor/include/jailhouse/uart.h +++ b/hypervisor/include/jailhouse/uart.h @@ -26,3 +26,5 @@ struct uart_chip { bool (*is_busy)(struct uart_chip *chip); void (*write_character)(struct uart_chip *chip, char c); }; + +extern struct uart_chip uart_8250_ops; diff --git a/hypervisor/arch/arm-common/uart-8250.c b/hypervisor/uart-8250.c similarity index 100% rename from hypervisor/arch/arm-common/uart-8250.c rename to hypervisor/uart-8250.c -- 2.11.1 -- 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.
