xpl: Rename spl_in_proper() to not_xpl()

Give this function a slightly easier name.

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

diff --git a/drivers/mtd/nand/raw/sand_nand.c b/drivers/mtd/nand/raw/sand_nand.c
index 229d7b5b65ad6daa515f94ca39ae3d83033b5ed4..456e841b1c45812b6ee43e724c83f877e118c50b 100644 (file)
--- a/drivers/mtd/nand/raw/sand_nand.c
+++ b/drivers/mtd/nand/raw/sand_nand.c
@@ -601,7 +601,7 @@ static int sand_nand_probe(struct udevice *dev)
                }
 
                nand = &chip->nand;
-               nand->options = spl_in_proper() ? 0 : NAND_SKIP_BBTSCAN;
+               nand->options = not_xpl() ? 0 : NAND_SKIP_BBTSCAN;
                nand->flash_node = np;
                nand->dev_ready = sand_nand_dev_ready;
                nand->cmdfunc = sand_nand_command;

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

diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 6fcb5b523acbf8e924b951625d1479d0454c266b..55bc39648d78a4ed5ba7f59af1a0fd22c7a2e24c 100644 (file)
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -473,7 +473,7 @@ static int ns16550_serial_getinfo(struct udevice *dev,
        struct ns16550_plat *plat = com_port->plat;
 
        /* save code size */
-       if (!spl_in_proper())
+       if (!not_xpl())
                return -ENOSYS;
 
        info->type = SERIAL_CHIP_16550_COMPATIBLE;
@@ -555,7 +555,7 @@ int ns16550_serial_of_to_plat(struct udevice *dev)
        struct clk clk;
        int err;
 
-       addr = spl_in_proper() ? dev_read_addr_size(dev, &size) :
+       addr = not_xpl() ? dev_read_addr_size(dev, &size) :
                dev_read_addr(dev);
        err = ns16550_serial_assign_base(plat, addr, size);
        if (err && !device_is_on_pci_bus(dev))

diff --git a/include/spl.h b/include/spl.h
index bf0111395482ab47e6456168ba1d1a600f7e938e..948486164d9f735ff20f732c895b2527fc3b8610 100644 (file)
--- a/include/spl.h
+++ b/include/spl.h
@@ -134,8 +134,8 @@ static inline enum xpl_phase_t xpl_phase(void)
 #endif
 }
 
-/* returns true if in U-Boot proper, false if in SPL */
-static inline bool spl_in_proper(void)
+/* returns true if in U-Boot proper, false if in xPL */
+static inline bool not_xpl(void)
 {
 #ifdef CONFIG_SPL_BUILD
        return false;