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@4000 6f19259b-4bc3-4df7-8a09-765794883524

MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c

@@ -1295,14 +1295,13 @@ Returns:
 
 --*/
 {
-  return EfiLibInstallAllDriverProtocols (
+  return EfiLibInstallDriverBindingComponentName2 (
            ImageHandle,
            SystemTable,
            &gEhciDriverBinding,
            ImageHandle,
            &gEhciComponentName,
-           NULL,
-           NULL
+           &gEhciComponentName2
            );
 }
 
@@ -1565,12 +1564,21 @@ EhcDriverBindingStart (
   // Install the component name protocol, don't fail the start
   // because of something for display.
   //
-  AddUnicodeString (
+  AddUnicodeString2 (
     "eng",
     gEhciComponentName.SupportedLanguages,
     &Ehc->ControllerNameTable,
-    L"Enhanced Host Controller (USB 2.0)"
+    L"Enhanced Host Controller (USB 2.0)",
+    TRUE
     );
+  AddUnicodeString2 (
+    "en",
+    gEhciComponentName2.SupportedLanguages,
+    &Ehc->ControllerNameTable,
+    L"Enhanced Host Controller (USB 2.0)",
+    FALSE
+    );
+
 
   EHC_DEBUG (("EhcDriverBindingStart: EHCI started for controller @ %x\n", Controller));
   return EFI_SUCCESS;