Update to support to produce Component Name and & Component Name 2 protocol based on Feature flag PcdComponentNameDisable & PcdComponentName2Disable.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3996 6f19259b-4bc3-4df7-8a09-765794883524

IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c

@@ -274,12 +274,21 @@ Returns:
   }
 
   ConsoleIn->ControllerNameTable = NULL;
-  AddUnicodeString (
+  AddUnicodeString2 (
     "eng",
     gPs2KeyboardComponentName.SupportedLanguages,
     &ConsoleIn->ControllerNameTable,
-    L"PS/2 Keyboard Device"
+    L"PS/2 Keyboard Device",
+    TRUE
     );
+  AddUnicodeString2 (
+    "en",
+    gPs2KeyboardComponentName2.SupportedLanguages,
+    &ConsoleIn->ControllerNameTable,
+    L"PS/2 Keyboard Device",
+    FALSE
+    );
+
 
   //
   // Install protocol interfaces for the keyboard device.
@@ -484,14 +493,13 @@ InitializePs2Keyboard(
   //
   // Install driver model protocol(s).
   //
-  Status = EfiLibInstallAllDriverProtocols (
+  Status = EfiLibInstallDriverBindingComponentName2 (
              ImageHandle,
              SystemTable,
              &gKeyboardControllerDriver,
              ImageHandle,
              &gPs2KeyboardComponentName,
-             NULL,
-             NULL
+             &gPs2KeyboardComponentName2
              );
   ASSERT_EFI_ERROR (Status);