diff options
author | Tom Rini <trini@konsulko.com> | 2020-06-18 10:07:49 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-06-18 10:07:49 -0400 |
commit | 83fdb4388253240138e2ce364abe6b070b756d87 (patch) | |
tree | 93767bc8b7fcbbb7f5668f7cb241a5eada644a9d /board/nokia/rx51/rx51.c | |
parent | 7a81989b7b04bd87d1e684f2bafdc92a9c16fecc (diff) | |
parent | c0a8d6e1e67cc7feee5c9e6c7e8c13bb953734f1 (diff) | |
download | u-boot-83fdb4388253240138e2ce364abe6b070b756d87.zip u-boot-83fdb4388253240138e2ce364abe6b070b756d87.tar.gz u-boot-83fdb4388253240138e2ce364abe6b070b756d87.tar.bz2 |
Merge tag 'ti-v2020.10-next' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti into next
- DM conversion for OMAP4, OMAP5 platforms.
- Other minor fixes for Nokia RX51, am33, am57, am654.
Diffstat (limited to 'board/nokia/rx51/rx51.c')
-rw-r--r-- | board/nokia/rx51/rx51.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c index 60a2e36..93d1b2f 100644 --- a/board/nokia/rx51/rx51.c +++ b/board/nokia/rx51/rx51.c @@ -146,7 +146,7 @@ static void reuse_omap_atags(struct tag_omap *t) } break; case OMAP_TAG_UART: - if (!t->u.uart.enabled_uarts) + if (t->u.uart.enabled_uarts) serial_was_console_enabled = 1; break; case OMAP_TAG_SERIAL_CONSOLE: |