[U-Boot] [PATCH 1/2 v2] 8xx, kup4: minor configuration changes

[Wolfgang Denk]

Dear Heiko Schocher,

In message <4C444176.2050806 at denx.de> you wrote:
> - nfs-options removed
> - hda->sda changed
> - mtd parts added
> - loadaddress changed
> - cmd-line length increased
> - lcd stuff removed
> - code cleanup
> 
> Signed-off-by: Klaus Heydeck <heydeck at kieback-peter.de>
> ---
> 
> - changes since v1:
>   - added comments from Wolfgang Denk
>     - fix Codingstyle issues
> - rebased against current mainline
> 
>  board/kup/common/kup.c     |   54 ++++--
>  board/kup/common/kup.h     |   44 +++--
>  board/kup/kup4k/kup4k.c    |  439 +++++++++++++++++---------------------------
>  board/kup/kup4k/s1d13706.h |  174 -----------------
>  board/kup/kup4x/kup4x.c    |  265 ++++++++-------------------
>  include/configs/KUP4K.h    |  169 ++++++++++--------
>  include/configs/KUP4X.h    |   64 ++++----
>  7 files changed, 426 insertions(+), 783 deletions(-)
>  delete mode 100644 board/kup/kup4k/s1d13706.h

Applied, thanks.

Heiko, I had some merge conflicts in board/kup/kup4k/kup4k.c

could you please check that the result is what you expect?

Thanks.

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
Es ist offensichtlich, dass das menschliche Gehirn wie  ein  Computer
funktioniert.  Da  es  keine  dummen Computer gibt, gibt es also auch
keine dummen Menschen. Nur ein paar Leute, die unter DOS laufen.
                                                       -- <unbekannt>