xpl: Rename spl_phase() to xpl_phase()

Rename this function to indicate that it refers to any xPL phase.

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

diff --git a/README b/README
index 4be1e8c22a0a5ab20532199864349e37bd4a7e4f..c7ee06a21dd5c600f9e9bd8a9e005179df3f7e2d 100644 (file)
--- a/README
+++ b/README
@@ -1512,7 +1512,7 @@ Low Level (hardware related) configuration options:
                Set when the currently running compilation is for an artifact
                that will end up in one of the 'xPL' builds, i.e. SPL, TPL or
                VPL. Code that needs phase-specific behaviour can check this,
-               or (where possible) use spl_phase() instead.
+               or (where possible) use xpl_phase() instead.
 
                Note that CONFIG_SPL_BUILD *is* always defined when either
                of CONFIG_TPL_BUILD / CONFIG_VPL_BUILD is defined. This can be
@@ -1522,13 +1522,13 @@ Low Level (hardware related) configuration options:
                Set when the currently running compilation is for an artifact
                that will end up in the TPL build (as opposed to SPL, VPL or
                U-Boot proper). Code that needs phase-specific behaviour can
-               check this, or (where possible) use spl_phase() instead.
+               check this, or (where possible) use xpl_phase() instead.
 
 - CONFIG_VPL_BUILD
                Set when the currently running compilation is for an artifact
                that will end up in the VPL build (as opposed to the SPL, TPL
                or U-Boot proper). Code that needs phase-specific behaviour can
-               check this, or (where possible) use spl_phase() instead.
+               check this, or (where possible) use xpl_phase() instead.
 
 - CONFIG_ARCH_MAP_SYSMEM
                Generally U-Boot (and in particular the md command) uses

diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c
index 6c6f4fd8c3e6e6915fcae3ce64be07015865d83c..7497d90fb8905528f3e9482e52622f512ee9eda1 100644 (file)
--- a/arch/sandbox/cpu/spl.c
+++ b/arch/sandbox/cpu/spl.c
@@ -27,7 +27,7 @@ int sandbox_find_next_phase(char *fname, int maxlen, bool use_img)
        const char *cur_prefix, *next_prefix;
        int ret;
 
-       cur_prefix = spl_phase_prefix(spl_phase());
+       cur_prefix = spl_phase_prefix(xpl_phase());
        next_prefix = spl_phase_prefix(spl_next_phase());
        ret = os_find_u_boot(fname, maxlen, use_img, cur_prefix, next_prefix);
        if (ret)

diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index 9ad5d46271a61248343aef8ac659f7c6383f0398..4d3c806840bb00b2674be853bed69e5cff25ddf4 100644 (file)
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -206,7 +206,7 @@ static int sandbox_cmdline_cb_test_fdt(struct sandbox_state *state,
        char *relname;
        int len;
 
-       if (spl_phase() <= PHASE_SPL)
+       if (xpl_phase() <= PHASE_SPL)
                relname = "../arch/sandbox/dts/test.dtb";
        else
                relname = "arch/sandbox/dts/test.dtb";

diff --git a/arch/x86/cpu/apollolake/cpu_spl.c b/arch/x86/cpu/apollolake/cpu_spl.c
index 8798fa79d4c193f32bde7b9e6396c8e41fbb887a..8198667fa50c54a2233131d62afc6d3ec3760df3 100644 (file)
--- a/arch/x86/cpu/apollolake/cpu_spl.c
+++ b/arch/x86/cpu/apollolake/cpu_spl.c
@@ -184,9 +184,9 @@ int arch_cpu_init(void)
 {
        int ret = 0;
 
-       if (spl_phase() == PHASE_TPL)
+       if (xpl_phase() == PHASE_TPL)
                ret = arch_cpu_init_tpl();
-       else if (spl_phase() == PHASE_SPL)
+       else if (xpl_phase() == PHASE_SPL)
                ret = arch_cpu_init_spl();
        if (ret)
                printf("%s: Error %d\n", __func__, ret);

diff --git a/arch/x86/cpu/apollolake/hostbridge.c b/arch/x86/cpu/apollolake/hostbridge.c
index 9ee362239efefd1a8f38cbb17909a6150cf22ef7..039236df02dd6d5073a2507e9e80b43d1be9ed26 100644 (file)
--- a/arch/x86/cpu/apollolake/hostbridge.c
+++ b/arch/x86/cpu/apollolake/hostbridge.c
@@ -255,7 +255,7 @@ static int apl_hostbridge_of_to_plat(struct udevice *dev)
 
 static int apl_hostbridge_probe(struct udevice *dev)
 {
-       if (spl_phase() == PHASE_TPL)
+       if (xpl_phase() == PHASE_TPL)
                return apl_hostbridge_early_init(dev);
 
        return 0;

diff --git a/arch/x86/cpu/apollolake/lpc.c b/arch/x86/cpu/apollolake/lpc.c
index 531ff1cd91f47058d5feefab3066a30a6617235a..f34c199bf734d10678510cac74cd702c12c420ea 100644 (file)
--- a/arch/x86/cpu/apollolake/lpc.c
+++ b/arch/x86/cpu/apollolake/lpc.c
@@ -80,7 +80,7 @@ int lpc_open_pmio_window(uint base, uint size)
 
                lgir_reg_num = find_unused_pmio_window();
                if (lgir_reg_num < 0) {
-                       if (spl_phase() > PHASE_TPL) {
+                       if (xpl_phase() > PHASE_TPL) {
                                log_err("LPC: Cannot open IO window: %lx size %lx\n",
                                        bridge_base, size - bridged_size);
                                log_err("No more IO windows\n");

diff --git a/arch/x86/cpu/apollolake/pch.c b/arch/x86/cpu/apollolake/pch.c
index 32190312ff8cd879bddb704cac5ef69522cbf49f..07ef26f6bde8463197737bf4d93853b96a8bd8c4 100644 (file)
--- a/arch/x86/cpu/apollolake/pch.c
+++ b/arch/x86/cpu/apollolake/pch.c
@@ -12,7 +12,7 @@
 
 static int apl_set_spi_protect(struct udevice *dev, bool protect)
 {
-       if (spl_phase() == PHASE_SPL)
+       if (xpl_phase() == PHASE_SPL)
                return lpc_set_spi_protect(dev, BIOS_CTRL, protect);
 
        return 0;

diff --git a/arch/x86/cpu/apollolake/pmc.c b/arch/x86/cpu/apollolake/pmc.c
index 32fd0344861e9040dbbaa69d21b5178b50d5d4ec..bfb8a07d47a9c6438d63f344fbe0ae19077d4fde 100644 (file)
--- a/arch/x86/cpu/apollolake/pmc.c
+++ b/arch/x86/cpu/apollolake/pmc.c
@@ -115,7 +115,7 @@ int apl_pmc_ofdata_to_uc_plat(struct udevice *dev)
                                 ARRAY_SIZE(base));
        if (ret)
                return log_msg_ret("Missing/short early-regs", ret);
-       if (spl_phase() == PHASE_TPL) {
+       if (xpl_phase() == PHASE_TPL) {
                upriv->pmc_bar0 = (void *)base[0];
                upriv->pmc_bar2 = (void *)base[2];
 
@@ -186,7 +186,7 @@ static int enable_pmcbar(struct udevice *dev)
 
 static int apl_pmc_probe(struct udevice *dev)
 {
-       if (spl_phase() == PHASE_TPL) {
+       if (xpl_phase() == PHASE_TPL) {
                return enable_pmcbar(dev);
        } else {
                struct acpi_pmc_upriv *upriv = dev_get_uclass_priv(dev);

diff --git a/arch/x86/cpu/apollolake/punit.c b/arch/x86/cpu/apollolake/punit.c
index b1503c25140aa542be90cca57aa8c9c0f723a973..9c708e9df558941f8325e78f6c77e6c58a3678fd 100644 (file)
--- a/arch/x86/cpu/apollolake/punit.c
+++ b/arch/x86/cpu/apollolake/punit.c
@@ -77,7 +77,7 @@ static int punit_init(struct udevice *dev)
 
 static int apl_punit_probe(struct udevice *dev)
 {
-       if (spl_phase() == PHASE_SPL)
+       if (xpl_phase() == PHASE_SPL)
                return punit_init(dev);
 
        return 0;

diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c
index b351d73e7d8b1ea6021c2afa09515e41766106c9..510f8c4350f0132849fcc6b0609a9d65232fdcf3 100644 (file)
--- a/arch/x86/cpu/apollolake/spl.c
+++ b/arch/x86/cpu/apollolake/spl.c
@@ -116,7 +116,7 @@ static int spl_fast_spi_load_image(struct spl_image_info *spl_image,
                return ret;
 
        spl_image->size = CONFIG_SYS_MONITOR_LEN;  /* We don't know SPL size */
-       spl_image->entry_point = spl_phase() == PHASE_TPL ?
+       spl_image->entry_point = xpl_phase() == PHASE_TPL ?
                CONFIG_SPL_TEXT_BASE : CONFIG_TEXT_BASE;
        spl_image->load_addr = spl_image->entry_point;
        spl_image->os = IH_OS_U_BOOT;

diff --git a/arch/x86/cpu/broadwell/cpu.c b/arch/x86/cpu/broadwell/cpu.c
index dc6717eca40ea8c307a2a6bed9c93fd999716061..87463748c4de8a172a8a1e89a9140ea1dca17783 100644 (file)
--- a/arch/x86/cpu/broadwell/cpu.c
+++ b/arch/x86/cpu/broadwell/cpu.c
@@ -68,7 +68,7 @@ int arch_cpu_init(void)
        post_code(POST_CPU_INIT);
 
        /* Do a mini-init if TPL has already done the full init */
-       if (IS_ENABLED(CONFIG_TPL) && spl_phase() != PHASE_TPL)
+       if (IS_ENABLED(CONFIG_TPL) && xpl_phase() != PHASE_TPL)
                return x86_cpu_reinit_f();
        else
                return x86_cpu_init_f();

diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c
index 934e98ac582dea77eaeb6c7feb3a3e3e26c6c299..d837fb97982d74c129bbf505345e7d74e45f6076 100644 (file)
--- a/arch/x86/cpu/i386/cpu.c
+++ b/arch/x86/cpu/i386/cpu.c
@@ -271,7 +271,7 @@ static void identify_cpu(struct cpu_device_id *cpu)
         * Do a quick and dirty check to save space - Intel and AMD only and
         * just the vendor. This is enough for most TPL code.
         */
-       if (spl_phase() == PHASE_TPL) {
+       if (xpl_phase() == PHASE_TPL) {
                struct cpuid_result result;
 
                result = cpuid(0x00000000);

diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c
index c834c05d130807bf8750efb73829e243a44f711f..baa1f0e32d6bc96ddd4350be48026cc2d1ae3715 100644 (file)
--- a/arch/x86/cpu/intel_common/mrc.c
+++ b/arch/x86/cpu/intel_common/mrc.c
@@ -259,7 +259,7 @@ int mrc_common_init(struct udevice *dev, void *pei_data, bool use_asm_linkage)
                return ret;
 
        delay = dev_read_u32_default(dev, "fspm,training-delay", 0);
-       if (spl_phase() == PHASE_SPL) {
+       if (xpl_phase() == PHASE_SPL) {
                if (delay)
                        printf("SDRAM training (%d seconds)...", delay);
                else

diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c
index 7aad8f8ca56a4167f4f1bd91be3b57e777ce1968..406c41013fce596d950983db48bbdf1ed11a2d2e 100644 (file)
--- a/arch/x86/cpu/intel_common/p2sb.c
+++ b/arch/x86/cpu/intel_common/p2sb.c
@@ -96,7 +96,7 @@ int p2sb_of_to_plat(struct udevice *dev)
                return log_msg_ret("Missing/short early-regs", ret);
        plat->mmio_base = base[0];
        /* TPL sets up the initial BAR */
-       if (spl_phase() == PHASE_TPL) {
+       if (xpl_phase() == PHASE_TPL) {
                plat->bdf = pci_get_devfn(dev);
                if (plat->bdf < 0)
                        return log_msg_ret("Cannot get p2sb PCI address",
@@ -114,9 +114,9 @@ int p2sb_of_to_plat(struct udevice *dev)
 
 static int p2sb_probe(struct udevice *dev)
 {
-       if (spl_phase() == PHASE_TPL)
+       if (xpl_phase() == PHASE_TPL)
                return p2sb_early_init(dev);
-       else if (spl_phase() == PHASE_SPL)
+       else if (xpl_phase() == PHASE_SPL)
                return p2sb_spl_init(dev);
 
        return 0;

diff --git a/arch/x86/lib/fsp2/fsp_dram.c b/arch/x86/lib/fsp2/fsp_dram.c
index a50dc985a3cb33e26a324ae49c98c417872e19e2..4c4c8334bdb9b198498e0255cc816a0538c4ff79 100644 (file)
--- a/arch/x86/lib/fsp2/fsp_dram.c
+++ b/arch/x86/lib/fsp2/fsp_dram.c
@@ -28,7 +28,7 @@ int dram_init(void)
 
                return 0;
        }
-       if (spl_phase() == PHASE_SPL) {
+       if (xpl_phase() == PHASE_SPL) {
                bool s3wake = false;
 
                s3wake = IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) &&

diff --git a/arch/x86/lib/fsp2/fsp_init.c b/arch/x86/lib/fsp2/fsp_init.c
index ecbadaae75cfb609f3dc8ddf50bd7648d04d201a..1a2bf46c5c57e40b9fc0747306ff565526876b29 100644 (file)
--- a/arch/x86/lib/fsp2/fsp_init.c
+++ b/arch/x86/lib/fsp2/fsp_init.c
@@ -25,7 +25,7 @@ int fsp_setup_pinctrl(void)
        int ret;
 
        /* Make sure pads are set up early in U-Boot */
-       if (!ll_boot_init() || spl_phase() != PHASE_BOARD_F)
+       if (!ll_boot_init() || xpl_phase() != PHASE_BOARD_F)
                return 0;
 
        /* Probe all pinctrl devices to set up the pads */
@@ -134,7 +134,7 @@ int fsp_locate_fsp(enum fsp_type_t type, struct binman_entry *entry,
                        return log_msg_ret("Could not get flash mmap", ret);
        }
 
-       if (spl_phase() >= PHASE_BOARD_F) {
+       if (xpl_phase() >= PHASE_BOARD_F) {
                if (type != FSP_S)
                        return -EPROTONOSUPPORT;
                ret = binman_entry_find("intel-fsp-s", entry);

diff --git a/boot/fdt_simplefb.c b/boot/fdt_simplefb.c
index 53415548459ad2d7eee87954b8e3f7c44f2fe6ee..71b833eb9bd5f20dcbb81a4429de4eab36acf3c4 100644 (file)
--- a/boot/fdt_simplefb.c
+++ b/boot/fdt_simplefb.c
@@ -27,7 +27,7 @@ static int fdt_simplefb_configure_node(void *blob, int off)
        struct udevice *dev;
        int ret;
 
-       if (IS_ENABLED(CONFIG_SPL_VIDEO_HANDOFF) && spl_phase() > PHASE_SPL) {
+       if (IS_ENABLED(CONFIG_SPL_VIDEO_HANDOFF) && xpl_phase() > PHASE_SPL) {
                struct video_handoff *ho;
 
                ho = bloblist_find(BLOBLISTT_U_BOOT_VIDEO, sizeof(*ho));

diff --git a/boot/vbe_simple_fw.c b/boot/vbe_simple_fw.c
index 4d6da9490a76f364d1ab9b0250d8ab7456951fba..da9701f9eb93a00d1679f601069d0ce4c286cfca 100644 (file)
--- a/boot/vbe_simple_fw.c
+++ b/boot/vbe_simple_fw.c
@@ -157,7 +157,7 @@ static int simple_load_from_image(struct spl_image_info *spl_image,
        struct vbe_handoff *handoff;
        int ret;
 
-       if (spl_phase() != PHASE_VPL && spl_phase() != PHASE_SPL)
+       if (xpl_phase() != PHASE_VPL && xpl_phase() != PHASE_SPL)
                return -ENOENT;
 
        ret = bloblist_ensure_size(BLOBLISTT_VBE, sizeof(struct vbe_handoff),
@@ -197,7 +197,7 @@ static int simple_load_from_image(struct spl_image_info *spl_image,
        bootflow_free(&bflow);
 
        /* Record that VBE was used in this phase */
-       handoff->phases |= 1 << spl_phase();
+       handoff->phases |= 1 << xpl_phase();
 
        return 0;
 }

diff --git a/common/board_f.c b/common/board_f.c
index 154675d0e407f1862ea33d430362eeafee083c54..f1bd70fdd6c54f5d51b87d19ddb4294a018fc6dd 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -397,7 +397,7 @@ __weak int arch_reserve_mmu(void)
 
 static int reserve_video_from_videoblob(void)
 {
-       if (IS_ENABLED(CONFIG_SPL_VIDEO_HANDOFF) && spl_phase() > PHASE_SPL) {
+       if (IS_ENABLED(CONFIG_SPL_VIDEO_HANDOFF) && xpl_phase() > PHASE_SPL) {
                struct video_handoff *ho;
                int ret = 0;
 

diff --git a/common/bootstage.c b/common/bootstage.c
index 49acc9078a6d3280784c2cb562a72aa0fe56ce65..dca331481923df20199cad50dbe1620bf4038407 100644 (file)
--- a/common/bootstage.c
+++ b/common/bootstage.c
@@ -489,7 +489,7 @@ int bootstage_unstash(const void *base, int size)
        for (rec = data->record + data->next_id, i = 0; i < hdr->count;
             i++, rec++) {
                rec->name = ptr;
-               if (spl_phase() == PHASE_SPL)
+               if (xpl_phase() == PHASE_SPL)
                        rec->name = strdup(ptr);
 
                /* Assume no data corruption here */

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 9ed91929ee1b460671997c7a0434e4cf94e65a23..6c297ebf37aa56f3119fb7d3c7376ab55644be4c 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -441,7 +441,7 @@ static inline int write_spl_handoff(void) { return 0; }
  */
 static enum bootstage_id get_bootstage_id(bool start)
 {
-       enum xpl_phase_t phase = spl_phase();
+       enum xpl_phase_t phase = xpl_phase();
 
        if (IS_ENABLED(CONFIG_TPL_BUILD) && phase == PHASE_TPL)
                return start ? BOOTSTAGE_ID_START_TPL : BOOTSTAGE_ID_END_TPL;
@@ -476,7 +476,7 @@ static int spl_common_init(bool setup_malloc)
                        log_debug("Failed to unstash bootstage: ret=%d\n", ret);
        }
        bootstage_mark_name(get_bootstage_id(true),
-                           spl_phase_name(spl_phase()));
+                           spl_phase_name(xpl_phase()));
 #if CONFIG_IS_ENABLED(LOG)
        ret = log_init();
        if (ret) {
@@ -493,7 +493,7 @@ static int spl_common_init(bool setup_malloc)
        }
        if (CONFIG_IS_ENABLED(DM)) {
                bootstage_start(BOOTSTAGE_ID_ACCUM_DM_SPL,
-                               spl_phase() == PHASE_TPL ? "dm tpl" : "dm_spl");
+                               xpl_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(BOOTSTAGE_ID_ACCUM_DM_SPL);

diff --git a/doc/develop/spl.rst b/doc/develop/spl.rst
index 4bb48e6b7b3079af271acd9d3412386118d91b3e..a92110e4fa997b05a7b5bb7a0b72b8c33d044f0a 100644 (file)
--- a/doc/develop/spl.rst
+++ b/doc/develop/spl.rst
@@ -34,6 +34,8 @@ For example::
            foo();
    #endif
 
+   if (xpl_phase() == PHASE_TPL)
+           bar();
 
 The building of SPL images can be enabled by CONFIG_SPL option in Kconfig.
 
@@ -117,7 +119,7 @@ Further usages of U-Boot SPL comprise:
 Checking the boot phase
 -----------------------
 
-Use `spl_phase()` to find the current U-Boot phase, e.g. `PHASE_SPL`. You can
+Use `xpl_phase()` to find the current U-Boot phase, e.g. `PHASE_SPL`. You can
 also find the previous and next phase and get the phase name.
 
 

diff --git a/drivers/i2c/designware_i2c_pci.c b/drivers/i2c/designware_i2c_pci.c
index 11c986722650c2297b9381fe0a7a274381edf5c8..c21c412231c29a0f36daea762e84d6933b4b12c0 100644 (file)
--- a/drivers/i2c/designware_i2c_pci.c
+++ b/drivers/i2c/designware_i2c_pci.c
@@ -37,7 +37,7 @@ static int designware_i2c_pci_of_to_plat(struct udevice *dev)
 {
        struct dw_i2c *priv = dev_get_priv(dev);
 
-       if (spl_phase() < PHASE_SPL) {
+       if (xpl_phase() < PHASE_SPL) {
                u32 base;
                int ret;
 
@@ -53,7 +53,7 @@ static int designware_i2c_pci_of_to_plat(struct udevice *dev)
                                      PCI_COMMAND_MASTER);
        }
 
-       if (spl_phase() < PHASE_BOARD_F) {
+       if (xpl_phase() < PHASE_BOARD_F) {
                /* Handle early, fixed mapping into a different address space */
                priv->regs = (struct i2c_regs *)dm_pci_read_bar32(dev, 0);
        } else {

diff --git a/drivers/misc/p2sb-uclass.c b/drivers/misc/p2sb-uclass.c
index 016c807337821d4d62a3e4549a4f25b3fba71a8a..d7ce0383ac9ac4887612f2cd47559f05fea53e42 100644 (file)
--- a/drivers/misc/p2sb-uclass.c
+++ b/drivers/misc/p2sb-uclass.c
@@ -198,7 +198,7 @@ static int p2sb_child_post_bind(struct udevice *dev)
 
 static int p2sb_post_bind(struct udevice *dev)
 {
-       if (spl_phase() > PHASE_TPL && !CONFIG_IS_ENABLED(OF_PLATDATA))
+       if (xpl_phase() > PHASE_TPL && !CONFIG_IS_ENABLED(OF_PLATDATA))
                return dm_scan_fdt_dev(dev);
 
        return 0;

diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 6571e653049deab2f46bf3d5cfe7ebf67b3f18c4..59894d2430be3dbaa4cec2e60668d189390345d0 100644 (file)
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -722,7 +722,7 @@ static bool pci_need_device_pre_reloc(struct udevice *bus, uint vendor,
        u32 vendev;
        int index;
 
-       if (spl_phase() == PHASE_SPL && CONFIG_IS_ENABLED(PCI_PNP))
+       if (xpl_phase() == PHASE_SPL && CONFIG_IS_ENABLED(PCI_PNP))
                return true;
 
        for (index = 0;
@@ -798,7 +798,7 @@ static int pci_find_and_bind_driver(struct udevice *parent,
                        if (!(gd->flags & GD_FLG_RELOC) &&
                            !(drv->flags & DM_FLAG_PRE_RELOC) &&
                            (!CONFIG_IS_ENABLED(PCI_PNP) ||
-                            spl_phase() != PHASE_SPL))
+                            xpl_phase() != PHASE_SPL))
                                return log_msg_ret("pre", -EPERM);
 
                        /*

diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index 78e5de937cdf8e1df4bcfa7607a58b9e0e6e2d7e..2753df275ca1e83f8f8bfc44038f78a93bfb5758 100644 (file)
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -379,7 +379,7 @@ int vesa_setup_video(struct udevice *dev, int (*int15_handler)(void))
        }
 
        /* In U-Boot proper, collect the information added by SPL (see below) */
-       if (IS_ENABLED(CONFIG_SPL_VIDEO) && spl_phase() > PHASE_SPL &&
+       if (IS_ENABLED(CONFIG_SPL_VIDEO) && xpl_phase() > PHASE_SPL &&
            CONFIG_IS_ENABLED(BLOBLIST)) {
                struct video_handoff *ho;
 
@@ -425,7 +425,7 @@ int vesa_setup_video(struct udevice *dev, int (*int15_handler)(void))
               mode_info.vesa.bits_per_pixel);
 
        /* In SPL, store the information for use by U-Boot proper */
-       if (spl_phase() == PHASE_SPL && CONFIG_IS_ENABLED(BLOBLIST)) {
+       if (xpl_phase() == PHASE_SPL && CONFIG_IS_ENABLED(BLOBLIST)) {
                struct video_handoff *ho;
 
                ho = bloblist_add(BLOBLISTT_U_BOOT_VIDEO, sizeof(*ho), 0);

diff --git a/drivers/pinctrl/intel/pinctrl.c b/drivers/pinctrl/intel/pinctrl.c
index 6cfe83a593a278c9299219f33b7221ddce8bb70f..19525f82a225df2055ea1c9cc87f937211d31562 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl.c
+++ b/drivers/pinctrl/intel/pinctrl.c
@@ -273,7 +273,7 @@ static int pinctrl_configure_itss(struct udevice *dev,
        irq = pcr_read32(dev, PAD_CFG1_OFFSET(pad_cfg_offset));
        irq &= PAD_CFG1_IRQ_MASK;
        if (!irq) {
-               if (spl_phase() > PHASE_TPL)
+               if (xpl_phase() > PHASE_TPL)
                        log_err("GPIO %u doesn't support APIC routing\n",
                                cfg->pad);
 
@@ -315,7 +315,7 @@ static int pinctrl_pad_reset_config_override(const struct pad_community *comm,
                        return config_value;
                }
        }
-       if (spl_phase() > PHASE_TPL)
+       if (xpl_phase() > PHASE_TPL)
                log_err("Logical-to-Chipset mapping not found\n");
 
        return -ENOENT;
@@ -622,7 +622,7 @@ int intel_pinctrl_of_to_plat(struct udevice *dev,
        struct intel_pinctrl_priv *priv = dev_get_priv(dev);
 
        if (!comm) {
-               if (spl_phase() > PHASE_TPL)
+               if (xpl_phase() > PHASE_TPL)
                        log_err("Cannot find community for pid %d\n",
                                pplat->pid);
                return -EDOM;

diff --git a/drivers/power/acpi_pmc/acpi-pmc-uclass.c b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
index c289cede15b80176a844c78f16f80b17ec235ef8..1e94104091eae6d81bbfb64b11ec21716315d123 100644 (file)
--- a/drivers/power/acpi_pmc/acpi-pmc-uclass.c
+++ b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
@@ -60,7 +60,7 @@ int pmc_gpe_init(struct udevice *dev)
         * are different and if they aren't, use the reset values.
         */
        if (dw[0] == dw[1] || dw[1] == dw[2]) {
-               if (spl_phase() > PHASE_TPL)
+               if (xpl_phase() > PHASE_TPL)
                        log_info("PMC: Using default GPE route");
                gpio_cfg = readl(upriv->gpe_cfg);
                for (i = 0; i < upriv->gpe0_count; i++)

diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
index 45270e2718484b38e2b2d3fada36629993760196..7f8a6ba8410e046e49429c084c55470a15fb535d 100644 (file)
--- a/drivers/ram/rockchip/sdram_rk3399.c
+++ b/drivers/ram/rockchip/sdram_rk3399.c
@@ -193,7 +193,7 @@ struct io_setting {
  */
 static bool phase_sdram_init(void)
 {
-       return spl_phase() == PHASE_TPL ||
+       return xpl_phase() == PHASE_TPL ||
                (!IS_ENABLED(CONFIG_TPL) &&
                 !IS_ENABLED(CONFIG_ROCKCHIP_EXTERNAL_TPL) &&
                 !spl_in_proper());

diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c
index e48ca65fe726ff2b6f90def2edd1295a0448c98c..2264ca83d665d3acd8a75aaf75313461cf0adb4f 100644 (file)
--- a/drivers/spi/ich.c
+++ b/drivers/spi/ich.c
@@ -779,7 +779,7 @@ static int ich_init_controller(struct udevice *dev,
                               struct ich_spi_plat *plat,
                               struct ich_spi_priv *ctlr)
 {
-       if (spl_phase() == PHASE_TPL) {
+       if (xpl_phase() == PHASE_TPL) {
                struct ich_spi_plat *plat = dev_get_plat(dev);
                int ret;
 
@@ -867,7 +867,7 @@ static int ich_spi_probe(struct udevice *dev)
        if (ret)
                return ret;
 
-       if (spl_phase() == PHASE_TPL) {
+       if (xpl_phase() == PHASE_TPL) {
                /* Cache the BIOS to speed things up */
                ret = ich_cache_bios_region(dev);
                if (ret)

diff --git a/drivers/sysreset/sysreset-uclass.c b/drivers/sysreset/sysreset-uclass.c
index d30b008bf9a8c859671f629167510caf7f73f17d..536ac7271427bdc90ed7e9ab907d656618d26a81 100644 (file)
--- a/drivers/sysreset/sysreset-uclass.c
+++ b/drivers/sysreset/sysreset-uclass.c
@@ -102,7 +102,7 @@ void sysreset_walk_halt(enum sysreset_t type)
                mdelay(100);
 
        /* Still no reset? Give up */
-       if (spl_phase() <= PHASE_SPL)
+       if (xpl_phase() <= PHASE_SPL)
                log_err("no sysreset\n");
        else
                log_err("System reset not supported on this platform\n");

diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c
index c435162d3f946f58792583e817be841ebfec060d..17a29817664f49a6f1047e0ffc52d823e6930d0c 100644 (file)
--- a/drivers/video/console_truetype.c
+++ b/drivers/video/console_truetype.c
@@ -802,7 +802,7 @@ static int truetype_entry_save(struct udevice *dev, struct abuf *buf)
        struct console_tt_store store;
        const uint size = sizeof(store);
 
-       if (spl_phase() <= PHASE_SPL)
+       if (xpl_phase() <= PHASE_SPL)
                return -ENOSYS;
 
        /*
@@ -826,7 +826,7 @@ static int truetype_entry_restore(struct udevice *dev, struct abuf *buf)
        struct console_tt_priv *priv = dev_get_priv(dev);
        struct console_tt_store store;
 
-       if (spl_phase() <= PHASE_SPL)
+       if (xpl_phase() <= PHASE_SPL)
                return -ENOSYS;
 
        memcpy(&store, abuf_data(buf), sizeof(store));
@@ -853,7 +853,7 @@ static int truetype_set_cursor_visible(struct udevice *dev, bool visible,
        uint out, val;
        int ret;
 
-       if (spl_phase() <= PHASE_SPL)
+       if (xpl_phase() <= PHASE_SPL)
                return -ENOSYS;
 
        if (!visible)

diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 41bb7647fda2713ce915dd0fab02c89a3b27d4d2..9823673f817f5c358b4d3c2e6fc102404bda2ac5 100644 (file)
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -128,7 +128,7 @@ int video_reserve(ulong *addrp)
        struct udevice *dev;
        ulong size;
 
-       if (IS_ENABLED(CONFIG_SPL_VIDEO_HANDOFF) && spl_phase() == PHASE_BOARD_F)
+       if (IS_ENABLED(CONFIG_SPL_VIDEO_HANDOFF) && xpl_phase() == PHASE_BOARD_F)
                return 0;
 
        gd->video_top = *addrp;
@@ -421,7 +421,7 @@ bool video_is_active(void)
        struct udevice *dev;
 
        /* Assume video to be active if SPL passed video hand-off to U-boot */
-       if (IS_ENABLED(CONFIG_SPL_VIDEO_HANDOFF) && spl_phase() > PHASE_SPL)
+       if (IS_ENABLED(CONFIG_SPL_VIDEO_HANDOFF) && xpl_phase() > PHASE_SPL)
                return true;
 
        for (uclass_find_first_device(UCLASS_VIDEO, &dev);
@@ -573,7 +573,7 @@ static int video_post_probe(struct udevice *dev)
         * NOTE:
         * This assumes that reserved video memory only uses a single framebuffer
         */
-       if (spl_phase() == PHASE_SPL && CONFIG_IS_ENABLED(BLOBLIST)) {
+       if (xpl_phase() == PHASE_SPL && CONFIG_IS_ENABLED(BLOBLIST)) {
                struct video_handoff *ho;
 
                ho = bloblist_add(BLOBLISTT_U_BOOT_VIDEO, sizeof(*ho), 0);

diff --git a/include/spl.h b/include/spl.h
index 6d44b627259cf628cefe458154ff9de585b66e68..bf0111395482ab47e6456168ba1d1a600f7e938e 100644 (file)
--- a/include/spl.h
+++ b/include/spl.h
@@ -74,7 +74,7 @@ enum xpl_phase_t {
 };
 
 /**
- * spl_phase() - Find out the phase of U-Boot
+ * xpl_phase() - Find out the phase of U-Boot
  *
  * This can be used to avoid #ifdef logic and use if() instead.
  *
@@ -86,7 +86,7 @@ enum xpl_phase_t {
  *
  * but with this you can use:
  *
- *    if (spl_phase() == PHASE_TPL) {
+ *    if (xpl_phase() == PHASE_TPL) {
  *       ...
  *    }
  *
@@ -98,7 +98,7 @@ enum xpl_phase_t {
  *
  * but with this you can use:
  *
- *    if (spl_phase() == PHASE_SPL) {
+ *    if (xpl_phase() == PHASE_SPL) {
  *       ...
  *    }
  *
@@ -110,13 +110,13 @@ enum xpl_phase_t {
  *
  * but with this you can use:
  *
- *    if (spl_phase() == PHASE_BOARD_F) {
+ *    if (xpl_phase() == PHASE_BOARD_F) {
  *       ...
  *    }
  *
  * Return: U-Boot phase
  */
-static inline enum xpl_phase_t spl_phase(void)
+static inline enum xpl_phase_t xpl_phase(void)
 {
 #ifdef CONFIG_TPL_BUILD
        return PHASE_TPL;

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 5edc8dd2f9f02e47329922bb9eed8b1189ea50bb..ab05419022117188d3422aa5204acd26a9f2eb36 100644 (file)
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -608,7 +608,7 @@ int fdtdec_get_chosen_node(const void *blob, const char *name)
 static int fdtdec_prepare_fdt(const void *blob)
 {
        if (!blob || ((uintptr_t)blob & 3) || fdt_check_header(blob)) {
-               if (spl_phase() <= PHASE_SPL) {
+               if (xpl_phase() <= PHASE_SPL) {
                        puts("Missing DTB\n");
                } else {
                        printf("No valid device tree binary found at %p\n",

diff --git a/lib/lmb.c b/lib/lmb.c
index 3ed570fb29b11c78eca2d2ed4b3653c334fa2baf..380d92a6718941c4fcfd471d9bd007969ff13ab4 100644 (file)
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -749,9 +749,9 @@ int lmb_init(void)
        lmb_add_memory();
 
        /* Reserve the U-Boot image region once U-Boot has relocated */
-       if (spl_phase() == PHASE_SPL)
+       if (xpl_phase() == PHASE_SPL)
                lmb_reserve_common_spl();
-       else if (spl_phase() == PHASE_BOARD_R)
+       else if (xpl_phase() == PHASE_BOARD_R)
                lmb_reserve_common((void *)gd->fdt_blob);
 
        return 0;

diff --git a/lib/time.c b/lib/time.c
index 872f73d521e1e0f3e231a1add6591418e1a43c21..d88edafb1962d70653dff76e18b4c52f8aba07f1 100644 (file)
--- a/lib/time.c
+++ b/lib/time.c
@@ -100,7 +100,7 @@ uint64_t notrace get_ticks(void)
 
        ret = timer_get_count(gd->timer, &count);
        if (ret) {
-               if (spl_phase() > PHASE_TPL)
+               if (xpl_phase() > PHASE_TPL)
                        panic("Could not read count from timer (err %d)\n",
                              ret);
                else