From 91148bf7aeba142d6f348805db7625db7da64d6f Mon Sep 17 00:00:00 2001
From: Kim Phillips <kim.phillips@freescale.com>
Date: Tue, 17 Jul 2007 13:56:53 -0500
Subject: [PATCH] fdt: do board setup based on fdt address specified on bootm
 line

The last fdt patch to bootm did board setup based on the address
specified by a prior fdt address command invocation.  The bootm
code, as its call to fdt_chosen does, should use the fdt specified
by the user on the bootm command.  Note this restores full
functionality for the 8360's existing default boot environment
values, e.g. 'run nfsboot' (i.e. no having to 'fdt addr $fdtaddr'
before booting a kernel).

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
---
 common/cmd_bootm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 981ffc5000..e19f83e48a 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -975,7 +975,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
 #endif
 #ifdef CONFIG_OF_BOARD_SETUP
 	/* Call the board-specific fixup routine */
-	ft_board_setup(fdt, gd->bd);
+	ft_board_setup(of_flat_tree, gd->bd);
 #endif
 #endif /* CONFIG_OF_LIBFDT */
 #if defined(CONFIG_OF_FLAT_TREE)
-- 
GitLab