[v2,10/18] spl: Support a relocated stack in any XPL phase

Message ID	20240920081309.140426-11-sjg@chromium.org
State	Under Review
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Simon Glass <sjg@chromium.org> To: 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>, Sughosh Ganu <sughosh.ganu@linaro.org>, Tom Rini <trini@konsulko.com> Subject: [PATCH v2 10/18] spl: Support a relocated stack in any XPL phase Date: Fri, 20 Sep 2024 10:12:49 +0200 Message-ID: <20240920081309.140426-11-sjg@chromium.org> In-Reply-To: <20240920081309.140426-1-sjg@chromium.org> References: <20240920081309.140426-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 [v2,00/18] vbe: Series part E [v2,01/18] image: Add a prototype for fit_image_get_phase() [v2,02/18] boot: Allow FIT to fall back from best-match option [v2,03/18] bootstd: Avoid sprintf() in SPL when creating bootdevs [v2,04/18] boot: Respect the load_op in fit_image_load() [v2,05/18] malloc: Show amount of used space when memory runs out [v2,06/18] malloc: Provide a simple malloc for VPL [v2,07/18] Support setting a maximum size for the VPL image [v2,08/18] spl: Report a loader failure [v2,09/18] spl: Allow serial to be disabled in any XPL phase [v2,10/18] spl: Support a relocated stack in any XPL phase [v2,11/18] spl: Drop use of uintptr_t [v2,12/18] spl: Drop a duplicate variable in boot_from_devices() [v2,13/18] spl: Add some more debugging to load_simple_fit() [v2,14/18] spl: lib: Allow for decompression in any SPL build [v2,15/18] boot: Allow use of FIT in TPL and VPL [v2,16/18] lib: Allow crc8 in TPL and VPL [v2,17/18] boot: Imply CRC8 with VBE [v2,18/18] hash: Plumb crc8 into the hash functions

Message ID

20240920081309.140426-11-sjg@chromium.org

State

Under Review

Delegated to:

Tom Rini

Headers

From: Simon Glass <sjg@chromium.org>
To: 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>, Sughosh Ganu <sughosh.ganu@linaro.org>,
 Tom Rini <trini@konsulko.com>
Subject: [PATCH v2 10/18] spl: Support a relocated stack in any XPL phase
Date: Fri, 20 Sep 2024 10:12:49 +0200
Message-ID: <20240920081309.140426-11-sjg@chromium.org>
In-Reply-To: <20240920081309.140426-1-sjg@chromium.org>
References: <20240920081309.140426-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 Sept. 20, 2024, 8:12 a.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>
---

(no changes since v1)

 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 89a972dfc84..3f432d0fa7a 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -899,7 +899,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;

[v2,10/18] spl: Support a relocated stack in any XPL phase

Commit Message

Patch