Dear Wolfgang,
The reason is I tried to apply the patch on top of 1) "master" branch of the mainline U-Boot 2) current "master" of u-boot-at91.git 3) The old "master" of u-boot-at91.git all of them are failed.
Since you said the patch is cleanly against master of mainline U-Boot, I'll rework.
Thanks.
BR, Eric
-----Original Message----- From: Wolfgang Denk [mailto:wd@denx.de] Sent: 2010-7-5 (星期一) 17:59 To: Xu, Hong Cc: reinhard.meyer@emk-elektronik.de; u-boot Subject: Re: [U-Boot] [PATCH] AT91SAM9260/9XE: add support for MultiMedia Card Interface (MCI)
Dear Eric Xu,
In message 4C31770B.1020407@atmel.com you wrote:
Could you please rebase your code to master@ git://git.denx.de/u-boot-at91.git ?
Why are you requesting this?
I do not want a situation that patches need to be submitted agaionst a number of different trees or branches, with the unavoidable result that the majority of readers here on the list cannot test the postings bcause they do not apply against the master repository.
Because of that, http://www.denx.de/wiki/U-Boot/Patches states explicitly:
Please use the "master" branch of the mainline U-Boot git repository (git://git.denx.de/u-boot.git) as reference, unless (usually late in a release cycle) there has been an announcement to use the "next" branch of this repository instead.
If your AT91 repository requires a different state, it is your task as custodian to keep it in sync with master, and to resolve any merge conflicts resulting from the remaining differences.
Reinhards patch appears to apply cleanly against master, so it should NOT be changed.
Thanks.
Best regards,
Wolfgang Denk