diff options
author | Peter Pearse <peter.pearse@arm.com> | 2007-09-07 13:26:51 +0100 |
---|---|---|
committer | Peter Pearse <peter.pearse@arm.com> | 2007-09-07 13:26:51 +0100 |
commit | 470ffef72cf565c4db59352c23bd06cbfb763128 (patch) | |
tree | 8f175868f568e7f535436407f72f56198928ea7e /board/tqm5200 | |
parent | 80767a6cead9990d9e77e62be947843c2c72f469 (diff) | |
parent | a89cbbd27a60e6740772000fd0688ffba1c2576a (diff) |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'board/tqm5200')
-rw-r--r-- | board/tqm5200/tqm5200.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/board/tqm5200/tqm5200.c b/board/tqm5200/tqm5200.c index 51f4aebc06..21f67aa4e5 100644 --- a/board/tqm5200/tqm5200.c +++ b/board/tqm5200/tqm5200.c @@ -31,10 +31,7 @@ #include <mpc5xxx.h> #include <pci.h> #include <asm/processor.h> - -#if defined(CONFIG_OF_FLAT_TREE) -#include <ft_build.h> -#endif +#include <libfdt.h> #ifdef CONFIG_VIDEO_SM501 #include <sm501.h> @@ -780,9 +777,9 @@ int board_get_height (void) #endif /* CONFIG_VIDEO_SM501 */ -#if defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP) +#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) void ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); } -#endif /* defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP) */ +#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */ |