Revision: 17508
http://sourceforge.net/p/edk2/code/17508
Author: timhe
Date: 2015-05-26 07:41:30 +0000 (Tue, 26 May 2015)
Log Message:
-----------
Update the formal FCE tool, and remove the unnecessary
?\226?\128?\156setupDefault?\226?\128?\157 variable for MinnowBoard Max.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Tim He <[email protected]>
Reviewed-by: David Wei <[email protected]>
Modified Paths:
--------------
branches/UDK2014.SP1/Vlv2TbltDevicePkg/BfmLib.exe
branches/UDK2014.SP1/Vlv2TbltDevicePkg/FCE.exe
branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformDxe/Platform.c
branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformInitPei/BootMode.c
branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.c
branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf
branches/UDK2014.SP1/Vlv2TbltDevicePkg/bld_vlv.bat
Modified: branches/UDK2014.SP1/Vlv2TbltDevicePkg/BfmLib.exe
===================================================================
(Binary files differ)
Modified: branches/UDK2014.SP1/Vlv2TbltDevicePkg/FCE.exe
===================================================================
(Binary files differ)
Modified: branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformDxe/Platform.c
===================================================================
--- branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformDxe/Platform.c
2015-05-26 04:52:09 UTC (rev 17507)
+++ branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformDxe/Platform.c
2015-05-26 07:41:30 UTC (rev 17508)
@@ -1364,12 +1364,7 @@
{
EFI_PLATFORM_SETUP_ID *BootModeBuffer;
VOID *HobList;
- UINT16 State;
- //
- // Variable initialization
- //
- State = FALSE;
HobList = GetFirstGuidHob(&gEfiPlatformBootModeGuid);
if (HobList != NULL) {
@@ -1386,16 +1381,8 @@
mMfgMode = TRUE;
}
- //
- // Check if in safe mode
- //
- if ( !CompareMem (
- &BootModeBuffer->SetupName,
- SAFE_SETUP_NAME,
- StrSize (SAFE_SETUP_NAME)
- ) ) {
- State = TRUE;
- }
+
+
}
}
Modified: branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformInitPei/BootMode.c
===================================================================
--- branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformInitPei/BootMode.c
2015-05-26 04:52:09 UTC (rev 17507)
+++ branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformInitPei/BootMode.c
2015-05-26 07:41:30 UTC (rev 17508)
@@ -395,16 +395,16 @@
// Recovery mode
//
CopyMem (&PlatformSetupId.SetupName,
- SAFE_SETUP_NAME,
- StrSize (SAFE_SETUP_NAME));
+ &NORMAL_SETUP_NAME,
+ StrSize (NORMAL_SETUP_NAME));
PlatformSetupId.PlatformBootMode = PLATFORM_RECOVERY_MODE;
} else if (CheckIfSafeMode(PeiServices, PlatformInfoHob)) {
//
// Safe mode also called config mode or maintenace mode.
//
CopyMem (&PlatformSetupId.SetupName,
- SAFE_SETUP_NAME,
- StrSize (SAFE_SETUP_NAME));
+ &NORMAL_SETUP_NAME,
+ StrSize (NORMAL_SETUP_NAME));
PlatformSetupId.PlatformBootMode = PLATFORM_SAFE_MODE;
} else if(0) { // else if (CheckIfManufacturingMode(PeiServices)) {
Modified:
branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.c
===================================================================
--- branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.c
2015-05-26 04:52:09 UTC (rev 17507)
+++ branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.c
2015-05-26 07:41:30 UTC (rev 17508)
@@ -26,7 +26,9 @@
#include "PlatformSetupDxe.h"
#include "Guid/SetupVariable.h"
+#include <Protocol/FormBrowserEx2.h>
+
#define EFI_CALLBACK_INFO_SIGNATURE SIGNATURE_32 ('C', 'l', 'b', 'k')
#define EFI_CALLBACK_INFO_FROM_THIS(a) CR (a, EFI_CALLBACK_INFO,
ConfigAccess, EFI_CALLBACK_INFO_SIGNATURE)
@@ -367,6 +369,7 @@
EFI_STATUS Status;
UINTN DataSize;
UINT8 OsSelection;
+ EDKII_FORM_BROWSER_EXTENSION2_PROTOCOL *FormBrowserEx2;
StringBuffer1 = AllocateZeroPool (200 * sizeof (CHAR16));
ASSERT (StringBuffer1 != NULL);
@@ -605,33 +608,31 @@
// If the user hits the YES Response key
//
if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) {
- //
- // Load default
- //
+
+ Status = gBS->LocateProtocol (&gEdkiiFormBrowserEx2ProtocolGuid, NULL,
(VOID **) &FormBrowserEx2);
+ FormBrowserEx2->ExecuteAction(BROWSER_ACTION_DEFAULT,
EFI_HII_DEFAULT_CLASS_STANDARD);
+
FakeNvData = AllocateZeroPool (sizeof(SYSTEM_CONFIGURATION));
if (FakeNvData == NULL) {
return EFI_OUT_OF_RESOURCES;
}
-
- SizeOfNvStore = sizeof(SYSTEM_CONFIGURATION);
- Status = gRT->GetVariable(
- L"SetupDefault",
- &mNormalSetupGuid,
- NULL,
- &SizeOfNvStore,
- FakeNvData
- );
+
+ Status = HiiGetBrowserData (
+ &mSystemConfigGuid,
+ mVariableName,
+ sizeof (SYSTEM_CONFIGURATION),
+ (UINT8 *) FakeNvData
+ );
+
if (!EFI_ERROR (Status)) {
- if(SizeOfNvStore >= sizeof(SYSTEM_CONFIGURATION)) {
- Status = gRT->SetVariable (
- L"Setup",
- &mNormalSetupGuid,
- EFI_VARIABLE_RUNTIME_ACCESS |
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,
- sizeof(SYSTEM_CONFIGURATION),
- FakeNvData
- );
- }
+ Status = gRT->SetVariable (
+ L"Setup",
+ &mNormalSetupGuid,
+ EFI_VARIABLE_RUNTIME_ACCESS |
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,
+ sizeof(SYSTEM_CONFIGURATION),
+ FakeNvData
+ );
}
FreePool (FakeNvData);
Modified:
branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf
===================================================================
---
branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf
2015-05-26 04:52:09 UTC (rev 17507)
+++
branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf
2015-05-26 07:41:30 UTC (rev 17508)
@@ -135,6 +135,7 @@
gEfiHiiConfigRoutingProtocolGuid ## CONSUMED
gEfiHiiConfigAccessProtocolGuid ## PRODUCED
gEfiDevicePathToTextProtocolGuid ## CONSUMED
+ gEdkiiFormBrowserEx2ProtocolGuid
gEfiDataHubProtocolGuid
gEfiLegacyBiosProtocolGuid
Modified: branches/UDK2014.SP1/Vlv2TbltDevicePkg/bld_vlv.bat
===================================================================
--- branches/UDK2014.SP1/Vlv2TbltDevicePkg/bld_vlv.bat 2015-05-26 04:52:09 UTC
(rev 17507)
+++ branches/UDK2014.SP1/Vlv2TbltDevicePkg/bld_vlv.bat 2015-05-26 07:41:30 UTC
(rev 17508)
@@ -217,10 +217,10 @@
pushd %PLATFORM_PACKAGE%
:: Extract Hii data from build and store in HiiDefaultData.txt
-fce read -i ..\%BUILD_PATH%\FV\Vlv.fd > ..\%BUILD_PATH%\FV\HiiDefaultData.txt
1>>EDK2.log 2>&1
+fce read -i ..\%BUILD_PATH%\FV\Vlv.fd > ..\%BUILD_PATH%\FV\HiiDefaultData.txt
-:: copy the Setup variable to the SetupDefault variable and save changes to
VlvXXX.fd
-fce mirror -i ..\%BUILD_PATH%\FV\Vlv.fd -o ..\%BUILD_PATH%\FV\Vlv%Arch%.fd
Setup SetupDefault 1>>EDK2.log 2>&1
+:: save changes to VlvXXX.fd
+fce update -i ..\%BUILD_PATH%\FV\Vlv.fd -s
..\%BUILD_PATH%\FV\HiiDefaultData.txt -o ..\%BUILD_PATH%\FV\Vlv%Arch%.fd
popd
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
