summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMarian Balakowicz <m8@semihalf.com>2008-01-08 18:11:43 +0100
committerWolfgang Denk <wd@denx.de>2008-02-07 01:12:55 +0100
commitd45d5a18b6b36688f2365623f9d550566c664b5b (patch)
tree1e81ef9d3907ba39bbd074a3b1523448b85b4f5b /common
parent5d3cc55ecbae277e08f5ff771da20b1d6a36ec36 (diff)
downloadu-boot-imx-d45d5a18b6b36688f2365623f9d550566c664b5b.zip
u-boot-imx-d45d5a18b6b36688f2365623f9d550566c664b5b.tar.gz
u-boot-imx-d45d5a18b6b36688f2365623f9d550566c664b5b.tar.bz2
[new uImage] Cleanup OF/FDT #if/#elif/#endif use in do_bootm_linux()
Make CONFIG_OF_LIBFDT and CONFIG_OF_FLAT_TREE use more readable in PPC variant of do_bootm_linux() routine. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_bootm.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index e61a304..5f1b6b6 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -40,8 +40,7 @@
#include <fdt.h>
#include <libfdt.h>
#include <fdt_support.h>
-#endif
-#if defined(CONFIG_OF_FLAT_TREE)
+#elif defined(CONFIG_OF_FLAT_TREE)
#include <ft_build.h>
#endif