From: Jerry Van Baren <gvb.uboot@gmail.com>
Date: Wed, 15 Aug 2007 15:13:15 +0000 (-0400)
Subject: Fix where the #ifdef CFG_BOOTMAPSZ is placed.
X-Git-Tag: v1.3.0-rc1~19^2~13^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=210f463c71917b7a4495c2103c228b9c179ae64d;p=oweals%2Fu-boot.git

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>
---

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 8249dceb4e..df1d0380d4 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;