On 10/22/14 20:53, Jordan Justen wrote: > On Wed, Oct 22, 2014 at 11:32 AM, Laszlo Ersek <[email protected]> wrote: >> On 10/18/14 20:25, Jordan Justen wrote: >>> The BaseTools/Scripts/ConvertMasmToNasm.py script was used to convert >>> X64/SecEntry.asm to X64/SecEntry.nasm >>> >>> Contributed-under: TianoCore Contribution Agreement 1.0 >>> Signed-off-by: Jordan Justen <[email protected]> >>> --- >>> OvmfPkg/Sec/SecMain.inf | 6 +-- >>> OvmfPkg/Sec/X64/SecEntry.S | 56 >>> ------------------------- >>> OvmfPkg/Sec/X64/{SecEntry.asm => SecEntry.nasm} | 18 ++++---- >>> 3 files changed, 11 insertions(+), 69 deletions(-) >>> delete mode 100644 OvmfPkg/Sec/X64/SecEntry.S >>> rename OvmfPkg/Sec/X64/{SecEntry.asm => SecEntry.nasm} (81%) >>> >>> diff --git a/OvmfPkg/Sec/SecMain.inf b/OvmfPkg/Sec/SecMain.inf >>> index e823796..4ac431b 100644 >>> --- a/OvmfPkg/Sec/SecMain.inf >>> +++ b/OvmfPkg/Sec/SecMain.inf >>> @@ -36,9 +36,9 @@ >>> Ia32/SecEntry.nasm| GCC >>> >>> [Sources.X64] >>> - X64/SecEntry.asm | MSFT >>> - X64/SecEntry.asm | INTEL >>> - X64/SecEntry.S | GCC >>> + X64/SecEntry.nasm | MSFT >>> + X64/SecEntry.nasm | INTEL >>> + X64/SecEntry.nasm | GCC >> >> Liming's remark applies. > > Unfortunately, ConvertMasmToNasm.py is not smart enough to handle this. > > I did make the script collapse things like: > X64/SecEntry.asm > X64/SecEntry.S > into: > X64/SecEntry.nasm > > I'd like to leave the commit created by the script intact, but I could > add a separate commit to clean this up.
That's fine with me -- you can add my R-b and just tack on some more patches. Thanks Laszlo ------------------------------------------------------------------------------ _______________________________________________ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
