[U-Boot] [PATCH v2 7/8] km/common: simplify default environment

[Wolfgang Denk]

Dear Holger Brunck,

In message <0bbf514662e171fe0a8ef9b53a4819c7839e187e.1304508448.git.holger.brunck at keymile.com> you wrote:
> This is a first step to simplify the default environment. Move all
> the environment variables which are only needed for debugging
> purpose to textfiles in the scripts directory. In case of debugging
> these files can be loaded via tftp into RAM and set via the env import
> command. Other variables are identified as obsolete and were removed.
> 
> Signed-off-by: Holger Brunck <holger.brunck at keymile.com>
> Signed-off-by: Valentin Longchamp <valentin.longchamp at keymile.com>
> Acked-by: Heiko Schocher <hs at denx.de>
> cc: Wolfgang Denk <wd at denx.de>
> cc: Detlev Zundel <dzu at denx.de>
> ---
> Changes for v2:
>    - split up first large patch serie to three independent smaller
>      patch series
>    - no change in the content of this patch
> 
>  board/keymile/scripts/README               |   23 +++++
>  board/keymile/scripts/debug-arm-env.txt    |    2 +
>  board/keymile/scripts/debug-common-env.txt |    9 ++
>  board/keymile/scripts/debug-ppc-env.txt    |    2 +
>  include/configs/km/keymile-common.h        |  128 +++-------------------------
>  include/configs/km/km-powerpc.h            |   12 +--
>  include/configs/km/km_arm.h                |    5 +-
>  7 files changed, 55 insertions(+), 126 deletions(-)
>  create mode 100644 board/keymile/scripts/README
>  create mode 100644 board/keymile/scripts/debug-arm-env.txt
>  create mode 100644 board/keymile/scripts/debug-common-env.txt
>  create mode 100644 board/keymile/scripts/debug-ppc-env.txt

This does not apply cleanly:

pplying patch #94008 to current directory
Description: [U-Boot,v2,7/8] km/common: simplify default environment
Applying: km/common: simplify default environment
fatal: sha1 information is lacking or useless
(include/configs/km/keymile-common.h).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 km/common: simplify default environment


Stopping here.  Please resubmit 4/8, 7/8 and 8/8.

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
"I can call spirits from the vasty deep."
"Why so can I, or so can any man; but will they come when you do call
for them?"          - Shakespeare, 1 King Henry IV, Act III, Scene I.