From: Andreas Koelbl <[email protected]>

Rename uart_pl011.h to uart-pl011.h and dbg-write-pl011.c to uart-pl011.c

Signed-off-by: Andreas Koelbl <[email protected]>
---
 hypervisor/arch/arm/Makefile                                   | 2 +-
 hypervisor/arch/arm/include/asm/{uart_pl011.h => uart-pl011.h} | 6 +++---
 hypervisor/arch/arm/{dbg-write-pl011.c => uart-pl011.c}        | 2 +-
 inmates/lib/arm/uart-pl011.c                                   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename hypervisor/arch/arm/include/asm/{uart_pl011.h => uart-pl011.h} (95%)
 rename hypervisor/arch/arm/{dbg-write-pl011.c => uart-pl011.c} (94%)

diff --git a/hypervisor/arch/arm/Makefile b/hypervisor/arch/arm/Makefile
index 30986b9..ef4624f 100644
--- a/hypervisor/arch/arm/Makefile
+++ b/hypervisor/arch/arm/Makefile
@@ -23,7 +23,7 @@ obj-y += psci.o smp.o
 obj-y += irqchip.o gic-common.o
 obj-$(CONFIG_ARM_GIC_V2) += gic-v2.o
 obj-$(CONFIG_ARM_GIC_V3) += gic-v3.o
-obj-$(CONFIG_SERIAL_AMBA_PL011) += dbg-write-pl011.o
+obj-$(CONFIG_SERIAL_AMBA_PL011) += 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 95%
rename from hypervisor/arch/arm/include/asm/uart_pl011.h
rename to hypervisor/arch/arm/include/asm/uart-pl011.h
index 8548c86..adba555 100644
--- a/hypervisor/arch/arm/include/asm/uart_pl011.h
+++ b/hypervisor/arch/arm/include/asm/uart-pl011.h
@@ -10,8 +10,8 @@
  * the COPYING file in the top-level directory.
  */
 
-#ifndef _JAILHOUSE_ASM_DEBUG_PL011_H
-#define _JAILHOUSE_ASM_DEBUG_PL011_H
+#ifndef _JAILHOUSE_ASM_UART_PL011_H
+#define _JAILHOUSE_ASM_UART_PL011_H
 
 #include <asm/debug.h>
 #include <asm/processor.h>
@@ -111,4 +111,4 @@ static void uart_write(struct uart_chip *chip, char c)
 }
 
 #endif /* !__ASSEMBLY__ */
-#endif /* !_JAILHOUSE_ASM_DEBUG_PL011_H */
+#endif /* !_JAILHOUSE_ASM_UART_PL011_H */
diff --git a/hypervisor/arch/arm/dbg-write-pl011.c 
b/hypervisor/arch/arm/uart-pl011.c
similarity index 94%
rename from hypervisor/arch/arm/dbg-write-pl011.c
rename to hypervisor/arch/arm/uart-pl011.c
index b682f30..6fc9495 100644
--- a/hypervisor/arch/arm/dbg-write-pl011.c
+++ b/hypervisor/arch/arm/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/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)
-- 
2.10.0

-- 
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.

Reply via email to