소스 검색

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>
Kim Phillips 18 년 전
부모
커밋
91148bf7ae
1개의 변경된 파일1개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      common/cmd_bootm.c

+ 1 - 1
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)