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

---
 common/cmd_bootm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index c8825b6..bf21919 100644
@@ -982,7 +982,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)

1.5.2.2

Hi Kim & Co,

I've applied your patches and rebased against the master u-boot repo (had a minor merge conflict with common/cmd_bootm.c with the show_boot_progress() changes - NBD).

Thanks again,
gvb

Say it isn't so!

Oh, alright. That's the upcoming fate, I'm afraid... :-)

jdl

The conflict was with Heiko Schocher's patch "make show_boot_progress () weak." I moved one of the SHOW_BOOT_PROGRESS calls as part of the cmd_bootm.c reordering and that confused patch, it was unable to make the leap. :-) NBD.

gvb