diff options
| author | Simon Glass <sjg@chromium.org> | 2019-07-20 20:51:11 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-02 11:17:58 -0400 |
| commit | e9f6a374659026322623d8b59bc9622dd6f3138e (patch) | |
| tree | b565be1c696e4e2417478a46d4f7eab3445519a9 | |
| parent | bbaf56eda0e63d6d28fbccae0f112ef88203eb4d (diff) | |
| download | u-boot-e9f6a374659026322623d8b59bc9622dd6f3138e.tar.gz u-boot-e9f6a374659026322623d8b59bc9622dd6f3138e.tar.bz2 u-boot-e9f6a374659026322623d8b59bc9622dd6f3138e.zip | |
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>
| -rw-r--r-- | common/main.c | 5 |
1 files changed, 2 insertions, 3 deletions
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); |