There is no reason why we should call this 8250-dw. Signed-off-by: Ralf Ramsauer <[email protected]> --- ci/jailhouse-config-banana-pi.h | 2 +- hypervisor/arch/arm/Kbuild | 2 +- hypervisor/arch/arm/include/asm/{uart-8250-dw.h => uart-8250.h} | 0 hypervisor/arch/arm/{uart-8250-dw.c => uart-8250.c} | 2 +- inmates/lib/arm/Makefile | 2 +- inmates/lib/arm/{uart-8250-dw.c => uart-8250.c} | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename hypervisor/arch/arm/include/asm/{uart-8250-dw.h => uart-8250.h} (100%) rename hypervisor/arch/arm/{uart-8250-dw.c => uart-8250.c} (94%) rename inmates/lib/arm/{uart-8250-dw.c => uart-8250.c} (95%)
diff --git a/ci/jailhouse-config-banana-pi.h b/ci/jailhouse-config-banana-pi.h index 2e52d2ae7950..40bba35354f2 100644 --- a/ci/jailhouse-config-banana-pi.h +++ b/ci/jailhouse-config-banana-pi.h @@ -1,3 +1,3 @@ #define CONFIG_ARM_GIC_V2 1 #define CONFIG_MACH_SUN7I 1 -#define CONFIG_SERIAL_8250_DW 1 +#define CONFIG_SERIAL_8250 1 diff --git a/hypervisor/arch/arm/Kbuild b/hypervisor/arch/arm/Kbuild index bbdfef39b6be..40dd89db71a1 100644 --- a/hypervisor/arch/arm/Kbuild +++ b/hypervisor/arch/arm/Kbuild @@ -21,6 +21,6 @@ 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_DW) += uart-8250-dw.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/hypervisor/arch/arm/include/asm/uart-8250-dw.h b/hypervisor/arch/arm/include/asm/uart-8250.h similarity index 100% rename from hypervisor/arch/arm/include/asm/uart-8250-dw.h rename to hypervisor/arch/arm/include/asm/uart-8250.h diff --git a/hypervisor/arch/arm/uart-8250-dw.c b/hypervisor/arch/arm/uart-8250.c similarity index 94% rename from hypervisor/arch/arm/uart-8250-dw.c rename to hypervisor/arch/arm/uart-8250.c index 3f07d700b6db..63801106737c 100644 --- a/hypervisor/arch/arm/uart-8250-dw.c +++ b/hypervisor/arch/arm/uart-8250.c @@ -12,7 +12,7 @@ * the COPYING file in the top-level directory. */ -#include <asm/uart-8250-dw.h> +#include <asm/uart-8250.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/inmates/lib/arm/Makefile b/inmates/lib/arm/Makefile index b682492d4a21..8fce89d211ec 100644 --- a/inmates/lib/arm/Makefile +++ b/inmates/lib/arm/Makefile @@ -21,5 +21,5 @@ lib-y += ../string.o ../cmdline.o lib-$(CONFIG_ARM_GIC_V2) += gic-v2.o lib-$(CONFIG_ARM_GIC_V3) += gic-v3.o lib-$(CONFIG_SERIAL_AMBA_PL011) += uart-pl011.o -lib-$(CONFIG_SERIAL_8250_DW) += uart-8250-dw.o +lib-$(CONFIG_SERIAL_8250) += uart-8250.o lib-$(CONFIG_SERIAL_TEGRA) += uart-tegra.o diff --git a/inmates/lib/arm/uart-8250-dw.c b/inmates/lib/arm/uart-8250.c similarity index 95% rename from inmates/lib/arm/uart-8250-dw.c rename to inmates/lib/arm/uart-8250.c index 5df2de2ef0d5..29b9c2216336 100644 --- a/inmates/lib/arm/uart-8250-dw.c +++ b/inmates/lib/arm/uart-8250.c @@ -11,7 +11,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-8250-dw.h> +#include <asm/uart-8250.h> #include <mach/uart.h> void uart_chip_init(struct uart_chip *chip) -- 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.
