leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

serial: sandbox: Allow serial output without device tree

Browse Source 
At present sandbox assumes that device-tree control is active, but this
may not be the case in SPL or TPL. Add some conditions to handle this.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2018-10-01 11:55:16 -06:00
parent ee4417644c
commit 114b60a7e6
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/serial/sandbox.c
View File

@@ -22,6 +22,8 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#if CONFIG_IS_ENABLED(OF_CONTROL)
/* /*
* *
* serial_buf: A buffer that holds keyboard characters for the * serial_buf: A buffer that holds keyboard characters for the
@@ -142,6 +144,7 @@ static int sandbox_serial_getc(struct udevice *dev)
serial_buf_read = increment_buffer_index(serial_buf_read); serial_buf_read = increment_buffer_index(serial_buf_read);
return result; return result;
} }
#endif /* CONFIG_IS_ENABLED(OF_CONTROL) */
#ifdef CONFIG_DEBUG_UART_SANDBOX #ifdef CONFIG_DEBUG_UART_SANDBOX
@@ -173,6 +176,7 @@ static int sandbox_serial_setconfig(struct udevice *dev, uint serial_config)
return 0; return 0;
} }
#if CONFIG_IS_ENABLED(OF_CONTROL)
static const char * const ansi_colour[] = { static const char * const ansi_colour[] = {
"black", "red", "green", "yellow", "blue", "megenta", "cyan", "black", "red", "green", "yellow", "blue", "megenta", "cyan",
"white", "white",
@@ -232,3 +236,4 @@ U_BOOT_DEVICE(serial_sandbox_non_fdt) = {
.name = "serial_sandbox", .name = "serial_sandbox",
.platdata = &platdata_non_fdt, .platdata = &platdata_non_fdt,
}; };
#endif /* CONFIG_IS_ENABLED(OF_CONTROL) */