u-boot.git/cmd/x86/zboot.c, branch main

cmd: x86: zboot: remove duplicate zboot_setup() call in do_zboot_setup

2026-07-10T21:52:59Z

do_zboot_setup() invokes zboot_setup() twice: once with proper error reporting, and again immediately afterwards with no diagnostic. The second call re-runs the entire boot parameter setup on the already-populated zero page, which is at best wasted work and at worst leaves the structure in an unexpected state. Drop the stray second invocation; the first call already covers both success and failure handling. Fixes: cb19931ee56 ("x86: zboot: Drop intermediate zboot_setup() function") Signed-off-by: Naveen Kumar Chaudhary

global: Avoid indirect inclusion of from

2025-05-29T14:29:16Z

The include file does not need anything from . Furthermore, include/env.h itself includes other headers which can lead to longer indirect inclusion paths. To prepare to remove from fix all of the places which had relied on this indirect inclusion to instead include directly. Reviewed-by: Mattijs Korpershoek # android, bcb Reviewed-by: Jerome Forissier # spawn Signed-off-by: Tom Rini

zboot: Correct use of state_mask argument

2024-06-26T19:17:52Z

There is confusion in this function between the flag and state_mask parameters, which prevents the boot from actually happening. Correct this by using state_mask instead of flag for deciding which states to go through. This fixes booting of some 32-bit Debian kernels. Note: Some sort of CI for this is in the works. Fixes: 228c6722d44 ("x86: zboot: Avoid iteration in do_zboot_states()") Signed-off-by: Simon Glass

zboot: Add debugging for booting

2024-06-26T19:17:52Z

Show the boot arguments and the state mask, to aid debugging. Signed-off-by: Simon Glass

x86: zboot: Separate logic functions from commands

2024-04-10T19:49:16Z

Move zboot_start() and zboot_info() in with the other logic functions. Signed-off-by: Simon Glass Reviewed-by: Tom Rini

x86: zboot: Move argument processing outside zboot_start()

2024-04-10T19:49:16Z

Process the arguments before calling zboot_start() so that we can separate the command line from the internal logic. Signed-off-by: Simon Glass

x86: zboot: Drop intermediate zboot_go() function

2024-04-10T19:49:16Z

This function only calls zboot_go() so drop it. Signed-off-by: Simon Glass

x86: zboot: Drop intermediate zboot_setup() function

2024-04-10T19:49:16Z

Move error checking into the caller so that do_zboot_setup() can call zboot_setup() directly. Signed-off-by: Simon Glass

x86: zboot: Move environment setting into zboot_load()

2024-04-10T19:49:16Z

The only difference between the command and the underlying logic is the setting of envrionment variables. Move this out of the command processing since it needs to be done in any case. Signed-off-by: Simon Glass

x86: zboot: Create separate functions for the logic

2024-04-10T19:49:16Z

Separate out the commands from the logic. This will eventually allow the logic to be used when CONFIG_CMDLINE is not enabled. Signed-off-by: Simon Glass