DuetPkg: Convert to build FatPkg from source

Now that FatPkg is open source (and therefore can be included in the
EDK II tree) we build and use it directly.

Note: Build tested with GCC 5.3 on IA32 and X64.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@Intel.com>

diff --git a/DuetPkg/DuetPkg.fdf b/DuetPkg/DuetPkg.fdf
index 66f8b68ed822cc0c388766c39c136611b71655d1..f51af8a307db68cc7a13d068c8a0ba0c2b7ad023 100644 (file)
--- a/DuetPkg/DuetPkg.fdf
+++ b/DuetPkg/DuetPkg.fdf
@@ -1,7 +1,7 @@
 ## @file\r
 # This is DUET FDF file with UEFI HII features enabled\r
 #\r
-# Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #    This program and the accompanying materials\r
 #    are licensed and made available under the terms and conditions of the BSD License\r
@@ -108,8 +108,7 @@ INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
 INF  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
 INF  DuetPkg/BiosVideoThunkDxe/BiosVideo.inf\r
 \r
-  # Binary INF file to support toggle among different CPU architectures.\r
-INF  RuleOverride=BINARY FatBinPkg/EnhancedFatDxe/Fat.inf\r
+INF  FatPkg/EnhancedFatDxe/Fat.inf\r
 \r
 FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
     SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r

diff --git a/DuetPkg/DuetPkgIa32.dsc b/DuetPkg/DuetPkgIa32.dsc
index db1f7b648cce2bd648935ea0b5fcb3feb240761d..fcc6c425fcf84f348cdece34cffa9a61fd478c27 100644 (file)
--- a/DuetPkg/DuetPkgIa32.dsc
+++ b/DuetPkg/DuetPkgIa32.dsc
@@ -4,7 +4,7 @@
 #  Developer's UEFI Emulation. DUET provides an EFI/UEFI IA32/X64 environment on legacy BIOS,\r
 #  to help developing and debugging native EFI/UEFI drivers.\r
 #\r
-#  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -249,6 +249,7 @@
   MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
+  FatPkg/EnhancedFatDxe/Fat.inf\r
 \r
   # Bios Thunk\r
   DuetPkg/BiosVideoThunkDxe/BiosVideo.inf\r

diff --git a/DuetPkg/DuetPkgX64.dsc b/DuetPkg/DuetPkgX64.dsc
index eeae767f1374f774fe6d528c91d7827e98ff4b39..827f3df2490a40b6408f61e11e611fc4e397f178 100644 (file)
--- a/DuetPkg/DuetPkgX64.dsc
+++ b/DuetPkg/DuetPkgX64.dsc
@@ -4,7 +4,7 @@
 #  Developer's UEFI Emulation. DUET provides an EFI/UEFI IA32/X64 environment on legacy BIOS,\r
 #  to help developing and debugging native EFI/UEFI drivers.\r
 #\r
-#  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -250,6 +250,7 @@
   MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
+  FatPkg/EnhancedFatDxe/Fat.inf\r
 \r
   # Bios Thunk\r
   DuetPkg/BiosVideoThunkDxe/BiosVideo.inf\r