~funderscore blog cgit wiki get in touch
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2023-08-29 10:06:08 -0400
committerTom Rini <trini@konsulko.com>2023-08-29 10:06:08 -0400
commit0fe0395922d859730eb7ddfcff6ed8d3ac4b2937 (patch)
tree0249ca6a72069c709655a636fff70a931e5aa355 /boot/Kconfig
parent6a1d3f64c201ed3f6df819cfcf08154b6ec1c02e (diff)
parentc91feda87ce33c81acc51cc4bf69d613c4fe89de (diff)
downloadu-boot-kii-pro-master.tar.gz
Merge branch '2023-08-28-assorted-important-fixes'HEADmaster
- A few platform-specific config/dts updates to fix issues, drop a temporary change in binman, update the MAINTAINERS file to remove Wolfgang Denk, fix a typo, fix a corner case with bootstd, update Azure to not timeout so easily, and fix a case where we would omit some files in SPL.
Diffstat (limited to 'boot/Kconfig')
-rw-r--r--boot/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/boot/Kconfig b/boot/Kconfig
index e8fb03b801..86c2787dc5 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -1439,7 +1439,7 @@ config AUTOBOOT_MENU_SHOW
This enables the boot menu, controlled by environment variables
defined by the board. The menu starts after running the 'preboot'
environmnent variable (if enabled) and before handling the boot delay.
- See README.bootmenu for more details.
+ See doc/usage/cmd/bootmenu.rst for more details.
config BOOTMENU_DISABLE_UBOOT_CONSOLE
bool "Disallow bootmenu to enter the U-Boot console"