summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-10-10 00:47:27 +0300
committerTom Rini <trini@konsulko.com>2021-10-10 00:47:27 +0300
commitf331497d3ad4166f9826e7674793ae04094b29c1 (patch)
tree09c8df48a0b48eee7780e7594ddc33fc2c8f59d4 /common
parent2a2d8e94ddc75c2c8d456e9163aa5dac510badcf (diff)
parent79c05335a9c101f0b54f2f378d0b08c9b765e1a3 (diff)
downloadu-boot-f331497d3ad4166f9826e7674793ae04094b29c1.tar.xz
Merge tag 'video-20211009' of https://source.denx.de/u-boot/custodians/u-boot-video
- add 30bpp support (EFI, simplefb, vidconsole) - fix video console name in CONSOLE_MUX Kconfig help - move mxsfb driver config option to Kconfig - remove unused mx3fb driver # gpg verification failed.
Diffstat (limited to 'common')
-rw-r--r--common/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/Kconfig b/common/Kconfig
index 0543b839d1..d6f77ab7b9 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -182,8 +182,8 @@ config SYS_CONSOLE_IS_IN_ENV
default y if CONSOLE_MUX
help
This allows multiple input/output devices to be set at boot time.
- For example, if stdout is set to "serial,video" then output will
- be sent to both the serial and video devices on boot. The
+ For example, if stdout is set to "serial,vidconsole" then output
+ will be sent to both the serial and video devices on boot. The
environment variables can be updated after boot to change the
input/output devices.