diff options
| author | Simon Glass <sjg@chromium.org> | 2022-03-11 16:22:38 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-04-07 14:06:12 -0400 |
| commit | b2b26c7e13764144cef58941f4462975a7e02e89 (patch) | |
| tree | 9b143ecd96596c7437cd3d62c1e6c35dfa0d36e5 | |
| parent | 0556b62f4aaf6ca1e36e2f50d54144d001c27e9e (diff) | |
| download | u-boot-b2b26c7e13764144cef58941f4462975a7e02e89.zip u-boot-b2b26c7e13764144cef58941f4462975a7e02e89.tar.gz u-boot-b2b26c7e13764144cef58941f4462975a7e02e89.tar.bz2 | |
env: Move the doc comment to the code
This doesn't really make much sense in the documentation. Add a code
comment instead.
Suggested-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | common/autoboot.c | 5 | ||||
| -rw-r--r-- | doc/usage/environment.rst | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/common/autoboot.c b/common/autoboot.c index b8861d5..63f2587 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -446,6 +446,11 @@ const char *bootdelay_process(void) s = env_get("bootdelay"); bootdelay = s ? (int)simple_strtol(s, NULL, 10) : CONFIG_BOOTDELAY; + /* + * Does it really make sense that the devicetree overrides the user + * setting? It is possibly helpful for security since the device tree + * may be signed whereas the environment is often loaded from storage. + */ if (IS_ENABLED(CONFIG_OF_CONTROL)) bootdelay = ofnode_conf_read_int("bootdelay", bootdelay); diff --git a/doc/usage/environment.rst b/doc/usage/environment.rst index d295cc8..4b228c1 100644 --- a/doc/usage/environment.rst +++ b/doc/usage/environment.rst @@ -120,7 +120,6 @@ bootdelay The default value is defined by CONFIG_BOOTDELAY. The value of 'bootdelay' is overridden by the /config/bootdelay value in the device-tree if CONFIG_OF_CONTROL=y. - Does it really make sense that the devicetree overrides the user setting? bootcmd The command that is run if the user does not enter the shell during the |