On 05/13/14 14:22, David Woodhouse wrote: > On Mon, 2014-05-12 at 18:42 +0200, Laszlo Ersek wrote: >> On 05/12/14 16:00, David Woodhouse wrote: >>> The addition of UmaAddress/UmaSize fields allows the CSM to have >>> writable memory between the top of the option ROMs and the start of >>> its read-only code segment. >>> >>> The HiPermanentMemoryAddress/HiPermanentMemorySize fields added in the >>> new spec are also added to the table, but not yet supported. >>> >>> Contributed-under: TianoCore Contribution Agreement 1.0 >>> Signed-off-by: David Woodhouse <david.woodho...@intel.com> >>> --- >>> .../Csm/LegacyBiosDxe/LegacyBootSupport.c | 18 >>> ++++++++++++++++++ >>> .../Csm/LegacyBiosDxe/LegacyPci.c | 12 ++++++++++-- >>> IntelFrameworkPkg/Include/Protocol/LegacyBios.h | 20 >>> ++++++++++++++++++++ >>> 3 files changed, 48 insertions(+), 2 deletions(-) >> >> I could be doing something wrong, but the patch doesn't seem to apply: > > It's a horrid mixture of the patch being quoted-printed encoded (which > git-am can usually cope with), and the source code having CRLF line > endings, and the gods hating me. > > I used to know how to cope with this mess, but I've blanked it out > because it was too traumatic. We really just need to move to git as soon > as possible so that we can send pull requests.
Agree on the second point. Re the first, I have these .git/config settings in my git-svn clone: [core] whitespace = cr-at-eol [am] keepcr = true [diff] renames = false That said, I tried to apply the patch with 'git am --ignore-whitespace', and it didn't work either. So probably something with quoted-printable indeed. > It's the patch at the tip of > http://git.infradead.org/users/dwmw2/edk2.git (and doesn't depend on any > of the earlier patches there). It's the same patch I've had for ages; > nothing's changed except that I *finally* got round to submitting it now > that the spec update is published. Right, I could find and download the v0.98 spec as soon as I saw your patch. Thanks! Laszlo ------------------------------------------------------------------------------ "Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE Instantly run your Selenium tests across 300+ browser/OS combos. Get unparalleled scalability from the best Selenium testing platform available Simple to use. Nothing to install. Get started now for free." http://p.sf.net/sfu/SauceLabs _______________________________________________ edk2-devel mailing list edk2-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/edk2-devel