From: Simon Glass <sjg@chromium.org> Rather than always going through this state, require callers to explicitly request it. This will allow the option to be enabled without affecting the boot, unless the user expressly requests it. Signed-off-by: Simon Glass <sjg@chromium.org> --- boot/bootm.c | 9 ++++----- doc/usage/cmd/bootm.rst | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/boot/bootm.c b/boot/bootm.c index 0981494a2b8..d86fedc7be1 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -1300,8 +1300,7 @@ int boot_run(struct bootm_info *bmi, const char *cmd, int extra_states) int states; bmi->cmd_name = cmd; - states = BOOTM_STATE_MEASURE | BOOTM_STATE_OS_PREP | - BOOTM_STATE_OS_FAKE_GO | BOOTM_STATE_OS_GO; + states = BOOTM_STATE_MEASURE | BOOTM_STATE_OS_PREP; if (IS_ENABLED(CONFIG_SYS_BOOT_RAMDISK_HIGH)) states |= BOOTM_STATE_RAMDISK; states |= extra_states; @@ -1318,7 +1317,7 @@ int bootm_run(struct bootm_info *bmi) { return boot_run(bmi, "bootm", BOOTM_STATE_START | BOOTM_STATE_FINDOS | BOOTM_STATE_PRE_LOAD | BOOTM_STATE_FINDOTHER | - BOOTM_STATE_LOADOS); + BOOTM_STATE_LOADOS | BOOTM_STATE_OS_GO); } int bootz_run(struct bootm_info *bmi) @@ -1356,7 +1355,7 @@ int bootz_run(struct bootm_info *bmi) images->os.os = IH_OS_LINUX; - return boot_run(bmi, "bootz", 0); + return boot_run(bmi, "bootz", BOOTM_STATE_OS_GO); } int booti_run(struct bootm_info *bmi) @@ -1365,7 +1364,7 @@ int booti_run(struct bootm_info *bmi) return boot_run(bmi, "booti", BOOTM_STATE_START | BOOTM_STATE_FINDOS | BOOTM_STATE_PRE_LOAD | BOOTM_STATE_FINDOTHER | - BOOTM_STATE_LOADOS); + BOOTM_STATE_LOADOS | BOOTM_STATE_OS_GO); } void bootm_read_env(struct bootm_info *bmi) diff --git a/doc/usage/cmd/bootm.rst b/doc/usage/cmd/bootm.rst index 5af331873ce..dde441d8360 100644 --- a/doc/usage/cmd/bootm.rst +++ b/doc/usage/cmd/bootm.rst @@ -130,7 +130,8 @@ prep are required. After this the OS itself is ready to boot. fake - This is only used for testing and only available when `CONFIG_TRACE` is + This is only used for testing and only available when `CONFIG_BOOTM_FAKE_GO` + is enabled. It fakes a boot of the OS, performs all the normal steps right up to the point where U-Boot is about to jump to the OS. It then runs a list of commands from the `fakegocmd` environment variable. Note that the -- 2.43.0