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

Wolfgang Denk wd at denx.de
Tue Jan 27 22:59:51 CET 2009


Dear Peter Tyser,

In message <1230746884-6510-1-git-send-email-ptyser at xes-inc.com> you wrote:
> 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.
> 
> Most of the changes were done via scripts, so let me know if
> anything looks fishy.

Dear Peter, unfortunately this patch series does not apply any more.
Patch # 3 (Standardize command usage messages with cmd_usage()) bails
out:

Applying: Standardize command usage messages with cmd_usage()
error: patch failed: common/cmd_nand.c:464
error: common/cmd_nand.c: patch does not apply
error: patch failed: common/cmd_onenand.c:28
error: common/cmd_onenand.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 common/cmd_jffs2.c
Auto-merged common/cmd_mem.c
Auto-merged common/cmd_nand.c
Auto-merged common/cmd_nvedit.c
Auto-merged common/cmd_onenand.c
CONFLICT (content): Merge conflict in common/cmd_onenand.c
Auto-merged common/main.c
Failed to merge in the changes.
Patch failed at 0003.


Can you please rebase these patches and resubmit?

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
All a hacker needs is a tight PUSHJ, a loose pair of UUOs, and a warm
place to shift.


More information about the U-Boot mailing list