From: Ralf Ramsauer <[email protected]> This patch moves the uart-tegra driver from the arm32-specific directory to arm-common/ since such driver is used on both arm32 (e.g. TK1) and arm64 (e.g. TX1) boards.
Signed-off-by: Ralf Ramsauer <[email protected]> Signed-off-by: Claudio Scordino <[email protected]> --- hypervisor/arch/arm-common/Kbuild | 1 + hypervisor/arch/{arm => arm-common}/include/asm/uart-tegra.h | 0 hypervisor/arch/{arm => arm-common}/uart-tegra.c | 0 hypervisor/arch/arm/Kbuild | 2 +- hypervisor/arch/arm64/Kbuild | 1 + 5 files changed, 3 insertions(+), 1 deletion(-) rename hypervisor/arch/{arm => arm-common}/include/asm/uart-tegra.h (100%) rename hypervisor/arch/{arm => arm-common}/uart-tegra.c (100%) diff --git a/hypervisor/arch/arm-common/Kbuild b/hypervisor/arch/arm-common/Kbuild index 42c3a9d..6580a70 100644 --- a/hypervisor/arch/arm-common/Kbuild +++ b/hypervisor/arch/arm-common/Kbuild @@ -16,5 +16,6 @@ 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_AMBA_PL011) += uart-pl011.o +OBJS-$(CONFIG_SERIAL_TEGRA) += uart-tegra.o COMMON_OBJECTS = $(addprefix ../arm-common/,$(OBJS-y)) diff --git a/hypervisor/arch/arm/include/asm/uart-tegra.h b/hypervisor/arch/arm-common/include/asm/uart-tegra.h similarity index 100% rename from hypervisor/arch/arm/include/asm/uart-tegra.h rename to hypervisor/arch/arm-common/include/asm/uart-tegra.h diff --git a/hypervisor/arch/arm/uart-tegra.c b/hypervisor/arch/arm-common/uart-tegra.c similarity index 100% rename from hypervisor/arch/arm/uart-tegra.c rename to hypervisor/arch/arm-common/uart-tegra.c diff --git a/hypervisor/arch/arm/Kbuild b/hypervisor/arch/arm/Kbuild index bbdfef3..5b62838 100644 --- a/hypervisor/arch/arm/Kbuild +++ b/hypervisor/arch/arm/Kbuild @@ -22,5 +22,5 @@ obj-y += mmu_hyp.o caches.o mach-stubs.o obj-$(CONFIG_ARM_GIC_V3) += gic-v3.o obj-$(CONFIG_SERIAL_8250_DW) += uart-8250-dw.o -obj-$(CONFIG_SERIAL_TEGRA) += uart-tegra.o +obj-$(CONFIG_SERIAL_TEGRA) += ../arm-common/uart-tegra.o obj-$(CONFIG_MACH_VEXPRESS) += mach-vexpress.o diff --git a/hypervisor/arch/arm64/Kbuild b/hypervisor/arch/arm64/Kbuild index 91c2a91..e4b8594 100644 --- a/hypervisor/arch/arm64/Kbuild +++ b/hypervisor/arch/arm64/Kbuild @@ -19,3 +19,4 @@ always := built-in.o obj-y := $(COMMON_OBJECTS) obj-y += entry.o setup.o control.o mmio.o caches.o obj-y += exception.o traps.o +obj-$(CONFIG_SERIAL_TEGRA) += ../arm-common/uart-tegra.o -- 2.7.4 -- 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.
