The first patch obviously needs to be made to edk2-buildtools/BaseTools first, and then sync'd to EDK II.
The first 6 patches change OVMF to build VTF0 during the EDK II build process by running NASM. The UefiCpuPkg VTF0 patches are not ready yet, since the X64 page tables are not being built. (They previously were built by FixupForRawSection.py.) The last patch provides an implementation of the old style VTF which can be built during the EDK II build process using NASM. These patches are available in the 'nasm-vtf' branch of the git repo at https://github.com/jljusten/edk2. The web page for this branch also provides a .zip download: https://github.com/jljusten/edk2/commits/nasm-vtf Jordan Justen (7): BaseTools: Add rules to build NASM into a binary UefiCpuPkg: Support building VTF0 ResetVector during the EDK II build OvmfPkg: Support building OVMF's ResetVector during the EDK II build OvmfPkg: Build OVMF ResetVector during EDK II build process UefiCpuPkg VTF0: Remove pre-built binaries OvmfPkg/ResetVector: Remove pre-built binaries UefiCpuPkg: Add ResetVector/OldVtf BaseTools/Conf/build_rule.template | 19 +++- BaseTools/Conf/tools_def.template | 8 +- OvmfPkg/OvmfPkgIa32.dsc | 2 + OvmfPkg/OvmfPkgIa32.fdf | 6 +- OvmfPkg/OvmfPkgIa32X64.dsc | 2 + OvmfPkg/OvmfPkgIa32X64.fdf | 6 +- OvmfPkg/OvmfPkgX64.dsc | 2 + OvmfPkg/OvmfPkgX64.fdf | 6 +- OvmfPkg/ResetVector/Bin/ResetVector.inf | 29 ------ OvmfPkg/ResetVector/Bin/ResetVector.x64.raw | Bin 628 -> 0 bytes OvmfPkg/ResetVector/Build.py | 58 ----------- OvmfPkg/ResetVector/ResetVector.inf | 37 +++++++ OvmfPkg/ResetVector/ResetVector.nasmbin | 53 ++++++++++ OvmfPkg/ResetVector/Tools/FixupForRawSection.py | 26 ----- UefiCpuPkg/ResetVector/OldVtf/Vtf.inf | 32 ++++++ UefiCpuPkg/ResetVector/OldVtf/Vtf.nasmbin | 60 +++++++++++ .../Vtf0/Bin/ResetVector.ia32.port80.raw | Bin 516 -> 0 bytes .../ResetVector/Vtf0/Bin/ResetVector.ia32.raw | Bin 484 -> 0 bytes .../Vtf0/Bin/ResetVector.ia32.serial.raw | Bin 884 -> 0 bytes UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf | 33 ------- .../Vtf0/Bin/ResetVector.x64.port80.raw | Bin 28676 -> 0 bytes .../ResetVector/Vtf0/Bin/ResetVector.x64.raw | Bin 28676 -> 0 bytes .../Vtf0/Bin/ResetVector.x64.serial.raw | Bin 28676 -> 0 bytes UefiCpuPkg/ResetVector/Vtf0/Build.py | 53 ---------- .../ResetVector/Vtf0/Tools/FixupForRawSection.py | 110 --------------------- UefiCpuPkg/ResetVector/Vtf0/Vtf0.inf | 36 +++++++ UefiCpuPkg/ResetVector/Vtf0/Vtf0.nasmbin | 53 ++++++++++ 27 files changed, 311 insertions(+), 320 deletions(-) delete mode 100644 OvmfPkg/ResetVector/Bin/ResetVector.inf delete mode 100644 OvmfPkg/ResetVector/Bin/ResetVector.x64.raw delete mode 100644 OvmfPkg/ResetVector/Build.py create mode 100644 OvmfPkg/ResetVector/ResetVector.inf create mode 100644 OvmfPkg/ResetVector/ResetVector.nasmbin delete mode 100644 OvmfPkg/ResetVector/Tools/FixupForRawSection.py create mode 100644 UefiCpuPkg/ResetVector/OldVtf/Vtf.inf create mode 100644 UefiCpuPkg/ResetVector/OldVtf/Vtf.nasmbin delete mode 100644 UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.port80.raw delete mode 100644 UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.raw delete mode 100644 UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.serial.raw delete mode 100644 UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf delete mode 100644 UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.port80.raw delete mode 100644 UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.raw delete mode 100644 UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.x64.serial.raw delete mode 100644 UefiCpuPkg/ResetVector/Vtf0/Build.py delete mode 100644 UefiCpuPkg/ResetVector/Vtf0/Tools/FixupForRawSection.py create mode 100644 UefiCpuPkg/ResetVector/Vtf0/Vtf0.inf create mode 100644 UefiCpuPkg/ResetVector/Vtf0/Vtf0.nasmbin -- 2.0.0.rc2 ------------------------------------------------------------------------------ "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
