diff options
| author | Simon Glass <sjg@chromium.org> | 2023-12-15 20:14:17 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-12-21 16:07:52 -0500 |
| commit | 31fda96bb62445c0b190cc499184dc497f7f8fdd (patch) | |
| tree | 990949e2506c78a5d21d6ebc6b548e41670d4c1f | |
| parent | 0c96b6817f22b7a3d3e7892d21430a1ce9cc0c83 (diff) | |
bootz: Avoid use of #ifdef
Use the compiler to get the set of states, instead of the preprocessor.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | cmd/bootz.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/cmd/bootz.c b/cmd/bootz.c index a652879ea5e..8c25905598a 100644 --- a/cmd/bootz.c +++ b/cmd/bootz.c @@ -64,7 +64,7 @@ static int bootz_start(struct cmd_tbl *cmdtp, int flag, int argc, int do_bootz(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - int ret; + int states, ret; /* Consume 'bootz' */ argc--; argv++; @@ -79,14 +79,13 @@ int do_bootz(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) bootm_disable_interrupts(); images.os.os = IH_OS_LINUX; - ret = do_bootm_states(cmdtp, flag, argc, argv, -#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH - BOOTM_STATE_RAMDISK | -#endif - BOOTM_STATE_MEASURE | - BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO | - BOOTM_STATE_OS_GO, - &images, 1); + + states = BOOTM_STATE_MEASURE | BOOTM_STATE_OS_PREP | + BOOTM_STATE_OS_FAKE_GO | BOOTM_STATE_OS_GO; + if (IS_ENABLED(CONFIG_SYS_BOOT_RAMDISK_HIGH)) + states |= BOOTM_STATE_RAMDISK; + + ret = do_bootm_states(cmdtp, flag, argc, argv, states, &images, 1); return ret; } |