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/jupiter/jupiter.c | |
parent | 80767a6cead9990d9e77e62be947843c2c72f469 (diff) | |
parent | a89cbbd27a60e6740772000fd0688ffba1c2576a (diff) | |
download | u-boot-imx-470ffef72cf565c4db59352c23bd06cbfb763128.zip u-boot-imx-470ffef72cf565c4db59352c23bd06cbfb763128.tar.gz u-boot-imx-470ffef72cf565c4db59352c23bd06cbfb763128.tar.bz2 |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'board/jupiter/jupiter.c')
-rw-r--r-- | board/jupiter/jupiter.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/board/jupiter/jupiter.c b/board/jupiter/jupiter.c index b227487..efdc333 100644 --- a/board/jupiter/jupiter.c +++ b/board/jupiter/jupiter.c @@ -28,11 +28,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> #define SDRAM_DDR 0 #if 1 @@ -308,7 +304,7 @@ void ide_set_reset (int idereset) } #endif -#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) { |