diff options
| author | Simon Glass <[email protected]> | 2024-09-25 12:44:53 +0200 |
|---|---|---|
| committer | Simon Glass <[email protected]> | 2024-10-18 14:10:22 -0600 |
| commit | 58918fa4f06c9bc529755efe133f514435d94467 (patch) | |
| tree | 6b413c98ca098b9ecf6b944c4851644b71423adf | |
| parent | 02eb9f166573009f576133a15d6323ff4ab479b1 (diff) | |
sandbox_spl: Restrict use of UPL when not enabled
With sandbox_spl we want to use the file-based boot in CI, so that this
flow is tested. The recent UPL change enabled booting via that method,
thus overriding the file-based boot.
Correct this by using UPL only when the --upl flag is given.
Signed-off-by: Simon Glass <[email protected]>
Fixes: 91fde8e1764 ("sandbox: Add an SPL loader for UPL")
| -rw-r--r-- | arch/sandbox/cpu/spl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c index c50df5f9179..7056cfd0180 100644 --- a/arch/sandbox/cpu/spl.c +++ b/arch/sandbox/cpu/spl.c @@ -55,9 +55,10 @@ void board_init_f(ulong flag) void board_boot_order(u32 *spl_boot_list) { + struct sandbox_state *state = state_get_current(); + spl_boot_list[0] = BOOT_DEVICE_VBE; - spl_boot_list[1] = BOOT_DEVICE_UPL; - spl_boot_list[2] = BOOT_DEVICE_BOARD; + spl_boot_list[1] = state->upl ? BOOT_DEVICE_UPL : BOOT_DEVICE_BOARD; } static int spl_board_load_file(struct spl_image_info *spl_image, |