From ed12b5b9da1a1b186b42e63a55ce20c88528d7c4 Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Fri, 28 Jun 2013 10:02:03 +0200 Subject: 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 Cc: Simon Glass Cc: Tom Rini --- arch/powerpc/lib/bootm.c | 5 ----- 1 file changed, 5 deletions(-) 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) -- cgit v1.2.1