Skip to contentSkip to conversation

Fix of_data copying for CONFIG_OF_FLAT_TREE-using boards

PATCH New Andy Fleming 3 participants 4 messages Aug 15, 2007 – Aug 16, 2007

lore
Share & tools
lore

Andy Fleming

author
#0 lore raw

PATCH 1/1 Fix of_data copying for CONFIG_OF_FLAT_TREE-using boards

The fix, "Fix where the #ifdef CFG_BOOTMAPSZ is placed" neglected to *also* put the code inside the similar #ifdef for CONFIG_OF_FLAT_TREE.

Signed-off-by Andy Fleming <[email protected]>
---
 common/cmd_bootm.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
common/cmd_bootm.c +9 -0
index df1d038..90e3f8b 100644
@@ -987,6 +987,15 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
 #endif
 #endif /* CONFIG_OF_LIBFDT */
 #if defined(CONFIG_OF_FLAT_TREE)
+#ifdef CFG_BOOTMAPSZ
+	/*
+	 * The blob must be within CFG_BOOTMAPSZ,
+	 * so we flag it to be copied if it is not.
+	 */
+	if (of_flat_tree >= (char *)CFG_BOOTMAPSZ)
+		of_data = of_flat_tree;
+#endif
+
 	/* move of_flat_tree if needed */
 	if (of_data) {
 		ulong of_start, of_len;
Signature · 1 line
1.5.0.2.230.gfbe3d-dirty
#1 lore raw

PATCH 1/1 Fix of_data copying for CONFIG_OF_FLAT_TREE-using boards

Quoted 5 lines · Andy Fleming

The fix, "Fix where the #ifdef CFG_BOOTMAPSZ is placed" neglected to *also* put the code inside the similar #ifdef for CONFIG_OF_FLAT_TREE.

Signed-off-by Andy Fleming <[email protected]>

I figured if you weren't interested in the CONFIG_OF_FLAT_TREE case, I *definitely* wasn't. ;-)

gvb

Quoted 24 lines
---
 common/cmd_bootm.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
common/cmd_bootm.c +9 -0
index df1d038..90e3f8b 100644
@@ -987,6 +987,15 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
 #endif
 #endif /* CONFIG_OF_LIBFDT */
 #if defined(CONFIG_OF_FLAT_TREE)
+#ifdef CFG_BOOTMAPSZ
+	/*
+	 * The blob must be within CFG_BOOTMAPSZ,
+	 * so we flag it to be copied if it is not.
+	 */
+	if (of_flat_tree >= (char *)CFG_BOOTMAPSZ)
+		of_data = of_flat_tree;
+#endif
+
 	/* move of_flat_tree if needed */
 	if (of_data) {
 		ulong of_start, of_len;
#2 lore raw

PATCH 1/1 Fix of_data copying for CONFIG_OF_FLAT_TREE-using boards

Quoted 9 lines · Jerry Van Baren
Quoted 5 lines · Andy Fleming

The fix, "Fix where the #ifdef CFG_BOOTMAPSZ is placed" neglected to *also* put the code inside the similar #ifdef for CONFIG_OF_FLAT_TREE.

Signed-off-by Andy Fleming <[email protected]>

I figured if you weren't interested in the CONFIG_OF_FLAT_TREE case, I *definitely* wasn't. ;-)

Oops, you _did_ have it in _all_ build configurations and my change moved it to only one configuration, so it _was_ my fault that it dropped out of the CONFIG_OF_FLAT_TREE case.

As the saying goes: it is better to sit silently and have people think you are stupid than to hit the <send> button and confirm it...

gvb

Applied
#3 lore raw

PATCH 1/1 Fix of_data copying for CONFIG_OF_FLAT_TREE-using boards

In reply to Andy Fleming
Quoted 5 lines · In message <[email protected]> you wrote:

The fix, "Fix where the #ifdef CFG_BOOTMAPSZ is placed" neglected to *also* put the code inside the similar #ifdef for CONFIG_OF_FLAT_TREE.

Signed-off-by Andy Fleming <[email protected]>

Applied. Thanks.

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
 The software required `Windows 95 or better', so I installed Linux.