Skip to content

Commit

Permalink
Edk2Platforms: Replace FatBinPkg with FatPkg
Browse files Browse the repository at this point in the history 
In order to remove FatBinPkg, relationships depend on
FatBinPkg need to be replaced by FatPkg in fdf. And
FatPkg needs to be added in dsc.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <[email protected]>
Reviewed-by: Ard Biesheuvel <[email protected]>
Acked-by: Michael D Kinney <[email protected]>
  • Loading branch information
@shenglei10 @lgao4
shenglei10 authored and lgao4 committed Oct 23, 2018
1 parent ba0a48e commit 172f4e1
Show file tree
Hide file tree
Showing 18 changed files with 18 additions and 10 deletions.
1 change: 1 addition & 0 deletions Platform/ARM/JunoPkg/ArmJuno.dsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@
MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
FatPkg/EnhancedFatDxe/Fat.inf
# Required by PCI
ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
Expand Down
2 changes: 1 addition & 1 deletion Platform/ARM/JunoPkg/ArmJuno.fdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ FvNameGuid = B73FE497-B92E-416e-8326-45AD0D270092
#
INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
INF FatBinPkg/EnhancedFatDxe/Fat.inf
INF FatPkg/EnhancedFatDxe/Fat.inf
INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

# Required by PCI
Expand Down
1 change: 1 addition & 0 deletions Platform/ARM/SgiPkg/SgiPlatform.dsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@
MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
FatPkg/EnhancedFatDxe/Fat.inf

#
# Bds
Expand Down
2 changes: 1 addition & 1 deletion Platform/ARM/SgiPkg/SgiPlatform.fdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ READ_LOCK_STATUS = TRUE
#
INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
INF FatBinPkg/EnhancedFatDxe/Fat.inf
INF FatPkg/EnhancedFatDxe/Fat.inf
INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

# FV FileSystem
Expand Down
2 changes: 1 addition & 1 deletion Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@
MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

FatPkg/EnhancedFatDxe/Fat.inf
MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf

#
Expand Down
2 changes: 1 addition & 1 deletion Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ FvNameGuid = 73dcb643-3862-4904-9076-a94af1890243
#
INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
INF FatBinPkg/EnhancedFatDxe/Fat.inf
INF FatPkg/EnhancedFatDxe/Fat.inf
INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

# Versatile Express FileSystem
Expand Down
1 change: 1 addition & 0 deletions Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@
MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
FatPkg/EnhancedFatDxe/Fat.inf

#
# Bds
Expand Down
2 changes: 1 addition & 1 deletion Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ FvNameGuid = 87940482-fc81-41c3-87e6-399cf85ac8a0
#
INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
INF FatBinPkg/EnhancedFatDxe/Fat.inf
INF FatPkg/EnhancedFatDxe/Fat.inf
INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

#
Expand Down
1 change: 1 addition & 0 deletions Platform/Hisilicon/D03/D03.dsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@
MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
FatPkg/EnhancedFatDxe/Fat.inf

MdeModulePkg/Application/UiApp/UiApp.inf {
<LibraryClasses>
Expand Down
2 changes: 1 addition & 1 deletion Platform/Hisilicon/D03/D03.fdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ READ_LOCK_STATUS = TRUE
#
INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
INF FatBinPkg/EnhancedFatDxe/Fat.inf
INF FatPkg/EnhancedFatDxe/Fat.inf
INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
INF IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf

Expand Down
1 change: 1 addition & 0 deletions Platform/Hisilicon/D05/D05.dsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,7 @@
MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
FatPkg/EnhancedFatDxe/Fat.inf

MdeModulePkg/Application/UiApp/UiApp.inf {
<LibraryClasses>
Expand Down
2 changes: 1 addition & 1 deletion Platform/Hisilicon/D05/D05.fdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ READ_LOCK_STATUS = TRUE
#
INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
INF FatBinPkg/EnhancedFatDxe/Fat.inf
INF FatPkg/EnhancedFatDxe/Fat.inf
INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
INF IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf

Expand Down
1 change: 1 addition & 0 deletions Platform/Hisilicon/HiKey/HiKey.dsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@
MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
FatPkg/EnhancedFatDxe/Fat.inf

#
# Bds
Expand Down
2 changes: 1 addition & 1 deletion Platform/Hisilicon/HiKey/HiKey.fdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ READ_LOCK_STATUS = TRUE
#
INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
INF FatBinPkg/EnhancedFatDxe/Fat.inf
INF FatPkg/EnhancedFatDxe/Fat.inf
INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
Expand Down
1 change: 1 addition & 0 deletions Platform/Hisilicon/HiKey960/HiKey960.dsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@
MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
FatPkg/EnhancedFatDxe/Fat.inf

#
# Bds
Expand Down
2 changes: 1 addition & 1 deletion Platform/Hisilicon/HiKey960/HiKey960.fdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ READ_LOCK_STATUS = TRUE
#
INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
INF FatBinPkg/EnhancedFatDxe/Fat.inf
INF FatPkg/EnhancedFatDxe/Fat.inf
INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
Expand Down
1 change: 1 addition & 0 deletions Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,7 @@
MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
FatPkg/EnhancedFatDxe/Fat.inf
# Bds - Use Intel BDS
MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
Expand Down
2 changes: 1 addition & 1 deletion Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ FvNameGuid = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
# FAT filesystem + GPT/MBR partitioning
INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
INF FatBinPkg/EnhancedFatDxe/Fat.inf
INF FatPkg/EnhancedFatDxe/Fat.inf
INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

# UEFI application (Shell Embedded Boot Loader)
Expand Down

0 comments on commit 172f4e1

Please sign in to comment.