summaryrefslogtreecommitdiffstats
path: root/EmulatorPkg
diff options
context:
space:
mode:
authorJordan Justen <jordan.l.justen@intel.com>2016-04-05 23:18:57 -0700
committerLaszlo Ersek <lersek@redhat.com>2016-04-07 20:45:45 +0200
commitde23a7ec582d46de6fda7d5ceb82e3a0ecf2bbc7 (patch)
treec9504d3024d27ba8669576b4108f150a1bd26db7 /EmulatorPkg
parent3d1ee3c1d683b9679d6fe2bae6ff07a600d7960f (diff)
downloadedk2-de23a7ec582d46de6fda7d5ceb82e3a0ecf2bbc7.tar.gz
edk2-de23a7ec582d46de6fda7d5ceb82e3a0ecf2bbc7.tar.bz2
edk2-de23a7ec582d46de6fda7d5ceb82e3a0ecf2bbc7.zip
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 <jordan.l.justen@intel.com> Cc: Andrew Fish <afish@apple.com> Reviewed-by: Andrew Fish <afish@apple.com>
Diffstat (limited to 'EmulatorPkg')
-rw-r--r--EmulatorPkg/EmulatorPkg.dsc2
-rw-r--r--EmulatorPkg/EmulatorPkg.fdf5
2 files changed, 0 insertions, 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