bootstage: Use BOOTSTAGE instead of BOOTSTATE

Some of the enum members are wrong. Fix them.

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

diff --git a/arch/x86/lib/fsp2/fsp_meminit.c b/arch/x86/lib/fsp2/fsp_meminit.c
index bf30c47..300be8b 100644 (file)
--- a/arch/x86/lib/fsp2/fsp_meminit.c
+++ b/arch/x86/lib/fsp2/fsp_meminit.c
@@ -79,10 +79,10 @@ int fsp_memory_init(bool s3wake, bool use_spi_flash)
                return log_msg_ret("Could not setup config", ret);
 
        debug("SDRAM init...");
-       bootstage_start(BOOTSTATE_ID_ACCUM_FSP_M, "fsp-m");
+       bootstage_start(BOOTSTAGE_ID_ACCUM_FSP_M, "fsp-m");
        func = (fsp_memory_init_func)(hdr->img_base + hdr->fsp_mem_init);
        ret = func(&upd, &hob);
-       bootstage_accum(BOOTSTATE_ID_ACCUM_FSP_M);
+       bootstage_accum(BOOTSTAGE_ID_ACCUM_FSP_M);
        if (ret)
                return log_msg_ret("SDRAM init fail\n", ret);
 

diff --git a/arch/x86/lib/fsp2/fsp_silicon_init.c b/arch/x86/lib/fsp2/fsp_silicon_init.c
index d7ce43e..66a3cb3 100644 (file)
--- a/arch/x86/lib/fsp2/fsp_silicon_init.c
+++ b/arch/x86/lib/fsp2/fsp_silicon_init.c
@@ -42,10 +42,10 @@ int fsp_silicon_init(bool s3wake, bool use_spi_flash)
        if (ret)
                return log_msg_ret("Could not setup config", ret);
        log_debug("Silicon init...");
-       bootstage_start(BOOTSTATE_ID_ACCUM_FSP_S, "fsp-s");
+       bootstage_start(BOOTSTAGE_ID_ACCUM_FSP_S, "fsp-s");
        func = (fsp_silicon_init_func)(hdr->img_base + hdr->fsp_silicon_init);
        ret = func(&upd);
-       bootstage_accum(BOOTSTATE_ID_ACCUM_FSP_S);
+       bootstage_accum(BOOTSTAGE_ID_ACCUM_FSP_S);
        if (ret)
                return log_msg_ret("Silicon init fail\n", ret);
        log_debug("done\n");

diff --git a/common/board_f.c b/common/board_f.c
index bae4267..c4247cd 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -823,9 +823,9 @@ static int initf_dm(void)
 #if defined(CONFIG_DM) && CONFIG_VAL(SYS_MALLOC_F_LEN)
        int ret;
 
-       bootstage_start(BOOTSTATE_ID_ACCUM_DM_F, "dm_f");
+       bootstage_start(BOOTSTAGE_ID_ACCUM_DM_F, "dm_f");
        ret = dm_init_and_scan(true);
-       bootstage_accum(BOOTSTATE_ID_ACCUM_DM_F);
+       bootstage_accum(BOOTSTAGE_ID_ACCUM_DM_F);
        if (ret)
                return ret;
 #endif

diff --git a/common/board_r.c b/common/board_r.c
index 33efcf6..bd1ac35 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -312,9 +312,9 @@ static int initr_dm(void)
 #ifdef CONFIG_TIMER
        gd->timer = NULL;
 #endif
-       bootstage_start(BOOTSTATE_ID_ACCUM_DM_R, "dm_r");
+       bootstage_start(BOOTSTAGE_ID_ACCUM_DM_R, "dm_r");
        ret = dm_init_and_scan(false);
-       bootstage_accum(BOOTSTATE_ID_ACCUM_DM_R);
+       bootstage_accum(BOOTSTAGE_ID_ACCUM_DM_R);
        if (ret)
                return ret;
 

diff --git a/common/spl/spl.c b/common/spl/spl.c
index fc5cbbb..163e960 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -423,11 +423,11 @@ static int spl_common_init(bool setup_malloc)
                }
        }
        if (CONFIG_IS_ENABLED(DM)) {
-               bootstage_start(BOOTSTATE_ID_ACCUM_DM_SPL,
+               bootstage_start(BOOTSTAGE_ID_ACCUM_DM_SPL,
                                spl_phase() == PHASE_TPL ? "dm tpl" : "dm_spl");
                /* With CONFIG_SPL_OF_PLATDATA, bring in all devices */
                ret = dm_init_and_scan(!CONFIG_IS_ENABLED(OF_PLATDATA));
-               bootstage_accum(BOOTSTATE_ID_ACCUM_DM_SPL);
+               bootstage_accum(BOOTSTAGE_ID_ACCUM_DM_SPL);
                if (ret) {
                        debug("dm_init_and_scan() returned error %d\n", ret);
                        return ret;

diff --git a/include/bootstage.h b/include/bootstage.h
index 82f0307..f507271 100644 (file)
--- a/include/bootstage.h
+++ b/include/bootstage.h
@@ -199,11 +199,11 @@ enum bootstage_id {
        BOOTSTAGE_ID_ACCUM_DECOMP,
        BOOTSTAGE_ID_ACCUM_OF_LIVE,
        BOOTSTAGE_ID_FPGA_INIT,
-       BOOTSTATE_ID_ACCUM_DM_SPL,
-       BOOTSTATE_ID_ACCUM_DM_F,
-       BOOTSTATE_ID_ACCUM_DM_R,
-       BOOTSTATE_ID_ACCUM_FSP_M,
-       BOOTSTATE_ID_ACCUM_FSP_S,
+       BOOTSTAGE_ID_ACCUM_DM_SPL,
+       BOOTSTAGE_ID_ACCUM_DM_F,
+       BOOTSTAGE_ID_ACCUM_DM_R,
+       BOOTSTAGE_ID_ACCUM_FSP_M,
+       BOOTSTAGE_ID_ACCUM_FSP_S,
        BOOTSTAGE_ID_ACCUM_MMAP_SPI,
 
        /* a few spare for the user, from here */