dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-27 00:24:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

serial: sandbox: Drop unnecessary #ifdefs

Browse Source 
CONFIG_OF_CONTROL is always enabled for sandbox (as it should be for all
boards), so we can drop it. Also use IS_ENABLED() for the SPL check.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2020-11-08 20:36:48 -07:00
parent 9b3303822d
commit c5ea0167be
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/serial/sandbox.c
View File

@@ -22,8 +22,6 @@
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
@@ -122,9 +120,8 @@ static int sandbox_serial_pending(struct udevice *dev, bool input)
return 0; return 0;
os_usleep(100); os_usleep(100);
#ifndef CONFIG_SPL_BUILD if (!IS_ENABLED(CONFIG_SPL_BUILD))
video_sync_all(); video_sync_all();
#endif
if (next_index == serial_buf_read) if (next_index == serial_buf_read)
return 1; /* buffer full */ return 1; /* buffer full */
@@ -146,7 +143,6 @@ 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
@@ -211,7 +207,6 @@ static int sandbox_serial_getinfo(struct udevice *dev,
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",
@@ -277,5 +272,3 @@ U_BOOT_DEVICE(serial_sandbox_non_fdt) = {
.platdata = &platdata_non_fdt, .platdata = &platdata_non_fdt,
}; };
#endif #endif
#endif /* CONFIG_IS_ENABLED(OF_CONTROL) */