Minor update for PlatOverMngr driver, VariableFormat.h and DxePcdLib.c.

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

MdeModulePkg/Include/VariableFormat.h

@@ -17,12 +17,15 @@
 
 #define VARIABLE_STORE_SIGNATURE  EFI_SIGNATURE_32 ('$', 'V', 'S', 'S')
 
+#ifndef MAX_VARIABLE_SIZE
 #define MAX_VARIABLE_SIZE                 FixedPcdGet32(PcdMaxVariableSize)
-
+#endif
 //
 // Enlarges the hardware error record maximum variable size to 32K bytes
 //
+#ifndef MAX_HARDWARE_ERROR_VARIABLE_SIZE
 #define MAX_HARDWARE_ERROR_VARIABLE_SIZE  FixedPcdGet32(PcdMaxHardwareErrorVariableSize)
+#endif
 
 #define VARIABLE_DATA                     0x55AA
 

MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c

@@ -175,24 +175,6 @@ PlatOverMngrInit (
   ZeroMem (mControllerToken, MAX_CHOICE_NUM * sizeof (EFI_STRING_ID));
   ZeroMem (mDriverImageProtocol, MAX_CHOICE_NUM * sizeof (EFI_LOADED_IMAGE_PROTOCOL *));
 
-  //
-  // Show the page
-  //
-  Status = FormBrowser2->SendForm (
-                           FormBrowser2,
-                           &CallbackInfo->RegisteredHandle,
-                           1,
-                           NULL,
-                           0,
-                           NULL,
-                           NULL
-                           );
-
-  Status = HiiDatabase->RemovePackageList (HiiDatabase, CallbackInfo->RegisteredHandle);
-  if (EFI_ERROR (Status)) {
-    return Status;
-  }
-
   return EFI_SUCCESS;
 }
 

MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.inf

@@ -19,7 +19,7 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = PlatOverMngr
   FILE_GUID                      = 56D95BFE-F991-4898-B3BE-B8F37C927F48
-  MODULE_TYPE                    = UEFI_APPLICATION
+  MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
   EDK_RELEASE_VERSION            = 0x00020000
   EFI_SPECIFICATION_VERSION      = 0x00020000
@@ -47,7 +47,7 @@
 [LibraryClasses]
   BaseLib
   UefiBootServicesTableLib
-  UefiApplicationEntryPoint
+  UefiDriverEntryPoint
   UefiLib
   DebugLib
   PlatDriOverLib