[16/42] powerpc: Simplify check for SPL

Message ID	20240926223814.1276764-17-sjg@chromium.org
State	Changes Requested
Delegated to:	Tom Rini
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>, Andy Fleming <afleming@gmail.com>, Angelo Dureghello <angelo@kernel-space.org>, Mario Six <mario.six@gdsys.cc>, Priyanka Jain <priyanka.jain@nxp.com>, Stefan Roese <sr@denx.de>, Sughosh Ganu <sughosh.ganu@linaro.org>, Wolfgang Denk <wd@denx.de> Subject: [PATCH 16/42] powerpc: Simplify check for SPL Date: Fri, 27 Sep 2024 00:35:41 +0200 Message-ID: <20240926223814.1276764-17-sjg@chromium.org> In-Reply-To: <20240926223814.1276764-1-sjg@chromium.org> References: <20240926223814.1276764-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	Tidy up use of 'SPL' and CONFIG_SPL_BUILD \| expand [00/42] Tidy up use of 'SPL' and CONFIG_SPL_BUILD [01/42] Makefile: Add a u-boot.cfg file for VPL [02/42] scripts: Rename Makefile.spl to Makefile.xpl [03/42] scripts: Add some comments about autoconf.mk [04/42] scripts: Define CONFIG_XPL_BUILD for all xPL builds [05/42] global: Use CONFIG_XPL_BUILD instead of CONFIG_SPL_BUILD [06/42] doc: Update SPL docs for the xPL changes [07/42] net: freescale: Drop use of SPL_BUILD dependency [08/42] x86: Update a comment to mention XPL [09/42] tegra: Use SPL instead of SPL_BUILD [10/42] log: global: Rename warn_non_spl() and update the condition [11/42] qconfig: Add XPL_BUILD to ignored symbols [12/42] boot: Drop unnecessary ifdef for LOAD_FIT [13/42] xpl: Define CONFIG_SPL_BUILD only for the SPL build [14/42] rockchip: Simplify check for SPL [15/42] mips: Simplify check for SPL [16/42] powerpc: Simplify check for SPL [17/42] x86: Simplify check for SPL [18/42] freescale: Simplify check for SPL [19/42] mtd: Simplify check for SPL [20/42] dm: Simplify check for SPL [21/42] spl: Simplify check for SPL [22/42] powerpc: Correct check for SPL [23/42] serial: Make use of the SERIAL define [24/42] stdio: Make use of the SERIAL define [25/42] drivers: Simplify Makefile checks [26/42] kconfig: binman: Check for SPL instead of XPL [27/42] rockchip: Simplify Makefile condition [28/42] drivers: Simplify Makefile condition [29/42] global: Rename SPL_ to XPL_ [30/42] global: Rename SPL_TPL_ to PHASE_ [31/42] spl: Rename SPL_TPL_NAME and SPL_TPL_PROMPT [32/42] qconfig: Update tool for new Makefile variables [33/42] xpl: Rename u_boot_first_phase to xpl_is_first_phase() [34/42] xpl: Rename spl_phase to xpl_phase_t [35/42] xpl: Rename spl_phase() to xpl_phase() [36/42] xpl: Rename spl_in_proper() to not_xpl() [37/42] xpl: Add a function to indicate when in xPL [38/42] xpl: Rename spl_next_phase() and spl_prev_phase() [39/42] xpl: Rename spl_phase_prefix() and spl_phase_name() [40/42] README: Drop SoC-specific comment about SPL [41/42] doc: Move init-related things out of README [42/42] doc: Update init docs for the xPL changes

Message ID

20240926223814.1276764-17-sjg@chromium.org

State

Changes Requested

Delegated to:

Tom Rini

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>,
 Andy Fleming <afleming@gmail.com>,
 Angelo Dureghello <angelo@kernel-space.org>,
 Mario Six <mario.six@gdsys.cc>, Priyanka Jain <priyanka.jain@nxp.com>,
 Stefan Roese <sr@denx.de>, Sughosh Ganu <sughosh.ganu@linaro.org>,
 Wolfgang Denk <wd@denx.de>
Subject: [PATCH 16/42] powerpc: Simplify check for SPL
Date: Fri, 27 Sep 2024 00:35:41 +0200
Message-ID: <20240926223814.1276764-17-sjg@chromium.org>
In-Reply-To: <20240926223814.1276764-1-sjg@chromium.org>
References: <20240926223814.1276764-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

Tidy up use of 'SPL' and CONFIG_SPL_BUILD | expand

Commit Message

Simon Glass Sept. 26, 2024, 10:35 p.m. UTC

Now that SPL means SPL (only) and is not defined for TPL, simplify some
checks for SPL.

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

 arch/powerpc/cpu/mpc83xx/Makefile | 4 +---
 arch/powerpc/lib/Makefile         | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/arch/powerpc/cpu/mpc83xx/Makefile b/arch/powerpc/cpu/mpc83xx/Makefile
index 9974239f881..7c4ef7657e5 100644
--- a/arch/powerpc/cpu/mpc83xx/Makefile
+++ b/arch/powerpc/cpu/mpc83xx/Makefile
@@ -7,13 +7,11 @@ 
 
 MINIMAL=
 
-ifdef CONFIG_XPL_BUILD
-ifndef CONFIG_TPL_BUILD
+ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_SPL_INIT_MINIMAL
 MINIMAL=y
 endif
 endif
-endif
 
 extra-y	= start.o
 
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index f797f8cee66..b218ae2b91c 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -9,13 +9,11 @@  lib-$(CONFIG_USE_PRIVATE_LIBGCC) += _ashldi3.o _ashrdi3.o _lshrdi3.o
 
 MINIMAL=
 
-ifdef CONFIG_XPL_BUILD
-ifndef CONFIG_TPL_BUILD
+ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_SPL_INIT_MINIMAL
 MINIMAL=y
 endif
 endif
-endif
 
 obj-y	+= bdinfo.o

[16/42] powerpc: Simplify check for SPL

Commit Message

Patch