[PATCH 1/2] env: Move the doc comment to the code
sjg at chromium.org
Sat Mar 12 00:22:38 CET 2022
This doesn't really make much sense in the documentation. Add a code
Suggested-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
Signed-off-by: Simon Glass <sjg at chromium.org>
common/autoboot.c | 5 +++++
doc/usage/environment.rst | 1 -
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/common/autoboot.c b/common/autoboot.c
index b8861d56218..63f2587941d 100644
@@ -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.
bootdelay = ofnode_conf_read_int("bootdelay", bootdelay);
diff --git a/doc/usage/environment.rst b/doc/usage/environment.rst
index d295cc89878..4b228c1de3c 100644
@@ -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?
The command that is run if the user does not enter the shell during the
More information about the U-Boot