[U-Boot] [PATCH 0/5 v2] Command usage cleanup

[Peter Tyser]

Hi Wolfgang,

On Wed, 2009-01-28 at 22:15 +0100, Wolfgang Denk wrote:
> Dear Peter Tyser,
> 
> In message <1233100992-30871-1-git-send-email-ptyser at xes-inc.com> you wrote:
> > Changes since v1:
> > - Rebase on top of tree
> 
> Are you sure?
> 
> > This patch series attempts to clean up how the "usage" field
> > of the cmd_tbl_s structure is used.  It does 3 things:
> > 1. Adds a cmd_usage() function to print a command's usage
> > 2. Removes the command name from the usage field for all commands
> > 3. Removes newlines from the usage field of all commands
> > 
> > The benefits of these changes are:
> > 1. Command formatting in the "help" command output will always
> >    be properly aligned. A fair number of commands currently
> >    aren't properly formated, eg
> >    "cmd1 - description" vs "cmd2    - description".
> > 2. Command definitions are reduced in size/complexity. The patch
> >    shaved off 1.1KB from the XPedite5370 image for example.
> 
> Sorry, this fails on me again:
> 
> Applying: Clean up diufb command definitions
> error: patch failed: board/ads5121/ads5121_diu.c:101
> error: board/ads5121/ads5121_diu.c: patch does not apply
> error: patch failed: board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c:138
> error: board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c: patch does not apply
> Using index info to reconstruct a base tree...
> Falling back to patching base and 3-way merge...
> Auto-merged board/ads5121/ads5121_diu.c
> CONFLICT (content): Merge conflict in board/ads5121/ads5121_diu.c
> Auto-merged board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
> CONFLICT (content): Merge conflict in
> board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
> Failed to merge in the changes.
> Patch failed at 0001.
> 
> Please check once more.

You applied this patch series earlier today which explains why its
failing now:)

Best,
Peter