From: Stefan Roese <sr@denx.de>
Date: Fri, 28 Jun 2013 08:02:03 +0000 (+0200)
Subject: Fix bootm to work on powerpc again (compressed uImage)
X-Git-Tag: v2013.07-rc2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ed12b5b9da1a1b186b42e63a55ce20c88528d7c4;p=u-boot

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>
---

diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index dd6c98cdb4..d4ad323fe9 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)