diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/cli.c | 4 | ||||
| -rw-r--r-- | common/spl/spl.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/common/cli.c b/common/cli.c index 075ae9dc4a..b6ae80a5fe 100644 --- a/common/cli.c +++ b/common/cli.c @@ -135,7 +135,7 @@ int do_run(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } #endif -#ifdef CONFIG_OF_CONTROL +#if CONFIG_IS_ENABLED(OF_CONTROL) bool cli_process_fdt(const char **cmdp) { /* Allow the fdt to override the boot command */ @@ -196,7 +196,7 @@ err: */ hang(); } -#endif /* CONFIG_OF_CONTROL */ +#endif /* CONFIG_IS_ENABLED(OF_CONTROL) */ void cli_loop(void) { diff --git a/common/spl/spl.c b/common/spl/spl.c index 45cf92526c..a5892d7988 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -157,8 +157,7 @@ int spl_init(void) gd->malloc_limit = CONFIG_SYS_MALLOC_F_LEN; gd->malloc_ptr = 0; #endif - if (IS_ENABLED(CONFIG_OF_CONTROL) && - IS_ENABLED(CONFIG_SPL_OF_CONTROL)) { + if (CONFIG_IS_ENABLED(OF_CONTROL)) { ret = fdtdec_setup(); if (ret) { debug("fdtdec_setup() returned error %d\n", ret); |