spl: dm: use CONFIG_IS_ENABLED to test for the DM option

[people/ms/u-boot.git] / common / spl / spl.c

diff --git a/common/spl/spl.c b/common/spl/spl.c
index bdb681f4f6d95d8818b962a9558c63632e368d7e..d245cfc0d14d905586dd37fd1ac969dd5d6853fa 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -6,6 +6,7 @@
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
+
 #include <common.h>
 #include <dm.h>
 #include <spl.h>
@@ -243,7 +244,7 @@ static int spl_common_init(bool setup_malloc)
                        return ret;
                }
        }
-       if (IS_ENABLED(CONFIG_SPL_DM)) {
+       if (CONFIG_IS_ENABLED(DM)) {
                bootstage_start(BOOTSTATE_ID_ACCUM_DM_SPL, "dm_spl");
                /* With CONFIG_SPL_OF_PLATDATA, bring in all devices */
                ret = dm_init_and_scan(!CONFIG_IS_ENABLED(OF_PLATDATA));
@@ -424,7 +425,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
              gd->malloc_ptr / 1024);
 #endif
 
-       if (IS_ENABLED(CONFIG_SPL_ATF_SUPPORT)) {
+       if (CONFIG_IS_ENABLED(ATF_SUPPORT)) {
                debug("loaded - jumping to U-Boot via ATF BL31.\n");
                bl31_entry();
        }