From: Matthew McClintock <msm@freescale.com>
Date: Wed, 23 Aug 2006 18:32:45 +0000 (-0500)
Subject: * Another small fix for booting with disable_of
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=b2b78421d9db49c21a821af8a19c21c1f7dfb29e;p=u-boot.git

* Another small fix for booting with disable_of

Signed-off-by: Matthew McClintock <msm@freescale.com>
---

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 27bb494ff0..04bce762c8 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -508,7 +508,7 @@ fixup_silent_linux ()
 #endif /* CONFIG_SILENT_CONSOLE */
 
 #ifdef CONFIG_PPC
-static void
+static void  __attribute__((noinline))
 do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
 		int	argc, char *argv[],
 		ulong	addr,
@@ -898,8 +898,6 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
 	(*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end);
 
 #else
-	ft_setup(of_flat_tree, kbd, initrd_start, initrd_end);
-	/* ft_dump_blob(of_flat_tree); */
 
 #if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500)
 	unlock_ram_in_cache();
@@ -915,9 +913,12 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
 	if (getenv("disable_of") != NULL)
 		(*kernel) ((bd_t *)of_flat_tree, initrd_start, initrd_end,
 			cmd_start, cmd_end);
-	else
+	else {
+		ft_setup(of_flat_tree, kbd, initrd_start, initrd_end);
+		/* ft_dump_blob(of_flat_tree); */
 		(*kernel) ((bd_t *)of_flat_tree, (ulong)kernel, 0, 0, 0);
-
+	}
+		
 #endif
 }
 #endif /* CONFIG_PPC */