[v2,24/30] xpl: Rename spl_in_proper() to not_xpl()

Message ID	20240928200030.194546-25-sjg@chromium.org
State	New
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>, Dario Binacchi <dario.binacchi@amarulasolutions.com>, Devarsh Thakkar <devarsht@ti.com>, Kever Yang <kever.yang@rock-chips.com>, Manoj Sai <abbaraju.manojsai@amarulasolutions.com>, Marek Vasut <marek.vasut+renesas@mailbox.org>, Michael Trimarchi <michael@amarulasolutions.com>, Peter Robinson <pbrobinson@gmail.com>, Philipp Tomsich <philipp.tomsich@vrull.eu>, Quentin Schulz <quentin.schulz@cherry.de>, Rasmus Villemoes <rasmus.villemoes@prevas.dk>, Sean Anderson <seanga2@gmail.com>, Stefan Roese <sr@denx.de> Subject: [PATCH v2 24/30] xpl: Rename spl_in_proper() to not_xpl() Date: Sat, 28 Sep 2024 14:00:24 -0600 Message-Id: <20240928200030.194546-25-sjg@chromium.org> In-Reply-To: <20240928200030.194546-1-sjg@chromium.org> References: <20240928200030.194546-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	[v2,01/30] Makefile: Add a u-boot.cfg file for VPL \| expand [v2,01/30] Makefile: Add a u-boot.cfg file for VPL [v2,02/30] scripts: Rename Makefile.spl to Makefile.xpl [v2,03/30] scripts: Add some comments about autoconf.mk [v2,04/30] scripts: Define CONFIG_XPL_BUILD for all xPL builds [v2,06/30] doc: Update SPL docs for the xPL changes [v2,07/30] net: freescale: Drop use of SPL_BUILD dependency [v2,08/30] x86: Update a comment to mention XPL [v2,09/30] tegra: Use SPL instead of SPL_BUILD [v2,10/30] log: global: Rename warn_non_spl() and update the condition [v2,11/30] qconfig: Add XPL_BUILD to ignored symbols [v2,12/30] boot: Drop unnecessary ifdef for LOAD_FIT [v2,13/30] xpl: Define CONFIG_SPL_BUILD only for the SPL build [v2,14/30] serial: Make use of the SERIAL define [v2,15/30] stdio: Make use of the SERIAL define [v2,16/30] kconfig: binman: Check for SPL instead of XPL [v2,19/30] spl: Rename SPL_TPL_NAME and SPL_TPL_PROMPT [v2,20/30] qconfig: Update tool for new Makefile variables [v2,21/30] xpl: Rename u_boot_first_phase to xpl_is_first_phase() [v2,22/30] xpl: Rename spl_phase to xpl_phase_t [v2,23/30] xpl: Rename spl_phase() to xpl_phase() [v2,24/30] xpl: Rename spl_in_proper() to not_xpl() [v2,25/30] xpl: Add a function to indicate when in xPL [v2,26/30] xpl: Rename spl_next_phase() and spl_prev_phase() [v2,27/30] xpl: Rename spl_phase_prefix() and spl_phase_name() [v2,28/30] README: Drop SoC-specific comment about SPL [v2,29/30] doc: Move init-related things out of README [v2,30/30] doc: Update init docs for the xPL changes

Message ID

20240928200030.194546-25-sjg@chromium.org

State

New

Headers

From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>,
 Dario Binacchi <dario.binacchi@amarulasolutions.com>,
 Devarsh Thakkar <devarsht@ti.com>, Kever Yang <kever.yang@rock-chips.com>,
 Manoj Sai <abbaraju.manojsai@amarulasolutions.com>,
 Marek Vasut <marek.vasut+renesas@mailbox.org>,
 Michael Trimarchi <michael@amarulasolutions.com>,
 Peter Robinson <pbrobinson@gmail.com>,
 Philipp Tomsich <philipp.tomsich@vrull.eu>,
 Quentin Schulz <quentin.schulz@cherry.de>,
 Rasmus Villemoes <rasmus.villemoes@prevas.dk>,
 Sean Anderson <seanga2@gmail.com>, Stefan Roese <sr@denx.de>
Subject: [PATCH v2 24/30] xpl: Rename spl_in_proper() to not_xpl()
Date: Sat, 28 Sep 2024 14:00:24 -0600
Message-Id: <20240928200030.194546-25-sjg@chromium.org>
In-Reply-To: <20240928200030.194546-1-sjg@chromium.org>
References: <20240928200030.194546-1-sjg@chromium.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

[v2,01/30] Makefile: Add a u-boot.cfg file for VPL | expand

Commit Message

Simon Glass Sept. 28, 2024, 8 p.m. UTC

Give this function a slightly easier name.

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

(no changes since v1)

 drivers/mtd/nand/raw/sand_nand.c    | 2 +-
 drivers/ram/rockchip/sdram_rk3399.c | 2 +-
 drivers/serial/ns16550.c            | 4 ++--
 include/spl.h                       | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/mtd/nand/raw/sand_nand.c b/drivers/mtd/nand/raw/sand_nand.c
index 53489223030..3678bb8a41b 100644
--- 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 7b48af49af8..6fa8f268770 100644
--- 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 248fe3f778f..3489228127e 100644
--- 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 079a38433a2..c9ab0f3e977 100644
--- 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_XPL_BUILD
 	return false;

[v2,24/30] xpl: Rename spl_in_proper() to not_xpl()

Commit Message

Patch