From fb1b139bb79741e361bae421ece69d305b68d302 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Thu, 4 Jul 2013 13:26:11 -0700
Subject: [PATCH] bootm: Add the missing PREP stage to bootz and correct image
handling
In the recent bootm refactor, the PREP stage was missing in the bootz
command. This causes unpredictable behaviour.
The use of a local variable means that the reset of cmd_bootm.c does not
in fact use the same image structure, so remove this.
Also manually set the OS type to Linux, since this is the only possibility
at present, and we need to select the right boot function.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
common/cmd_bootm.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 3383a8c4c4..70d9891faf 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -1791,7 +1791,6 @@ static int bootz_start(cmd_tbl_t *cmdtp, int flag, int argc,
int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
- bootm_headers_t images;
int ret;
if (bootz_start(cmdtp, flag, argc, argv, &images))
@@ -1803,8 +1802,10 @@ int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
*/
bootm_disable_interrupts();
+ images.os.os = IH_OS_LINUX;
ret = do_bootm_states(cmdtp, flag, argc, argv,
- BOOTM_STATE_OS_FAKE_GO | BOOTM_STATE_OS_GO,
+ BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO |
+ BOOTM_STATE_OS_GO,
&images, 1);
return ret;
--
2.39.5