summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerry Van Baren <gvb.uboot@gmail.com>2007-08-15 11:13:15 -0400
committerWolfgang Denk <wd@denx.de>2007-08-15 17:44:08 +0200
commit210f463c71917b7a4495c2103c228b9c179ae64d (patch)
treee8ed2d4bcf0267fffb51372f1eb02acb9a3a0651
parent594e79838ce5078a90d0c27abb2b2d61d5f8e8a7 (diff)
downloadu-boot-imx-210f463c71917b7a4495c2103c228b9c179ae64d.zip
u-boot-imx-210f463c71917b7a4495c2103c228b9c179ae64d.tar.gz
u-boot-imx-210f463c71917b7a4495c2103c228b9c179ae64d.tar.bz2
Fix where the #ifdef CFG_BOOTMAPSZ is placed.
Commit 073e1b509980cefe6f53c2d7fbbcd135df1e3924 "Fix initrd/dtb interaction" put the new code outside of the #if defined(CONFIG_OF_LIBFDT) when it should have gone inside of the conditional. As a result, it broke non-LIBFDT board builds. Also added a missing "not." to the comment. Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
-rw-r--r--common/cmd_bootm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 8249dce..df1d038 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -924,16 +924,17 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
initrd_end = 0;
}
+#if defined(CONFIG_OF_LIBFDT)
+
#ifdef CFG_BOOTMAPSZ
/*
* The blob must be within CFG_BOOTMAPSZ,
- * so we flag it to be copied if it is
+ * so we flag it to be copied if it is not.
*/
if (of_flat_tree >= (char *)CFG_BOOTMAPSZ)
of_data = of_flat_tree;
#endif
-#if defined(CONFIG_OF_LIBFDT)
/* move of_flat_tree if needed */
if (of_data) {
int err;