Revision: 15346
http://sourceforge.net/p/edk2/code/15346
Author: vanjeff
Date: 2014-03-20 03:17:04 +0000 (Thu, 20 Mar 2014)
Log Message:
-----------
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 <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/15330
http://sourceforge.net/p/edk2/code/15331
http://sourceforge.net/p/edk2/code/15336
Modified Paths:
--------------
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
branches/UDK2010.SR1/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
branches/UDK2010.SR1/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf
Modified:
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
===================================================================
---
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
2014-03-20 03:10:17 UTC (rev 15345)
+++
branches/UDK2010.SR1/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
2014-03-20 03:17:04 UTC (rev 15346)
@@ -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 @@
mFirmwarePerformanceTableTemplate.S3PointerRecord.S3PerformanceTablePointer
= (UINT64) (UINTN) mAcpiS3PerformanceTable;
//
// Save Runtime Performance Table pointers to Variable.
+ // Don't check SetVariable return status. It doesn't impact FPDT table
generation.
//
- Status = gRT->SetVariable (
- EFI_FIRMWARE_PERFORMANCE_VARIABLE_NAME,
- &gEfiFirmwarePerformanceGuid,
- EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,
- sizeof (PerformanceVariable),
- &PerformanceVariable
- );
- ASSERT_EFI_ERROR (Status);
+ gRT->SetVariable (
+ EFI_FIRMWARE_PERFORMANCE_VARIABLE_NAME,
+ &gEfiFirmwarePerformanceGuid,
+ EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,
+ sizeof (PerformanceVariable),
+ &PerformanceVariable
+ );
//
// Publish Firmware Performance Data Table.
Modified:
branches/UDK2010.SR1/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
2014-03-20 03:10:17 UTC (rev 15345)
+++ branches/UDK2010.SR1/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
2014-03-20 03:17:04 UTC (rev 15346)
@@ -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 @@
VariableSize,
Variable
);
- ASSERT_EFI_ERROR (Status);
FreePool (Variable);
return ;
@@ -1570,7 +1569,6 @@
VariableSize,
NewVariable
);
- ASSERT_EFI_ERROR (Status);
}
if (NewVariable != NULL) {
Modified:
branches/UDK2010.SR1/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf
===================================================================
---
branches/UDK2010.SR1/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf
2014-03-20 03:10:17 UTC (rev 15345)
+++
branches/UDK2010.SR1/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf
2014-03-20 03:17:04 UTC (rev 15346)
@@ -16,8 +16,10 @@
# 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
# which accompanies this distribution. The full text of the license may be
found at
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
