[11/19] spl: Support a relocated stack in any XPL phase

Message ID	20240829145802.1827952-12-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: Simon Glass <sjg@chromium.org>, Devarsh Thakkar <devarsht@ti.com>, Quentin Schulz <quentin.schulz@cherry.de>, Sean Anderson <seanga2@gmail.com>, Tom Rini <trini@konsulko.com> Subject: [PATCH 11/19] spl: Support a relocated stack in any XPL phase Date: Thu, 29 Aug 2024 08:57:54 -0600 Message-Id: <20240829145802.1827952-12-sjg@chromium.org> In-Reply-To: <20240829145802.1827952-1-sjg@chromium.org> References: <20240829145802.1827952-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	vbe: Series part E \| expand [00/19] vbe: Series part E [01/19] image: Add a prototype for fit_image_get_phase() [02/19] serial: ns16550: Allow clocks to be missing [03/19] boot: Allow FIT to fall back from best-match option [04/19] bootstd: Avoid sprintf() in SPL when creating bootdevs [05/19] boot: Respect the load_op in fit_image_load() [06/19] malloc: Show amount of used space when memory runs out [07/19] malloc: Provide a simple malloc for VPL [08/19] Support setting a maximum size for the VPL image [09/19] spl: Report a loader failure [10/19] spl: Allow serial to be disabled in any XPL phase [11/19] spl: Support a relocated stack in any XPL phase [12/19] spl: Drop use of uintptr_t [13/19] spl: Drop a duplicate variable in boot_from_devices() [14/19] spl: Add some more debugging to load_simple_fit() [15/19] spl: lib: Allow for decompression in any SPL build [16/19] boot: Allow use of FIT in TPL and VPL [17/19] lib: Allow crc8 in TPL and VPL [18/19] boot: Imply CRC8 with VBE [19/19] hash: Plumb crc8 into the hash functions

Message ID

20240829145802.1827952-12-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: Simon Glass <sjg@chromium.org>, Devarsh Thakkar <devarsht@ti.com>,
 Quentin Schulz <quentin.schulz@cherry.de>,
 Sean Anderson <seanga2@gmail.com>, Tom Rini <trini@konsulko.com>
Subject: [PATCH 11/19] spl: Support a relocated stack in any XPL phase
Date: Thu, 29 Aug 2024 08:57:54 -0600
Message-Id: <20240829145802.1827952-12-sjg@chromium.org>
In-Reply-To: <20240829145802.1827952-1-sjg@chromium.org>
References: <20240829145802.1827952-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

vbe: Series part E | expand

Commit Message

Simon Glass Aug. 29, 2024, 2:57 p.m. UTC

The current check looks only at SPL, but TPL or VPL might have a
different setting. Update the condition.

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

 common/spl/spl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 8b868a298f2..5c687cfc73b 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -896,7 +896,7 @@  __weak void spl_relocate_stack_check(void)
  */
 ulong spl_relocate_stack_gd(void)
 {
-#ifdef CONFIG_SPL_STACK_R
+#if CONFIG_IS_ENABLED(STACK_R)
 	gd_t *new_gd;
 	ulong ptr = CONFIG_SPL_STACK_R_ADDR;

[11/19] spl: Support a relocated stack in any XPL phase

Commit Message

Patch