[U-Boot-Users] [PATCH v2] Fix initrd/dtb interaction

[Wolfgang Denk]

In message <11870769802255-git-send-email-afleming at 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:
> 
> 1) flag the blob for relocation whenever its address is above BOOTMAPSZ
> 
> 2) If the blob is being relocated, relocate it before kbd, not initrd
> 
> Signed-off-by: Andy Fleming <afleming at 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

-- 
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
Let's say the docs present a simplified view of reality...    :-)
                      - Larry Wall in  <6940 at jpl-devvax.JPL.NASA.GOV>