summaryrefslogtreecommitdiff
path: root/board/icecube
diff options
context:
space:
mode:
authorPeter Pearse <peter.pearse@arm.com>2007-09-07 13:26:51 +0100
committerPeter Pearse <peter.pearse@arm.com>2007-09-07 13:26:51 +0100
commit470ffef72cf565c4db59352c23bd06cbfb763128 (patch)
tree8f175868f568e7f535436407f72f56198928ea7e /board/icecube
parent80767a6cead9990d9e77e62be947843c2c72f469 (diff)
parenta89cbbd27a60e6740772000fd0688ffba1c2576a (diff)
downloadu-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/icecube')
-rw-r--r--board/icecube/icecube.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/board/icecube/icecube.c b/board/icecube/icecube.c
index c027f6f..07ba245 100644
--- a/board/icecube/icecube.c
+++ b/board/icecube/icecube.c
@@ -28,10 +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>
#if defined(CONFIG_LITE5200B)
#include "mt46v32m16.h"
@@ -386,7 +383,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)
{