From 1671e775a3b1b3e9e4a407e195c804e802bb6cbb Mon Sep 17 00:00:00 2001 From: Shumin Qiu Date: Thu, 28 Aug 2014 06:39:53 +0000 Subject: [PATCH] FatPkg: INF/DEC file updates to EDK II packages 1. Usage information in INF file comment blocks are either incomplete or incorrect. This includes usage information for Protocols/PPIs/GUIDs/PCDs/HOBs/Events/BootModes. The syntax for usage information in comment blocks is defined in the EDK II Module Information (INF) Specification Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qiu, Shumin Reviewed-by: Gao, Liming (based on FatPkg commit 808c87363023e16a6b81068dd7e21648e16c7f57) [jordan.l.justen@intel.com: Use script to relicense to 2-clause BSD] Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen Acked-by: Mark Doran Acked-by: Laszlo Ersek --- FatPkg/EnhancedFatDxe/Fat.inf | 27 +++++++++++++++------------ FatPkg/FatPei/FatPei.inf | 12 +++++++----- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/FatPkg/EnhancedFatDxe/Fat.inf b/FatPkg/EnhancedFatDxe/Fat.inf index 79cf0cd3eb..158f34c2ca 100644 --- a/FatPkg/EnhancedFatDxe/Fat.inf +++ b/FatPkg/EnhancedFatDxe/Fat.inf @@ -4,7 +4,7 @@ # This UEFI driver detects the FAT file system in the disk. # It also produces the Simple File System protocol for the consumer to # perform file and directory operations on the disk. -# Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.
# # This program and the accompanying materials are licensed and made available # under the terms and conditions of the BSD License which accompanies this @@ -20,6 +20,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = Fat + MODULE_UNI_FILE = Fat.uni FILE_GUID = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F MODULE_TYPE = UEFI_DRIVER VERSION_STRING = 1.0 @@ -74,18 +75,20 @@ PcdLib [Guids] - gEfiFileInfoGuid - gEfiFileSystemInfoGuid - gEfiFileSystemVolumeLabelInfoIdGuid + gEfiFileInfoGuid ## SOMETIMES_CONSUMES ## UNDEFINED + gEfiFileSystemInfoGuid ## SOMETIMES_CONSUMES ## UNDEFINED + gEfiFileSystemVolumeLabelInfoIdGuid ## SOMETIMES_CONSUMES ## UNDEFINED [Protocols] - gEfiDiskIoProtocolGuid - gEfiDiskIo2ProtocolGuid - gEfiBlockIoProtocolGuid - gEfiSimpleFileSystemProtocolGuid - gEfiUnicodeCollationProtocolGuid - gEfiUnicodeCollation2ProtocolGuid + gEfiDiskIoProtocolGuid ## TO_START + gEfiDiskIo2ProtocolGuid ## TO_START + gEfiBlockIoProtocolGuid ## TO_START + gEfiSimpleFileSystemProtocolGuid ## BY_START + gEfiUnicodeCollationProtocolGuid ## TO_START + gEfiUnicodeCollation2ProtocolGuid ## TO_START [Pcd] - gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLang - gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang + gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLang ## SOMETIMES_CONSUMES + gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang ## SOMETIMES_CONSUMES +[UserExtensions.TianoCore."ExtraFiles"] + FatExtra.uni diff --git a/FatPkg/FatPei/FatPei.inf b/FatPkg/FatPei/FatPei.inf index a81d265f82..83a67bb8c1 100644 --- a/FatPkg/FatPei/FatPei.inf +++ b/FatPkg/FatPei/FatPei.inf @@ -1,7 +1,7 @@ ## @file # Lite Fat driver only used in Pei Phase. # -# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
# # This program and the accompanying materials are licensed and made available # under the terms and conditions of the BSD License which accompanies this @@ -16,6 +16,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = FatPei + MODULE_UNI_FILE = FatPei.uni FILE_GUID = 5B60CCFD-1011-4BCF-B7D1-BB99CA96A603 MODULE_TYPE = PEIM VERSION_STRING = 1.0 @@ -54,9 +55,9 @@ [Guids] - gRecoveryOnFatUsbDiskGuid # ALWAYS_CONSUMED - gRecoveryOnFatIdeDiskGuid # ALWAYS_CONSUMED - gRecoveryOnFatFloppyDiskGuid # ALWAYS_CONSUMED + gRecoveryOnFatUsbDiskGuid ## SOMETIMES_CONSUMES ## UNDEFINED + gRecoveryOnFatIdeDiskGuid ## SOMETIMES_CONSUMES ## UNDEFINED + gRecoveryOnFatFloppyDiskGuid ## SOMETIMES_CONSUMES ## UNDEFINED [Ppis] @@ -71,4 +72,5 @@ [Depex] gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid - +[UserExtensions.TianoCore."ExtraFiles"] + FatPeiExtra.uni -- 2.39.2