Sync patches r15330, r15331 and r15336 from main trunk.

1. Remove ASSERT check for SetVariable in FirmwarePerformanceDataTableDxe.
2. Add comments to describe PlatformDriOverrideDxe is used for test purpose.
3. Remove ASSERT when SetVariable for ConOutDev/ConInDev/ErrOutDev variables failed.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2010.SR1@15346 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 14 insertions, 14 deletions

diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
index b858114b83..e12b257d79 100644
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
+++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
@@ -5,7 +5,7 @@
   for Firmware Basic Boot Performance Record and other boot performance records, 

   and install FPDT to ACPI table.

 

-  Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -480,15 +480,15 @@ InstallFirmwarePerformanceDataTable (
   mFirmwarePerformanceTableTemplate.S3PointerRecord.S3PerformanceTablePointer = (UINT64) (UINTN) mAcpiS3PerformanceTable;

   //

   // Save Runtime Performance Table pointers to Variable.

-  //

-  Status = gRT->SetVariable (

-                  EFI_FIRMWARE_PERFORMANCE_VARIABLE_NAME,

-                  &gEfiFirmwarePerformanceGuid,

-                  EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,

-                  sizeof (PerformanceVariable),

-                  &PerformanceVariable

-                  );

-  ASSERT_EFI_ERROR (Status);

+  // Don't check SetVariable return status. It doesn't impact FPDT table generation. 

+  //

+  gRT->SetVariable (

+        EFI_FIRMWARE_PERFORMANCE_VARIABLE_NAME,

+        &gEfiFirmwarePerformanceGuid,

+        EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,

+        sizeof (PerformanceVariable),

+        &PerformanceVariable

+        );

 

   //

   // Publish Firmware Performance Data Table.

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
index 14f49ee755..a27090815c 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
@@ -2,7 +2,7 @@
   Produces Simple Text Input Protocol, Simple Text Input Extended Protocol and

   Simple Text Output Protocol upon Serial IO Protocol.

 

-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -1462,7 +1462,6 @@ TerminalUpdateConsoleDevVariable (
                   VariableSize,

                   Variable

                   );

-  ASSERT_EFI_ERROR (Status);

   FreePool (Variable);

 

   return ;

@@ -1570,7 +1569,6 @@ TerminalRemoveConsoleDevVariable (
                     VariableSize,

                     NewVariable

                     );

-    ASSERT_EFI_ERROR (Status);

   }

 

   if (NewVariable != NULL) {

diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf
index 9702f249b5..2a59f65c41 100644
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf
+++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf
@@ -16,7 +16,9 @@
 #  4. It save all the mapping info in NV variables for the following boot, 

 #     which will be consumed by GetDriver API of the produced the platform override protocol.

 #

-# Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>

+# Caution: This module is a sample implementation for the test purpose.

+#

+# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License