diff options
| author | Simon Glass <sjg@chromium.org> | 2015-03-06 13:19:03 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-06-10 19:26:55 -0600 |
| commit | af282245462186b8b06047c379ee85f4d0ec7a9c (patch) | |
| tree | 18005092a1d510762d7bd23c10888dba296e85ac /drivers/serial/serial-uclass.c | |
| parent | a59abd10498fed8c2bb5718748ba27310aac4ba2 (diff) | |
| download | u-boot-af282245462186b8b06047c379ee85f4d0ec7a9c.tar.gz | |
sandbox: Move CONFIG_SANDBOX_SERIAL to Kconfig
Move this over to Kconfig and tidy up.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/serial/serial-uclass.c')
| -rw-r--r-- | drivers/serial/serial-uclass.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index 5674d5e538..815fec3264 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -32,7 +32,7 @@ static void serial_find_console_or_panic(void) struct udevice *dev; int node; - if (OF_CONTROL) { + if (OF_CONTROL && gd->fdt_blob) { /* Check for a chosen console */ node = fdtdec_get_chosen_node(gd->fdt_blob, "stdout-path"); if (node < 0) @@ -54,7 +54,8 @@ static void serial_find_console_or_panic(void) return; } } - } else { + } + if (!SPL_BUILD || !OF_CONTROL || !gd->fdt_blob) { /* * Try to use CONFIG_CONS_INDEX if available (it is numbered * from 1!). |