OvmfPkg: Convert to using FatPkg in the EDK II tree
Now that FatPkg is open source (and therefore can be included in the EDK II tree) we build and use it directly. Build tested with GCC 5.3 on IA32 and X64. Boot tested to UEFI Shell on IA32 and UEFI Linux on X64. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Cc: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
		
				
					committed by
					
						
						Laszlo Ersek
					
				
			
			
				
	
			
			
			
						parent
						
							de23a7ec58
						
					
				
				
					commit
					aa47e52978
				
			@@ -606,6 +606,7 @@
 | 
				
			|||||||
  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
 | 
					  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
 | 
				
			||||||
  MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
 | 
					  MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
 | 
				
			||||||
  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
 | 
					  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
 | 
				
			||||||
 | 
					  FatPkg/EnhancedFatDxe/Fat.inf
 | 
				
			||||||
  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
 | 
					  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
 | 
				
			||||||
  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
 | 
					  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
 | 
				
			||||||
  OvmfPkg/SataControllerDxe/SataControllerDxe.inf
 | 
					  OvmfPkg/SataControllerDxe/SataControllerDxe.inf
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -275,7 +275,7 @@ INF  RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf
 | 
				
			|||||||
INF  MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
 | 
					INF  MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
 | 
				
			||||||
INF  MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
 | 
					INF  MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
 | 
				
			||||||
 | 
					
 | 
				
			||||||
INF  RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf
 | 
					INF  FatPkg/EnhancedFatDxe/Fat.inf
 | 
				
			||||||
 | 
					
 | 
				
			||||||
!ifndef $(USE_OLD_SHELL)
 | 
					!ifndef $(USE_OLD_SHELL)
 | 
				
			||||||
INF  ShellPkg/Application/Shell/Shell.inf
 | 
					INF  ShellPkg/Application/Shell/Shell.inf
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -615,6 +615,7 @@
 | 
				
			|||||||
  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
 | 
					  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
 | 
				
			||||||
  MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
 | 
					  MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
 | 
				
			||||||
  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
 | 
					  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
 | 
				
			||||||
 | 
					  FatPkg/EnhancedFatDxe/Fat.inf
 | 
				
			||||||
  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
 | 
					  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
 | 
				
			||||||
  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
 | 
					  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
 | 
				
			||||||
  OvmfPkg/SataControllerDxe/SataControllerDxe.inf
 | 
					  OvmfPkg/SataControllerDxe/SataControllerDxe.inf
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -275,7 +275,7 @@ INF  RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf
 | 
				
			|||||||
INF  MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
 | 
					INF  MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
 | 
				
			||||||
INF  MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
 | 
					INF  MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
 | 
				
			||||||
 | 
					
 | 
				
			||||||
INF  RuleOverride = BINARY USE = X64 FatBinPkg/EnhancedFatDxe/Fat.inf
 | 
					INF  FatPkg/EnhancedFatDxe/Fat.inf
 | 
				
			||||||
 | 
					
 | 
				
			||||||
!ifndef $(USE_OLD_SHELL)
 | 
					!ifndef $(USE_OLD_SHELL)
 | 
				
			||||||
INF  ShellPkg/Application/Shell/Shell.inf
 | 
					INF  ShellPkg/Application/Shell/Shell.inf
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -613,6 +613,7 @@
 | 
				
			|||||||
  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
 | 
					  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
 | 
				
			||||||
  MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
 | 
					  MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
 | 
				
			||||||
  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
 | 
					  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
 | 
				
			||||||
 | 
					  FatPkg/EnhancedFatDxe/Fat.inf
 | 
				
			||||||
  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
 | 
					  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
 | 
				
			||||||
  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
 | 
					  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
 | 
				
			||||||
  OvmfPkg/SataControllerDxe/SataControllerDxe.inf
 | 
					  OvmfPkg/SataControllerDxe/SataControllerDxe.inf
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -275,7 +275,7 @@ INF  RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf
 | 
				
			|||||||
INF  MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
 | 
					INF  MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
 | 
				
			||||||
INF  MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
 | 
					INF  MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
 | 
				
			||||||
 | 
					
 | 
				
			||||||
INF  RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf
 | 
					INF  FatPkg/EnhancedFatDxe/Fat.inf
 | 
				
			||||||
 | 
					
 | 
				
			||||||
!ifndef $(USE_OLD_SHELL)
 | 
					!ifndef $(USE_OLD_SHELL)
 | 
				
			||||||
INF  ShellPkg/Application/Shell/Shell.inf
 | 
					INF  ShellPkg/Application/Shell/Shell.inf
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user