brain-hackers_pepepper-mirror
/
u-boot-brain
mirror of https://github.com/brain-hackers/u-boot-brain
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "serial: serial_xen: add DEBUG_UART support" 

This reverts commit 82e21b391b.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2020-10-23 09:15:55 -04:00
parent 18261b8552
commit 467591b8d2
2 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/serial/Kconfig
View File

@ -401,19 +401,11 @@ config DEBUG_UART_MTK
driver will be available until the real driver model serial is
running.
config DEBUG_UART_XEN
bool "XEN Hypervisor Console"
depends on XEN_SERIAL
help
Select this to enable a debug UART using the serial_xen driver. You
will not have to provide any parameters to make this work. The driver
will be available until the real driver-model serial is running.
endchoice
config DEBUG_UART_BASE
hex "Base address of UART"
depends on DEBUG_UART && !DEBUG_UART_XEN
depends on DEBUG_UART
default 0 if DEBUG_UART_SANDBOX
help
This is the base address of your UART for memory-mapped UARTs.
@ -423,7 +415,7 @@ config DEBUG_UART_BASE
config DEBUG_UART_CLOCK
int "UART input clock"
depends on DEBUG_UART && !DEBUG_UART_XEN
depends on DEBUG_UART
default 0 if DEBUG_UART_SANDBOX
help
The UART input clock determines the speed of the internal UART
@ -435,7 +427,7 @@ config DEBUG_UART_CLOCK
config DEBUG_UART_SHIFT
int "UART register shift"
depends on DEBUG_UART && !DEBUG_UART_XEN
depends on DEBUG_UART
default 0 if DEBUG_UART
help
Some UARTs (notably ns16550) support different register layouts

20
drivers/serial/serial_xen.c
View File

@ -5,7 +5,6 @@
*/
#include <common.h>
#include <cpu_func.h>
#include <debug_uart.h>
#include <dm.h>
#include <serial.h>
#include <watchdog.h>
@ -16,14 +15,11 @@
#include <xen/events.h>
#include <xen/interface/sched.h>
#include <xen/interface/xen.h>
#include <xen/interface/hvm/hvm_op.h>
#include <xen/interface/hvm/params.h>
#include <xen/interface/io/console.h>
#include <xen/interface/io/ring.h>
#include <asm/xen/hypercall.h>
DECLARE_GLOBAL_DATA_PTR;
u32 console_evtchn;
@ -182,19 +178,3 @@ U_BOOT_DRIVER(serial_xen) = {
.flags = DM_FLAG_PRE_RELOC,
};
#if defined(CONFIG_DEBUG_UART_XEN)
static inline void _debug_uart_init(void) {}
static inline void _debug_uart_putc(int c)
{
#if CONFIG_IS_ENABLED(ARM)
xen_debug_putc(c);
#else
/* the type cast should work on LE only */
HYPERVISOR_console_io(CONSOLEIO_write, 1, (char *)&ch);
#endif
}
DEBUG_UART_FUNCS
#endif