Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 19:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

xpl: Rename spl_in_proper() to not_xpl()

Browse source 
Give this function a slightly easier name.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2024-09-29 19:49:37 -06:00 • committed by Tom Rini
parent 456bdb70de
commit f86580fc70
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/mtd/nand/raw/sand_nand.c
View file

@ -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;

2
drivers/ram/rockchip/sdram_rk3399.c
View file

@ -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 *

4
drivers/serial/ns16550.c
View file

@ -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))

4
include/spl.h
View file

@ -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;