diff options
| author | Alex Kiernan <alex.kiernan@gmail.com> | 2018-07-05 15:38:15 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-07-20 22:37:44 +0300 |
| commit | 57aa4d20663244f6aa6085c9b7cfbfd7d26b3906 (patch) | |
| tree | 325b66eb5f6e2e67feb7f90f8a92c86c88918d60 /include/env_default.h | |
| parent | f8c173b6a0b7695089d5ec48cb5b320863c91fdf (diff) | |
| download | u-boot-57aa4d20663244f6aa6085c9b7cfbfd7d26b3906.tar.xz | |
env: Include bootdelay in environment if negative
The test for (CONFIG_BOOTDELAY >= 0) has been in U-Boot since the
beginning, but the meaning of it has changed over time. Allow the
default to be set for any value, including -ve ones. This allows
(for example) CONFIG_ENV_IS_NOWHERE to have values for bootdelay in
its compiled in environment.
The only thing this changes is where the default for bootdelay can be
fetched from; before this change you get a compiled in default, after
you'll pull it from the default value in the environment, but both values
will be the same. Also if there's a value set in the environment then
that will take precedence (as before).
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Diffstat (limited to 'include/env_default.h')
| -rw-r--r-- | include/env_default.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/env_default.h b/include/env_default.h index 54d8124793..bd600cfa44 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -40,7 +40,7 @@ const uchar default_environment[] = { #ifdef CONFIG_NFSBOOTCOMMAND "nfsboot=" CONFIG_NFSBOOTCOMMAND "\0" #endif -#if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0) +#if defined(CONFIG_BOOTDELAY) "bootdelay=" __stringify(CONFIG_BOOTDELAY) "\0" #endif #if defined(CONFIG_BAUDRATE) && (CONFIG_BAUDRATE >= 0) |