On Fri, Apr 25, 2008 at 9:16 AM, Wolfgang Denk wd@denx.de wrote:
In message 480B00F4.6030406@gmail.com you wrote:
This patch enables SPI and MC13783/RTC support for the Litekit board.
Signed-off-by: Magnus Lilja lilja.magnus@gmail.com
board/imx31_litekit/imx31_litekit.c | 12 ++++++++++++ include/configs/imx31_litekit.h | 8 ++++++++ 2 files changed, 20 insertions(+), 0 deletions(-)
Does not apply:
Applying i.MX31: Enable SPI and MC13783/RTC support for the Litekit board error: patch failed: board/imx31_litekit/imx31_litekit.c:52 error: board/imx31_litekit/imx31_litekit.c: patch does not apply fatal: sha1 information is lacking or useless (board/imx31_litekit/imx31_litekit.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001.
Please rebase and resubmit.
Wolfgang,
It applies nicely to your currently published U-Boot-tree (after the refresh you did earlier today). So perhaps you could try again.
It was my fault it didn't apply earlier (the patch required that one of my other patches had been applied), I'm still learning my way around git/stgit and how things are merged.
Thanks, Magnus Lilja