Skip to content
Snippets Groups Projects
Commit 210f463c authored by Jerry Van Baren's avatar Jerry Van Baren Committed by Wolfgang Denk
Browse files

Fix where the #ifdef CFG_BOOTMAPSZ is placed.


Commit 073e1b50 "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: default avatarGerald Van Baren <vanbaren@cideas.com>
parent 594e7983
No related branches found
No related tags found
No related merge requests found
...@@ -924,16 +924,17 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, ...@@ -924,16 +924,17 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
initrd_end = 0; initrd_end = 0;
} }
#if defined(CONFIG_OF_LIBFDT)
#ifdef CFG_BOOTMAPSZ #ifdef CFG_BOOTMAPSZ
/* /*
* The blob must be within 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) if (of_flat_tree >= (char *)CFG_BOOTMAPSZ)
of_data = of_flat_tree; of_data = of_flat_tree;
#endif #endif
#if defined(CONFIG_OF_LIBFDT)
/* move of_flat_tree if needed */ /* move of_flat_tree if needed */
if (of_data) { if (of_data) {
int err; int err;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment