diff options
author | Andy Fleming <afleming@freescale.com> | 2007-10-19 11:24:22 -0500 |
---|---|---|
committer | Andrew Fleming-AFLEMING <afleming@freescale.com> | 2007-10-19 11:24:22 -0500 |
commit | d4d1e9bee7c45ea8c513d3af697c864107f1c4d1 (patch) | |
tree | 3cd7eba359e6729454f4fac5b96209eb959ecf72 /board/jupiter/jupiter.c | |
parent | 1487adbdcf9594bb2eb686325a6f9540dad1b70a (diff) | |
parent | 27d2b1ed216b457a66c17d38ce5ffdf3c2c32d1e (diff) | |
download | u-boot-imx-d4d1e9bee7c45ea8c513d3af697c864107f1c4d1.zip u-boot-imx-d4d1e9bee7c45ea8c513d3af697c864107f1c4d1.tar.gz u-boot-imx-d4d1e9bee7c45ea8c513d3af697c864107f1c4d1.tar.bz2 |
Merge branch 'denx'
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) { |