diff options
| author | Simon Glass <sjg@chromium.org> | 2020-11-08 20:36:48 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2020-12-13 07:58:17 -0700 |
| commit | c5ea0167bed3e0fbd0cbee466ede3c70cf345a54 (patch) | |
| tree | b5c1ed4156abb35bfaf7601b5b0ef6a37d3e0ae6 | |
| parent | 9b3303822df97c5cc8e2df99e75d7a55246399ed (diff) | |
| download | u-boot-c5ea0167bed3e0fbd0cbee466ede3c70cf345a54.tar.gz | |
serial: sandbox: Drop unnecessary #ifdefs
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>
| -rw-r--r-- | drivers/serial/sandbox.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c index db2fbac629..e3967deaaf 100644 --- a/drivers/serial/sandbox.c +++ b/drivers/serial/sandbox.c @@ -22,8 +22,6 @@ DECLARE_GLOBAL_DATA_PTR; -#if CONFIG_IS_ENABLED(OF_CONTROL) - /* * * 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; os_usleep(100); -#ifndef CONFIG_SPL_BUILD - video_sync_all(); -#endif + if (!IS_ENABLED(CONFIG_SPL_BUILD)) + video_sync_all(); if (next_index == serial_buf_read) 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); return result; } -#endif /* CONFIG_IS_ENABLED(OF_CONTROL) */ #ifdef CONFIG_DEBUG_UART_SANDBOX @@ -211,7 +207,6 @@ static int sandbox_serial_getinfo(struct udevice *dev, return 0; } -#if CONFIG_IS_ENABLED(OF_CONTROL) static const char * const ansi_colour[] = { "black", "red", "green", "yellow", "blue", "megenta", "cyan", "white", @@ -277,5 +272,3 @@ U_BOOT_DEVICE(serial_sandbox_non_fdt) = { .platdata = &platdata_non_fdt, }; #endif - -#endif /* CONFIG_IS_ENABLED(OF_CONTROL) */ |