Dear Kumar Gala, In message <[EMAIL PROTECTED]> you wrote: > Each architecture has different ways of determine what regions of memory > might not be valid to get overwritten when we boot. This provides a > hook to allow them to reserve any regions they care about. Currently > only ppc, m68k and sparc need/use this. > > Signed-off-by: Kumar Gala <[EMAIL PROTECTED]> > --- > > For some reason I had two commits in my tree and the cmd_bootm.c changes > didn't > make it out. > > - k > > common/cmd_bootm.c | 7 +++++++ > lib_m68k/bootm.c | 29 ++++++++++++++++------------- > lib_ppc/bootm.c | 50 ++++++++++++++++++++++++++++---------------------- > lib_sparc/bootm.c | 16 +++++++++------- > 4 files changed, 60 insertions(+), 42 deletions(-)
Tried to apply to "next" branch as requested, but this fails with non-trivial merge conflicts: Applying Added arch_lmb_reserve to allow arch specific memory regions protection error: patch failed: lib_m68k/bootm.c:74 error: lib_m68k/bootm.c: patch does not apply error: patch failed: lib_ppc/bootm.c:55 error: lib_ppc/bootm.c: patch does not apply error: patch failed: lib_sparc/bootm.c:124 error: lib_sparc/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 Auto-merged lib_m68k/bootm.c CONFLICT (content): Merge conflict in lib_m68k/bootm.c Auto-merged lib_ppc/bootm.c Auto-merged lib_sparc/bootm.c CONFLICT (content): Merge conflict in lib_sparc/bootm.c Failed to merge in the changes. Patch failed at 0001. 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: [EMAIL PROTECTED] Program maintenance is an entropy-increasing process, and even its most skilfull execution only delays the subsidence of the system into unfixable obsolescence. - Fred Brooks, "The Mythical Man Month" _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
