From d59326d3a871f1df6e9416334ca2181ac4373d42 Mon Sep 17 00:00:00 2001 From: andrewfish Date: Tue, 31 May 2011 20:23:36 +0000 Subject: Add BlockIO support to the emulator, still needs testing. Also update Emulator start code to only pass 2 args in place of 3. The 3rd argument is not needed. Still need a function as the BaseLib functoin does not have the correct calling conventions. Cleanup build script for binary shell case. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11718 6f19259b-4bc3-4df7-8a09-765794883524 --- InOsEmuPkg/Unix/UnixX64.fdf | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'InOsEmuPkg/Unix/UnixX64.fdf') diff --git a/InOsEmuPkg/Unix/UnixX64.fdf b/InOsEmuPkg/Unix/UnixX64.fdf index 0ba58a39d0..14e5b6022a 100644 --- a/InOsEmuPkg/Unix/UnixX64.fdf +++ b/InOsEmuPkg/Unix/UnixX64.fdf @@ -253,24 +253,18 @@ INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf INF FatPkg/EnhancedFatDxe/Fat.inf !else # Used checked in Visual Studio binaries -INF RuleOverride = BINARY USE = X64 FatBinPkg/EnhancedFatDxe/Fat.inf +FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F { + SECTION PE32 = FatBinPkg/EnhancedFatDxe/X64/Fat.efi + } !endif !if $(BUILD_NEW_SHELL) INF ShellPkg/Application/Shell/Shell.inf !else -!if $(USE_NEW_SHELL) -INF ShellBinPkg/UefiShell/UefiShell.inf -!else - FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) { -!if $(BUILD_OLD_SHELL) - SECTION PE32 = Build/GccShellPkg/DEBUG_XCLANG/X64/ShellFull.efi -!else - SECTION PE32 = EdkShellBinPkg/FullShell/X64/Shell_Full.efi -!endif - SECTION UI = "Shell" - } -!endif +# Used checked in Visual Studio binaries +FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) { + SECTION PE32 = EdkShellBinPkg/FullShell/X64/Shell_Full.efi + } !endif FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { -- cgit v1.2.3