[PATCH 07/19] autoboot: Rework CONFIG_AUTOBOOT_STOP_STR_* usage

Tom Rini
2023-01-10T16:21:41Z

In order to not define a CONFIG value when the
CONFIG_AUTOBOOT_STOP_STR_* functionality is not enabled, rework the
assignment of empty and unused (as the code will be discarded under if
0, in the end) values to be AUTOBOOT_STOP_STR_* instead of
CONFIG_AUTOBOOT_STOP_STR_*.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
common/autoboot.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/common/autoboot.c b/common/autoboot.c
index ea44fdf6add9..95a28b2fd83a 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -40,11 +40,15 @@ DECLARE_GLOBAL_DATA_PTR;
static int stored_bootdelay;
static int menukey;

-#if !defined(CONFIG_AUTOBOOT_STOP_STR_CRYPT)
-#define CONFIG_AUTOBOOT_STOP_STR_CRYPT ""
+#if defined(CONFIG_AUTOBOOT_STOP_STR_CRYPT)
+#define AUTOBOOT_STOP_STR_CRYPT CONFIG_AUTOBOOT_STOP_STR_CRYPT
+#else
+#define AUTOBOOT_STOP_STR_CRYPT ""
#endif
-#if !defined(CONFIG_AUTOBOOT_STOP_STR_SHA256)
-#define CONFIG_AUTOBOOT_STOP_STR_SHA256 ""
+#if defined(CONFIG_AUTOBOOT_STOP_STR_SHA256)
+#define AUTOBOOT_STOP_STR_SHA256 CONFIG_AUTOBOOT_STOP_STR_SHA256
+#else
+#define AUTOBOOT_STOP_STR_SHA256 ""
#endif

#ifdef CONFIG_AUTOBOOT_USE_MENUKEY
@@ -81,7 +85,7 @@ static int passwd_abort_crypt(uint64_t etime)
int err;

if (IS_ENABLED(CONFIG_AUTOBOOT_STOP_STR_ENABLE) && !crypt_env_str)
- crypt_env_str = CONFIG_AUTOBOOT_STOP_STR_CRYPT;
+ crypt_env_str = AUTOBOOT_STOP_STR_CRYPT;

if (!crypt_env_str)
return 0;
@@ -160,7 +164,7 @@ static int passwd_abort_sha256(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;

presskey = malloc_cache_aligned(DELAY_STOP_STR_MAX_LENGTH);
c = strstr(sha_env_str, ":");
--
2.25.1