summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorKim Phillips <kim.phillips@freescale.com>2007-07-17 13:56:53 -0500
committerGerald Van Baren <vanbaren@cideas.com>2007-08-10 19:21:36 -0400
commit91148bf7aeba142d6f348805db7625db7da64d6f (patch)
treebff4d899c9b484e2c91eea4d5b884edb4b62de4b /common
parente125a2ffc209dd34794e326c7175658253beadf3 (diff)
downloadu-boot-imx-91148bf7aeba142d6f348805db7625db7da64d6f.zip
u-boot-imx-91148bf7aeba142d6f348805db7625db7da64d6f.tar.gz
u-boot-imx-91148bf7aeba142d6f348805db7625db7da64d6f.tar.bz2
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>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_bootm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 981ffc5..e19f83e 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)