Wolfgang,
On Thu, 2009-07-23 at 21:15 +0200, Wolfgang Denk wrote:
Dear =?ISO-8859-1?Q?Andr=E9?= Schwarz,
In message 1247842785.3953.90.camel@swa-m460 you wrote:
This patch adds and uses common code for all Matrix Vision boards.
Signed-off-by: Andr=C3=A9 Schwarz andre.schwarz@matrix-vision.de
Heiko's comments have been addressed and common/mv_common.h has been included where needed.
board/matrix_vision/common/Makefile | 54 ++++++++++++++ board/matrix_vision/common/mv_common.c | 125 ++++++++++++++++++++++++++++++++ board/matrix_vision/common/mv_common.h | 25 +++++++ board/matrix_vision/mvbc_p/mvbc_p.c | 76 +------------------- board/matrix_vision/mvblm7/mvblm7.c | 38 +++------- board/matrix_vision/mvblm7/pci.c | 35 ++-------- include/configs/MVBC_P.h | 14 +++- include/configs/MVBLM7.h | 49 +++++-------- 8 files changed, 254 insertions(+), 162 deletions(-)
Sorry, this patch doesn't apply:
hmm - something went wrong. Maybe it's because of the patches have been applied by both Kim and you. A fresh git-clone gives me non-working binaries for both mvBC-P and mvBL-M7. The new board/matrix-vision/common directory is missing completely.
Most probably the patches have been built the wrong way by me :-(
/home/wd/git/u-boot/work/.git/rebase-apply/patch:179: trailing whitespace.
error: patch failed: include/configs/MVBC_P.h:68 error: include/configs/MVBC_P.h: patch does not apply fatal: sha1 information is lacking or useless (board/matrix_vision/mvbc_p/mvbc_p.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001.
Please clean up and resubmit.
I'll send a single patch fixing both boards in a few minutes.
Best regards,
Wolfgang Denk
Regards, André
MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler Registergericht: Amtsgericht Stuttgart, HRB 271090 Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner, Hans-Joachim Reich