summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMarian Balakowicz <m8@semihalf.com>2008-01-31 13:20:07 +0100
committerWolfgang Denk <wd@denx.de>2008-02-07 01:12:57 +0100
commit4a2ad5ff6400698433dd7203d34939c3c9cc9bff (patch)
tree1c5953aac357ee20788405f9597dede123b66311 /common
parent82850f3d32a2661868ec6876bed7a22c55cef718 (diff)
downloadu-boot-imx-4a2ad5ff6400698433dd7203d34939c3c9cc9bff.zip
u-boot-imx-4a2ad5ff6400698433dd7203d34939c3c9cc9bff.tar.gz
u-boot-imx-4a2ad5ff6400698433dd7203d34939c3c9cc9bff.tar.bz2
[new uImage] Remove OF_FLAT_TREE support from PPC bootm code
Support for OF_FLAT_TREE is to be obsoleted in the near future, remove related code from the bootm routines. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_bootm.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index f441e0e..3390be7 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -36,14 +36,6 @@
#include <environment.h>
#include <asm/byteorder.h>
-#if defined(CONFIG_OF_LIBFDT)
-#include <fdt.h>
-#include <libfdt.h>
-#include <fdt_support.h>
-#elif defined(CONFIG_OF_FLAT_TREE)
-#include <ft_build.h>
-#endif
-
#if defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
#include <rtc.h>
#endif
@@ -390,7 +382,7 @@ U_BOOT_CMD(
"[addr [arg ...]]\n - boot application image stored in memory\n"
"\tpassing arguments 'arg ...'; when booting a Linux kernel,\n"
"\t'arg' can be the address of an initrd image\n"
-#if defined(CONFIG_OF_FLAT_TREE) || defined(CONFIG_OF_LIBFDT)
+#if defined(CONFIG_OF_LIBFDT)
"\tWhen booting a Linux kernel which requires a flat device-tree\n"
"\ta third argument is required which is the address of the\n"
"\tdevice-tree blob. To boot that kernel without an initrd image,\n"