gEfiFatPkgTokenSpaceGuid.PcdUnicodeCollationSupport and gEfiFatPkgTokenSpaceGuid...

(based on FatPkg commit d865610b1f37a1ab84982151c1b1255cd51d1489)

[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 <jordan.l.justen@intel.com>
Acked-by: Mark Doran <mark.doran@intel.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/FatPkg/EnhancedFatDxe/Fat.inf b/FatPkg/EnhancedFatDxe/Fat.inf
index cf2bfe8935f58a8c14666dadfeb4c786a2fbdb0c..1c2b08fc088180cad9880249ba8e1ec659abe35a 100644 (file)
--- a/FatPkg/EnhancedFatDxe/Fat.inf
+++ b/FatPkg/EnhancedFatDxe/Fat.inf
@@ -63,7 +63,6 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
-  FatPkg/FatPkg.dec\r
 \r
 [LibraryClasses]\r
   UefiRuntimeServicesTableLib\r
@@ -88,10 +87,6 @@
   gEfiUnicodeCollationProtocolGuid\r
   gEfiUnicodeCollation2ProtocolGuid\r
 \r
-[FeaturePcd]\r
-  gEfiFatPkgTokenSpaceGuid.PcdUnicodeCollationSupport\r
-  gEfiFatPkgTokenSpaceGuid.PcdUnicodeCollation2Support\r
-\r
 [Pcd]\r
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLang\r
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang\r

diff --git a/FatPkg/EnhancedFatDxe/UnicodeCollation.c b/FatPkg/EnhancedFatDxe/UnicodeCollation.c
index e0b7e0d6f030d0ab26c8197d6bf2c45340102f23..5427f6701d1259aeb70b1f74f5a76ee5a87d0a1a 100644 (file)
--- a/FatPkg/EnhancedFatDxe/UnicodeCollation.c
+++ b/FatPkg/EnhancedFatDxe/UnicodeCollation.c
@@ -20,11 +20,8 @@ EFI_UNICODE_COLLATION_PROTOCOL  *mUnicodeCollationInterface = NULL;
 /**\r
   Worker function to initialize Unicode Collation support.\r
 \r
-  This function searches Initialized Unicode Collation support based on PCDs:\r
-  PcdUnicodeCollation2Support and PcdUnicodeCollationSupport.\r
-  It first tries to locate Unicode Collation 2 protocol and matches it with current\r
-  platform language code. If for any reason the first attempt fails, it then tries to\r
-  use Unicode Collation Protocol.\r
+  It tries to locate Unicode Collation (2) protocol and matches it with current\r
+  platform language code.\r
 \r
   @param  AgentHandle          The handle used to open Unicode Collation (2) protocol.\r
   @param  ProtocolGuid         The pointer to Unicode Collation (2) protocol GUID.\r
@@ -114,9 +111,7 @@ InitializeUnicodeCollationSupportWorker (
 /**\r
   Initialize Unicode Collation support.\r
 \r
-  This function searches Initialized Unicode Collation support based on PCDs:\r
-  PcdUnicodeCollation2Support and PcdUnicodeCollationSupport.\r
-  It first tries to locate Unicode Collation 2 protocol and matches it with current\r
+  It tries to locate Unicode Collation 2 protocol and matches it with current\r
   platform language code. If for any reason the first attempt fails, it then tries to\r
   use Unicode Collation Protocol.\r
 \r
@@ -139,20 +134,17 @@ InitializeUnicodeCollationSupport (
   //\r
   // First try to use RFC 4646 Unicode Collation 2 Protocol.\r
   //\r
-  if (FeaturePcdGet (PcdUnicodeCollation2Support)) {\r
-    Status = InitializeUnicodeCollationSupportWorker (\r
-               AgentHandle,\r
-               &gEfiUnicodeCollation2ProtocolGuid,\r
-               L"PlatformLang",\r
-               (CONST CHAR8 *) PcdGetPtr (PcdUefiVariableDefaultPlatformLang)\r
-               );\r
-  }\r
-\r
+  Status = InitializeUnicodeCollationSupportWorker (\r
+             AgentHandle,\r
+             &gEfiUnicodeCollation2ProtocolGuid,\r
+             L"PlatformLang",\r
+             (CONST CHAR8 *) PcdGetPtr (PcdUefiVariableDefaultPlatformLang)\r
+             );\r
   //\r
   // If the attempt to use Unicode Collation 2 Protocol fails, then we fall back\r
   // on the ISO 639-2 Unicode Collation Protocol.\r
   //\r
-  if (FeaturePcdGet (PcdUnicodeCollationSupport) && EFI_ERROR (Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     Status = InitializeUnicodeCollationSupportWorker (\r
                AgentHandle,\r
                &gEfiUnicodeCollationProtocolGuid,\r

diff --git a/FatPkg/FatPkg.dec b/FatPkg/FatPkg.dec
index 9d0b0b68adc13d81618f2cf6fe6b7adb8344d5ae..0e1d10f1f436a0e4136036919c19bf3ef9a776eb 100644 (file)
--- a/FatPkg/FatPkg.dec
+++ b/FatPkg/FatPkg.dec
@@ -19,11 +19,3 @@
   DEC_VERSION                    = 0x00010005\r
   PACKAGE_NAME                   = FatPkg\r
   PACKAGE_GUID                   = 8EA68A2C-99CB-4332-85C6-DD5864EAA674\r
-\r
-[PcdsFeatureFlag.common]\r
-  gEfiFatPkgTokenSpaceGuid.PcdUnicodeCollationSupport|TRUE|BOOLEAN|0x00010001\r
-  gEfiFatPkgTokenSpaceGuid.PcdUnicodeCollation2Support|TRUE|BOOLEAN|0x00010002\r
-\r
-[Guids.common]\r
-  gEfiFatPkgTokenSpaceGuid = {0xc8e92dba, 0x1d92, 0x411f, {0xae, 0xa, 0x1d, 0xbe, 0xd8, 0xf1, 0x32, 0x99}}\r
-\r