GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-30 19:11:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix where the #ifdef CFG_BOOTMAPSZ is placed.

Browse source 
Commit 073e1b5099 "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>
This commit is contained in:
Jerry Van Baren 2007-08-15 11:13:15 -04:00 • committed by Wolfgang Denk
parent 594e79838c
commit 210f463c71
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/cmd_bootm.c
View file

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