In message 11870769802255-git-send-email-afleming@freescale.com you wrote:
The original code would wrongly relocate the blob to be right before the initrd if it existed. The blob *must* be within CFG_BOOTMAPSZ, if it is defined. So we make two changes:
flag the blob for relocation whenever its address is above BOOTMAPSZ
If the blob is being relocated, relocate it before kbd, not initrd
Signed-off-by: Andy Fleming afleming@freescale.com
Sorry:
error: patch failed: common/cmd_bootm.c:925 error: common/cmd_bootm.c: patch does not apply Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merged common/cmd_bootm.c CONFLICT (content): Merge conflict in common/cmd_bootm.c Failed to merge in the changes. Patch failed at 0001.
Can you please redo the patch against current code?
Best regards,
Wolfgang Denk