summaryrefslogtreecommitdiff
path: root/board/jupiter/jupiter.c
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2007-09-11 00:29:27 +0200
committerMichal Simek <monstr@monstr.eu>2007-09-11 00:29:27 +0200
commit9c73f4b81172bc9f1b8f132450e69bcfb5b960ca (patch)
treeb20402ff5f80a91423b9d444ba5b947d36cd06ff /board/jupiter/jupiter.c
parent78cff50edba6b1508eb15c2f53ce966ac891eb9e (diff)
parente251e00d0db4b36d1d2b7e38fec43a7296b529a2 (diff)
downloadu-boot-imx-9c73f4b81172bc9f1b8f132450e69bcfb5b960ca.zip
u-boot-imx-9c73f4b81172bc9f1b8f132450e69bcfb5b960ca.tar.gz
u-boot-imx-9c73f4b81172bc9f1b8f132450e69bcfb5b960ca.tar.bz2
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'board/jupiter/jupiter.c')
-rw-r--r--board/jupiter/jupiter.c8
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)
{