From: Simon Glass <sjg@chromium.org>
Date: Sun, 21 Jul 2019 02:51:11 +0000 (-0600)
Subject: main: Use conditional run_preboot_environment_command()
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=e9f6a374659026322623d8b59bc9622dd6f3138e;p=u-boot.git

main: Use conditional run_preboot_environment_command()

The function name indicates that it does something, but its entire
operation is actually condition on a CONFIG. Move the condition outside
the function so this is clearer, and use if() instead of #ifdef, like the
reset of the file.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/common/main.c b/common/main.c
index 07b34bf2b0..ce39c8d189 100644
--- a/common/main.c
+++ b/common/main.c
@@ -19,7 +19,6 @@ __weak void show_boot_progress(int val) {}
 
 static void run_preboot_environment_command(void)
 {
-#ifdef CONFIG_PREBOOT
 	char *p;
 
 	p = env_get("preboot");
@@ -34,7 +33,6 @@ static void run_preboot_environment_command(void)
 		if (IS_ENABLED(CONFIG_AUTOBOOT_KEYED))
 			disable_ctrlc(prev);	/* restore Ctrl-C checking */
 	}
-#endif /* CONFIG_PREBOOT */
 }
 
 /* We come here after U-Boot is initialised and ready to process commands */
@@ -49,7 +47,8 @@ void main_loop(void)
 
 	cli_init();
 
-	run_preboot_environment_command();
+	if (IS_ENABLED(CONFIG_USE_PREBOOT))
+		run_preboot_environment_command();
 
 	if (IS_ENABLED(CONFIG_UPDATE_TFTP))
 		update_tftp(0UL, NULL, NULL);