diff options
| author | Simon Glass <sjg@chromium.org> | 2019-07-20 20:51:15 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-02 11:19:14 -0400 |
| commit | 0c4bd318f5c149c260b236a8e5239f661484ad5d (patch) | |
| tree | af048268b96832d30f65aedd9e8b5bd8b2210130 /common | |
| parent | 37304aaf60bf92a5dc3ef222ba520698bd862a44 (diff) | |
| download | u-boot-0c4bd318f5c149c260b236a8e5239f661484ad5d.tar.gz | |
autoboot: Use CONFIG_AUTOBOOT_STOP_STR_SHA256 indirectly
This CONFIG option is only present if CONFIG_AUTOBOOT_ENCRYPTION is
enabled so it cannot be used in code without that #ifdef. But we want to
reduce the use of #ifdef in this file and in particular to avoid having
two different functions both named passwd_abort() but which do different
things.
In preparation for this, create an intermediate value which is set to an
empty string if there is no value for CONFIG_AUTOBOOT_STOP_STR_SHA256.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/autoboot.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/common/autoboot.c b/common/autoboot.c index 94133eaeda..e3086e3828 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -28,6 +28,12 @@ DECLARE_GLOBAL_DATA_PTR; /* Stored value of bootdelay, used by autoboot_command() */ static int stored_bootdelay; +#ifdef CONFIG_AUTOBOOT_ENCRYPTION +#define AUTOBOOT_STOP_STR_SHA256 CONFIG_AUTOBOOT_STOP_STR_SHA256 +#else +#define AUTOBOOT_STOP_STR_SHA256 "" +#endif + #if defined(CONFIG_AUTOBOOT_KEYED) #if defined(CONFIG_AUTOBOOT_STOP_STR_SHA256) @@ -61,7 +67,7 @@ static int passwd_abort(uint64_t etime) int ret; if (sha_env_str == NULL) - sha_env_str = CONFIG_AUTOBOOT_STOP_STR_SHA256; + sha_env_str = AUTOBOOT_STOP_STR_SHA256; /* * Generate the binary value from the environment hash value |