From de23a7ec582d46de6fda7d5ceb82e3a0ecf2bbc7 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Tue, 5 Apr 2016 23:18:57 -0700 Subject: [PATCH] EmulatorPkg: Convert to always build FatPkg Now that FatPkg is open source (and therefore can be included in the EDK II tree) we always build and use it directly. Build and boot tested with GCC 5.3 on X64, but I did not test attaching a disk image with a FAT filesystem. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen Cc: Andrew Fish Reviewed-by: Andrew Fish --- EmulatorPkg/EmulatorPkg.dsc | 2 -- EmulatorPkg/EmulatorPkg.fdf | 5 ----- 2 files changed, 7 deletions(-) diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc index 73bb64cb92..f516adff63 100644 --- a/EmulatorPkg/EmulatorPkg.dsc +++ b/EmulatorPkg/EmulatorPkg.dsc @@ -373,9 +373,7 @@ PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf } -!if $(BUILD_FAT) FatPkg/EnhancedFatDxe/Fat.inf -!endif !ifndef $(USE_OLD_SHELL) ShellPkg/Application/Shell/Shell.inf { diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf index 8ac9098463..377de59b5a 100644 --- a/EmulatorPkg/EmulatorPkg.fdf +++ b/EmulatorPkg/EmulatorPkg.fdf @@ -203,12 +203,7 @@ INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf - -!if $(BUILD_FAT) INF FatPkg/EnhancedFatDxe/Fat.inf -!else -INF RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf -!endif !ifndef $(USE_OLD_SHELL) INF ShellPkg/Application/Shell/Shell.inf