[U-Boot] [PATCH] POST: Remove duplicated post_hotkey_pressed() functions

[Wolfgang Denk]

Dear Stefan Roese,

In message <1256906335-6477-1-git-send-email-sr at denx.de> you wrote:
> This patch introduces a weak default function for post_hotkey_pressed(),
> returning 0, for boards without hotkey support. The long-running tests
> won't be started on those boards. This default function was implemented
> in many board directories. By implementing this weak default we can
> remove all those duplicate versions.
> 
> Boards with hotkey support, can override this weak default function
> by defining one in their board specific code.
> 
> Signed-off-by: Stefan Roese <sr at denx.de>
> ---
>  board/amcc/katmai/katmai.c    |   11 -----------
>  board/amcc/kilauea/kilauea.c  |   11 -----------
>  board/amcc/makalu/makalu.c    |   11 -----------
>  board/amcc/ocotea/ocotea.c    |   12 ------------
>  board/amcc/sequoia/sequoia.c  |   11 -----------
>  board/amcc/taishan/taishan.c  |   11 -----------
>  board/amcc/yucca/yucca.c      |   11 -----------
>  board/cm5200/cm5200.c         |    8 --------
>  board/esd/pmc440/pmc440.c     |   11 -----------
>  board/gen860t/gen860t.c       |   11 -----------
>  board/korat/korat.c           |   11 -----------
>  board/kup/common/kup.c        |   11 -----------
>  board/mpl/mip405/mip405.c     |   11 -----------
>  board/netstal/hcu4/hcu4.c     |   11 -----------
>  board/netstal/hcu5/hcu5.c     |   11 -----------
>  board/netstal/mcu25/mcu25.c   |   11 -----------
>  board/netta/netta.c           |   11 -----------
>  board/prodrive/alpr/alpr.c    |   12 ------------
>  board/sacsng/sacsng.c         |   12 ------------
>  board/ssv/adnpesc1/adnpesc1.c |   11 -----------
>  board/uc100/uc100.c           |   12 ------------
>  post/post.c                   |   16 ++++++++++++++++
>  22 files changed, 16 insertions(+), 232 deletions(-)

Sorry, but this patch does not apply - please rebase against the
"next" branch and resubmit:

Applying: POST: Remove duplicated post_hotkey_pressed() functions
error: patch failed: board/amcc/kilauea/kilauea.c:366
error: board/amcc/kilauea/kilauea.c: patch does not apply
error: patch failed: board/amcc/makalu/makalu.c:322
error: board/amcc/makalu/makalu.c: patch does not apply
error: patch failed: board/amcc/sequoia/sequoia.c:530
error: board/amcc/sequoia/sequoia.c: patch does not apply
error: patch failed: board/amcc/taishan/taishan.c:302
error: board/amcc/taishan/taishan.c: patch does not apply
error: patch failed: board/korat/korat.c:769
error: board/korat/korat.c: patch does not apply
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging board/amcc/katmai/katmai.c
Auto-merging board/amcc/kilauea/kilauea.c
CONFLICT (content): Merge conflict in board/amcc/kilauea/kilauea.c
Auto-merging board/amcc/makalu/makalu.c
CONFLICT (content): Merge conflict in board/amcc/makalu/makalu.c
Auto-merging board/amcc/ocotea/ocotea.c
Auto-merging board/amcc/sequoia/sequoia.c
CONFLICT (content): Merge conflict in board/amcc/sequoia/sequoia.c
Auto-merging board/amcc/taishan/taishan.c
CONFLICT (content): Merge conflict in board/amcc/taishan/taishan.c
Auto-merging board/amcc/yucca/yucca.c
Auto-merging board/esd/pmc440/pmc440.c
Auto-merging board/korat/korat.c
CONFLICT (content): Merge conflict in board/korat/korat.c
Auto-merging board/netstal/hcu5/hcu5.c
Auto-merging board/prodrive/alpr/alpr.c
Failed to merge in the changes.
Patch failed at 0001 POST: Remove duplicated post_hotkey_pressed() functions


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
The high cost of living hasn't affected its popularity.