diff options
| author | Tom Rini <trini@konsulko.com> | 2022-01-13 14:33:02 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-01-13 14:33:02 -0500 |
| commit | 25711b07ca1dcf73dc41b45ca040dadbcff0fa08 (patch) | |
| tree | de49c129e19ab9b129aca41d59cd8ecdc3e18de7 /drivers/serial/serial-uclass.c | |
| parent | 743c562d0c5269740236864bdb0002e73ec3e614 (diff) | |
| parent | 6c9e3d1fc085977b5b38dfe610f65d1a7f48081b (diff) | |
Merge tag 'dm-pull-13jan22' of https://source.denx.de/u-boot/custodians/u-boot-dm
bloblist prep for standard passage
switch order of pinctrl and power domain calls
various minor fixes
Diffstat (limited to 'drivers/serial/serial-uclass.c')
| -rw-r--r-- | drivers/serial/serial-uclass.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index 30d44214d7d..96a1cb65ba2 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -104,7 +104,8 @@ static void serial_find_console_or_panic(void) } } } - if (!SPL_BUILD || !CONFIG_IS_ENABLED(OF_CONTROL) || !blob) { + if (!IS_ENABLED(CONFIG_SPL_BUILD) || !CONFIG_IS_ENABLED(OF_CONTROL) || + !blob) { /* * Try to use CONFIG_CONS_INDEX if available (it is numbered * from 1!). |