diff options
| author | Tom Rini <trini@konsulko.com> | 2022-04-08 08:27:50 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-04-08 08:27:50 -0400 |
| commit | 03a8a797e5dccaffe172d3b5224bc3c3fcd304d6 (patch) | |
| tree | 86204244c902ae70775c787d23427da8961f77d1 /common | |
| parent | 545eceb52062cdc995c45b9581174b7ae66b0e6f (diff) | |
| parent | 6910dbe3413e684bff9a194945df60345ecbc623 (diff) | |
Merge branch '2022-04-08-env-updates'
- Assorted env tooling updates
- Bug fix around multiple possible env locations and ENV_IS_NOWHERE
- Add 'indirect' sub-command to env
- Allow for FAT env to have the location overridden by the board code.
Diffstat (limited to 'common')
| -rw-r--r-- | common/autoboot.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/common/autoboot.c b/common/autoboot.c index b8861d56218..63f2587941d 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); |