summaryrefslogtreecommitdiff
path: root/arch/powerpc
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2013-06-28 10:02:03 +0200
committerTom Rini <trini@ti.com>2013-06-28 16:26:52 -0400
commited12b5b9da1a1b186b42e63a55ce20c88528d7c4 (patch)
tree612dc02a76dcc4a4db73724234ddeb4ba77b7863 /arch/powerpc
parent29ce737d6f4a8e19cbc8c54451e72e059e4d56e7 (diff)
downloadu-boot-imx-ed12b5b9da1a1b186b42e63a55ce20c88528d7c4.zip
u-boot-imx-ed12b5b9da1a1b186b42e63a55ce20c88528d7c4.tar.gz
u-boot-imx-ed12b5b9da1a1b186b42e63a55ce20c88528d7c4.tar.bz2
Fix bootm to work on powerpc again (compressed uImage)
Patch 35fc84fa1 [Refactor the bootm command to reduce code duplication] breaks booting Linux (compressed uImage with fdt) on powerpc. boot_jump_linux() mustn't be called before boot_prep_linux() and boot_body_linux() have been called. So remove the superfluous call to boot_jump_linux() in arch/powerpc/lib/bootm.c as its called later on in this function. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/lib/bootm.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index dd6c98c..d4ad323 100644
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -256,11 +256,6 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
return 0;
}
- if (flag & BOOTM_STATE_OS_GO) {
- boot_jump_linux(images);
- return 0;
- }
-
boot_prep_linux(images);
ret = boot_body_linux(images);
if (ret)