diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2016-04-06 00:08:38 -0700 |
|---|---|---|
| committer | Laszlo Ersek <lersek@redhat.com> | 2016-04-08 13:47:31 +0200 |
| commit | 3870d285e25c0329a3f03130aa5e837de7cd3d72 (patch) | |
| tree | 319d8e8b39c1c565fcc3a6ac70e5156d1227ea14 /DuetPkg | |
| parent | 912065fe704aa3e74110a1446c13e1a76d5be231 (diff) | |
| download | edk2-3870d285e25c0329a3f03130aa5e837de7cd3d72.tar.gz edk2-3870d285e25c0329a3f03130aa5e837de7cd3d72.tar.bz2 edk2-3870d285e25c0329a3f03130aa5e837de7cd3d72.zip | |
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>
Diffstat (limited to 'DuetPkg')
| -rw-r--r-- | DuetPkg/DuetPkg.fdf | 5 | ||||
| -rw-r--r-- | DuetPkg/DuetPkgIa32.dsc | 3 | ||||
| -rw-r--r-- | DuetPkg/DuetPkgX64.dsc | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/DuetPkg/DuetPkg.fdf b/DuetPkg/DuetPkg.fdf index 66f8b68ed8..f51af8a307 100644 --- a/DuetPkg/DuetPkg.fdf +++ b/DuetPkg/DuetPkg.fdf @@ -1,7 +1,7 @@ ## @file
# This is DUET FDF file with UEFI HII features enabled
#
-# Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -108,8 +108,7 @@ INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
INF DuetPkg/BiosVideoThunkDxe/BiosVideo.inf
- # Binary INF file to support toggle among different CPU architectures.
-INF RuleOverride=BINARY FatBinPkg/EnhancedFatDxe/Fat.inf
+INF FatPkg/EnhancedFatDxe/Fat.inf
FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
SECTION RAW = MdeModulePkg/Logo/Logo.bmp
diff --git a/DuetPkg/DuetPkgIa32.dsc b/DuetPkg/DuetPkgIa32.dsc index db1f7b648c..fcc6c425fc 100644 --- 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,
# to help developing and debugging native EFI/UEFI drivers.
#
-# Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -249,6 +249,7 @@ MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
+ FatPkg/EnhancedFatDxe/Fat.inf
# Bios Thunk
DuetPkg/BiosVideoThunkDxe/BiosVideo.inf
diff --git a/DuetPkg/DuetPkgX64.dsc b/DuetPkg/DuetPkgX64.dsc index eeae767f13..827f3df249 100644 --- 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,
# to help developing and debugging native EFI/UEFI drivers.
#
-# Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -250,6 +250,7 @@ MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
+ FatPkg/EnhancedFatDxe/Fat.inf
# Bios Thunk
DuetPkg/BiosVideoThunkDxe/BiosVideo.inf
|