* [Patch 0/6] Fix MinnowMax build and boot issues
@ 2016-11-29 10:11 Michael Kinney
2016-11-29 10:11 ` [Patch 1/6] Vlv2TbltDevicePkg: Allow BaseTools to run from sources Michael Kinney
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Michael Kinney @ 2016-11-29 10:11 UTC (permalink / raw)
To: edk2-devel; +Cc: Jiewen Yao, David Wei, Mang Guo
This patch series fixes a number of minor issues that prevent
MinnowMax from building and booting using latest verison of
edk2/master. With these updates, MinnowMax for both IA32 and
X64 can boot to the UEFI Shell.
A few of these changes are workarounds for issues in the
binary support modules for MinnowMax. These workarounds will
be removed in the future once the issues are addressed.
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: David Wei <david.wei@intel.com>
Cc: Mang Guo <mang.guo@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
Michael Kinney (6):
Vlv2TbltDevicePkg: Allow BaseTools to run from sources
Vlv2TbltDevicePkg: Set CAPSULE_ENABLE to TRUE
Vlv2TbltDevicePkg/PlatformInitPei: Workaround unaligned SMRAM size
Vlv2TbltDevicePkg: Remove SMM binary modules from FDF
Vlv2TbltDevicePkg/PlatformFlashAccessLib: Fix IA32 build issues
Vlv2TbltDevicePkg: Fix IA32 boot timeouts
.../PlatformFlashAccessLib/PlatformFlashAccessLib.c | 12 ++++++------
Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c | 15 ++++++++++++++-
Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h | 3 ++-
Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf | 3 ++-
Vlv2TbltDevicePkg/PlatformPkg.fdf | 9 +++++++--
Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 2 +-
Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 9 +++++++--
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 9 +++------
Vlv2TbltDevicePkg/bld_vlv.bat | 2 +-
9 files changed, 43 insertions(+), 21 deletions(-)
--
2.6.3.windows.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Patch 1/6] Vlv2TbltDevicePkg: Allow BaseTools to run from sources
2016-11-29 10:11 [Patch 0/6] Fix MinnowMax build and boot issues Michael Kinney
@ 2016-11-29 10:11 ` Michael Kinney
2016-11-29 10:11 ` [Patch 2/6] Vlv2TbltDevicePkg: Set CAPSULE_ENABLE to TRUE Michael Kinney
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Michael Kinney @ 2016-11-29 10:11 UTC (permalink / raw)
To: edk2-devel; +Cc: Jiewen Yao, David Wei, Mang Guo
https://bugzilla.tianocore.org/show_bug.cgi?id=258
Update bld_vlv.bat to run BaseTools build command with a call
statement to support running the build command from python
sources.
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: David Wei <david.wei@intel.com>
Cc: Mang Guo <mang.guo@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
---
Vlv2TbltDevicePkg/bld_vlv.bat | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Vlv2TbltDevicePkg/bld_vlv.bat b/Vlv2TbltDevicePkg/bld_vlv.bat
index e02a605..6c53917 100644
--- a/Vlv2TbltDevicePkg/bld_vlv.bat
+++ b/Vlv2TbltDevicePkg/bld_vlv.bat
@@ -205,7 +205,7 @@ if %ERRORLEVEL% NEQ 0 goto BldFail
echo.
echo Invoking EDK2 build...
-build %Build_Flags%
+call build %Build_Flags%
if %ERRORLEVEL% NEQ 0 goto BldFail
--
2.6.3.windows.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Patch 2/6] Vlv2TbltDevicePkg: Set CAPSULE_ENABLE to TRUE
2016-11-29 10:11 [Patch 0/6] Fix MinnowMax build and boot issues Michael Kinney
2016-11-29 10:11 ` [Patch 1/6] Vlv2TbltDevicePkg: Allow BaseTools to run from sources Michael Kinney
@ 2016-11-29 10:11 ` Michael Kinney
2016-11-29 10:11 ` [Patch 3/6] Vlv2TbltDevicePkg/PlatformInitPei: Workaround unaligned SMRAM size Michael Kinney
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Michael Kinney @ 2016-11-29 10:11 UTC (permalink / raw)
To: edk2-devel; +Cc: Jiewen Yao, David Wei, Mang Guo
https://bugzilla.tianocore.org/show_bug.cgi?id=259
Set CAPSULE_ENABLE to TRUE so the standard Vlv2TbltDevicePkg
platform builds can complete. Build_IFWI.bat assumes this
flag is TRUE.
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: David Wei <david.wei@intel.com>
Cc: Mang Guo <mang.guo@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
---
Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
index 0932add..c93ca8a 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
@@ -63,7 +63,7 @@ DEFINE SECURE_BOOT_ENABLE = TRUE
DEFINE USER_IDENTIFICATION_ENABLE = FALSE
DEFINE VARIABLE_INFO_ENABLE = FALSE
DEFINE S3_ENABLE = TRUE
-DEFINE CAPSULE_ENABLE = FALSE
+DEFINE CAPSULE_ENABLE = TRUE
DEFINE CAPSULE_RESET_ENABLE = TRUE
DEFINE RECOVERY_ENABLE = FALSE
DEFINE MICOCODE_CAPSULE_ENABLE = FALSE
--
2.6.3.windows.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Patch 3/6] Vlv2TbltDevicePkg/PlatformInitPei: Workaround unaligned SMRAM size
2016-11-29 10:11 [Patch 0/6] Fix MinnowMax build and boot issues Michael Kinney
2016-11-29 10:11 ` [Patch 1/6] Vlv2TbltDevicePkg: Allow BaseTools to run from sources Michael Kinney
2016-11-29 10:11 ` [Patch 2/6] Vlv2TbltDevicePkg: Set CAPSULE_ENABLE to TRUE Michael Kinney
@ 2016-11-29 10:11 ` Michael Kinney
2016-11-29 10:11 ` [Patch 4/6] Vlv2TbltDevicePkg: Remove SMM binary modules from FDF Michael Kinney
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Michael Kinney @ 2016-11-29 10:11 UTC (permalink / raw)
To: edk2-devel; +Cc: Jiewen Yao, David Wei, Mang Guo
https://bugzilla.tianocore.org/show_bug.cgi?id=260
The PiSmmCPuDxeSmm module requires the SMRR base address and length
to be aligned. The memory initialization for Vlv2TbltDevicePkg
produces an SMRAM base address that is on a 16MB boundary and an
SMRAM length of 12MB. The SMRAM length is rounded up to 16MB.
This is a workaround until the binary module that produces the
gEfiSmmPeiSmramMemoryReserveGuid HOB is updated
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: David Wei <david.wei@intel.com>
Cc: Mang Guo <mang.guo@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
---
Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c | 15 ++++++++++++++-
Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h | 3 ++-
Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf | 3 ++-
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c b/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c
index cbfe78d..f8ea09a 100644
--- a/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c
+++ b/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c
@@ -1,6 +1,6 @@
/** @file
- Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2004 - 2016, 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 that accompanies this distribution.
@@ -820,6 +820,19 @@ PlatformEarlyInitEntry (
EFI_PLATFORM_INFO_HOB *PlatformInfo;
EFI_PEI_HOB_POINTERS Hob;
EFI_PLATFORM_CPU_INFO PlatformCpuInfo;
+ EFI_SMRAM_HOB_DESCRIPTOR_BLOCK *DescriptorBlock;
+ UINT64 Size;
+
+ //
+ // Make sure last SMRAM region is aligned
+ //
+ Hob.Raw = GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid);
+ if (Hob.Raw != NULL) {
+ DescriptorBlock = GET_GUID_HOB_DATA (Hob.Raw);
+ Size = DescriptorBlock->Descriptor[DescriptorBlock->NumberOfSmmReservedRegions - 1].PhysicalSize;
+ Size = LShiftU64 (1, HighBitSet64 (Size - 1) + 1);
+ DescriptorBlock->Descriptor[DescriptorBlock->NumberOfSmmReservedRegions - 1].PhysicalSize = Size;
+ }
//
// Initialize SmbusPolicy PPI
diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h b/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h
index c2cdfa3..c280fb8 100644
--- a/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h
+++ b/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h
@@ -1,6 +1,6 @@
/*++
- Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2004 - 2016, 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 that accompanies this distribution.
@@ -83,6 +83,7 @@ Abstract:
#include <Ppi/MasterBootMode.h>
#include <Guid/PlatformCpuInfo.h>
#include <Guid/OsSelection.h>
+#include <Guid/SmramMemoryReserve.h>
#define SMC_LAN_ON 0x46
#define SMC_LAN_OFF 0x47
diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf b/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf
index fc517ef..309487d 100644
--- a/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf
+++ b/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf
@@ -1,6 +1,6 @@
#
#
-# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
+# Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved
#
# This program and the accompanying materials are licensed and made available under
# the terms and conditions of the BSD License that accompanies this distribution.
@@ -102,6 +102,7 @@ ENTRY_POINT = PlatformEarlyInitEntry
gEfiNormalSetupGuid
gEfiMemoryTypeInformationGuid
gOsSelectionVariableGuid
+ gEfiSmmPeiSmramMemoryReserveGuid
[Pcd.common]
gPlatformModuleTokenSpaceGuid.PcdFlashFvMainBase
--
2.6.3.windows.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Patch 4/6] Vlv2TbltDevicePkg: Remove SMM binary modules from FDF
2016-11-29 10:11 [Patch 0/6] Fix MinnowMax build and boot issues Michael Kinney
` (2 preceding siblings ...)
2016-11-29 10:11 ` [Patch 3/6] Vlv2TbltDevicePkg/PlatformInitPei: Workaround unaligned SMRAM size Michael Kinney
@ 2016-11-29 10:11 ` Michael Kinney
2016-11-29 10:11 ` [Patch 5/6] Vlv2TbltDevicePkg/PlatformFlashAccessLib: Fix IA32 build issues Michael Kinney
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Michael Kinney @ 2016-11-29 10:11 UTC (permalink / raw)
To: edk2-devel; +Cc: Jiewen Yao, David Wei, Mang Guo
https://bugzilla.tianocore.org/show_bug.cgi?id=261
https://bugzilla.tianocore.org/show_bug.cgi?id=262
Remove the PowerManagement2 binary SMM module that generates an
ASSERT() and the DigitalThermalSensor binary SMM module that
causes an AP to be stuck in the busy state.
This is a workaround until these two SMM binary modules can be
updated.
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: David Wei <david.wei@intel.com>
Cc: Mang Guo <mang.guo@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
---
Vlv2TbltDevicePkg/PlatformPkg.fdf | 9 +++++++--
Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 9 +++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index 907c6bd..cb5b6b7 100644
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -593,8 +593,13 @@ INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
INF MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf
INF UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf
INF $(PLATFORM_PACKAGE)/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.inf
-INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf
-INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/DigitalThermalSensor.inf
+
+#
+# Remove the following two SMM binary modules that prevent platform from booting to UEFI Shell
+#
+#INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf
+#INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/DigitalThermalSensor.inf
+
#
# ACPI
#
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index dccb2c9..4243b07 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -550,8 +550,13 @@ INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
INF MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf
INF UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf
INF $(PLATFORM_PACKAGE)/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.inf
-INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf
-INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/DigitalThermalSensor.inf
+
+#
+# Remove the following two SMM binary modules that prevent platform from booting to UEFI Shell
+#
+#INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf
+#INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/DigitalThermalSensor.inf
+
#
# ACPI
#
--
2.6.3.windows.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Patch 5/6] Vlv2TbltDevicePkg/PlatformFlashAccessLib: Fix IA32 build issues
2016-11-29 10:11 [Patch 0/6] Fix MinnowMax build and boot issues Michael Kinney
` (3 preceding siblings ...)
2016-11-29 10:11 ` [Patch 4/6] Vlv2TbltDevicePkg: Remove SMM binary modules from FDF Michael Kinney
@ 2016-11-29 10:11 ` Michael Kinney
2016-11-29 10:11 ` [Patch 6/6] Vlv2TbltDevicePkg: Fix IA32 boot timeouts Michael Kinney
2016-11-29 11:33 ` [Patch 0/6] Fix MinnowMax build and boot issues Yao, Jiewen
6 siblings, 0 replies; 8+ messages in thread
From: Michael Kinney @ 2016-11-29 10:11 UTC (permalink / raw)
To: edk2-devel; +Cc: Jiewen Yao, David Wei, Mang Guo
https://bugzilla.tianocore.org/show_bug.cgi?id=263
Fix IA32 build issues in the PlatformFlashAccessLib. Some of the
UINT64 FLASH addresses values need to be typecast to UINTN.
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: David Wei <david.wei@intel.com>
Cc: Mang Guo <mang.guo@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
---
.../Library/PlatformFlashAccessLib/PlatformFlashAccessLib.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.c b/Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.c
index efa1dca..f3cb31d 100644
--- a/Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.c
+++ b/Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.c
@@ -59,7 +59,7 @@ PerformFlashWrite (
}
DEBUG((DEBUG_INFO, " - 0x%x(%x) - 0x%x\n", (UINTN)FlashAddress, (UINTN)FlashAddressType, Length));
- LibFvbFlashDeviceBlockLock(FlashAddress, Length, FALSE);
+ LibFvbFlashDeviceBlockLock((UINTN)FlashAddress, Length, FALSE);
//
// Erase & Write
@@ -67,7 +67,7 @@ PerformFlashWrite (
Status = LibFvbFlashDeviceBlockErase((UINTN)FlashAddress, Length);
ASSERT_EFI_ERROR(Status);
if (EFI_ERROR(Status)) {
- LibFvbFlashDeviceBlockLock(FlashAddress, Length, TRUE);
+ LibFvbFlashDeviceBlockLock((UINTN)FlashAddress, Length, TRUE);
DEBUG((DEBUG_ERROR, "Flash Erase error\n"));
return Status;
}
@@ -75,12 +75,12 @@ PerformFlashWrite (
Status = LibFvbFlashDeviceWrite((UINTN)FlashAddress, &Length, Buffer);
ASSERT_EFI_ERROR(Status);
if (EFI_ERROR(Status)) {
- LibFvbFlashDeviceBlockLock(FlashAddress, Length, TRUE);
+ LibFvbFlashDeviceBlockLock((UINTN)FlashAddress, Length, TRUE);
DEBUG((DEBUG_ERROR, "Flash write error\n"));
return Status;
}
- LibFvbFlashDeviceBlockLock(FlashAddress, Length, TRUE);
+ LibFvbFlashDeviceBlockLock((UINTN)FlashAddress, Length, TRUE);
return EFI_SUCCESS;
}
@@ -146,10 +146,10 @@ MicrocodeFlashWrite (
// Save original buffer
//
if (OffsetHead != 0) {
- CopyMem((UINT8 *)AlignedBuffer, (VOID *)AlignedFlashAddress, OffsetHead);
+ CopyMem((UINT8 *)AlignedBuffer, (VOID *)(UINTN)AlignedFlashAddress, OffsetHead);
}
if (OffsetTail != 0) {
- CopyMem((UINT8 *)AlignedBuffer + OffsetHead + Length, (VOID *)(AlignedFlashAddress + OffsetHead + Length), OffsetTail);
+ CopyMem((UINT8 *)AlignedBuffer + OffsetHead + Length, (VOID *)(UINTN)(AlignedFlashAddress + OffsetHead + Length), OffsetTail);
}
//
// Override new buffer
--
2.6.3.windows.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Patch 6/6] Vlv2TbltDevicePkg: Fix IA32 boot timeouts
2016-11-29 10:11 [Patch 0/6] Fix MinnowMax build and boot issues Michael Kinney
` (4 preceding siblings ...)
2016-11-29 10:11 ` [Patch 5/6] Vlv2TbltDevicePkg/PlatformFlashAccessLib: Fix IA32 build issues Michael Kinney
@ 2016-11-29 10:11 ` Michael Kinney
2016-11-29 11:33 ` [Patch 0/6] Fix MinnowMax build and boot issues Yao, Jiewen
6 siblings, 0 replies; 8+ messages in thread
From: Michael Kinney @ 2016-11-29 10:11 UTC (permalink / raw)
To: edk2-devel; +Cc: Jiewen Yao, David Wei, Mang Guo
https://bugzilla.tianocore.org/show_bug.cgi?id=264
The IA32 build gets timeouts booting to the UEFI Shell.
Update the IA32 DSC file to match the X64 DSC file
disabling the fTPM feature.
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: David Wei <david.wei@intel.com>
Cc: Mang Guo <mang.guo@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
---
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 6d88154..3a5776a 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -77,9 +77,9 @@
DEFINE PLATFORM_PCIEXPRESS_BASE = 0E0000000
- DEFINE SEC_ENABLE = TRUE
- DEFINE SEC_DEBUG_INFO_ENABLE = TRUE
- DEFINE FTPM_ENABLE = TRUE
+ DEFINE SEC_ENABLE = FALSE
+ DEFINE SEC_DEBUG_INFO_ENABLE = FALSE
+ DEFINE FTPM_ENABLE = FALSE
################################################################################
#
@@ -848,9 +848,6 @@
!if $(TPM_ENABLED) == TRUE
gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x7b, 0x3a, 0xcd, 0x72, 0xA5, 0xFE, 0x5e, 0x4f, 0x91, 0x65, 0x4d, 0xd1, 0x21, 0x87, 0xbb, 0x13}
!endif
- !if $(FTPM_ENABLE) == TRUE
- gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x7b, 0x3a, 0xcd, 0x72, 0xA5, 0xFE, 0x5e, 0x4f, 0x91, 0x65, 0x4d, 0xd1, 0x21, 0x87, 0xbb, 0x13}
- !endif
## This PCD defines the video horizontal resolution.
# This PCD could be set to 0 then video resolution could be at highest resolution.
--
2.6.3.windows.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Patch 0/6] Fix MinnowMax build and boot issues
2016-11-29 10:11 [Patch 0/6] Fix MinnowMax build and boot issues Michael Kinney
` (5 preceding siblings ...)
2016-11-29 10:11 ` [Patch 6/6] Vlv2TbltDevicePkg: Fix IA32 boot timeouts Michael Kinney
@ 2016-11-29 11:33 ` Yao, Jiewen
6 siblings, 0 replies; 8+ messages in thread
From: Yao, Jiewen @ 2016-11-29 11:33 UTC (permalink / raw)
To: Kinney, Michael D, edk2-devel@lists.01.org; +Cc: Wei, David, Guo, Mang
Reviewed-by: jiewen.yao@intel.com
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Tuesday, November 29, 2016 6:12 PM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Wei, David
> <david.wei@intel.com>; Guo, Mang <mang.guo@intel.com>
> Subject: [Patch 0/6] Fix MinnowMax build and boot issues
>
> This patch series fixes a number of minor issues that prevent
> MinnowMax from building and booting using latest verison of
> edk2/master. With these updates, MinnowMax for both IA32 and
> X64 can boot to the UEFI Shell.
>
> A few of these changes are workarounds for issues in the
> binary support modules for MinnowMax. These workarounds will
> be removed in the future once the issues are addressed.
>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: David Wei <david.wei@intel.com>
> Cc: Mang Guo <mang.guo@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
>
> Michael Kinney (6):
> Vlv2TbltDevicePkg: Allow BaseTools to run from sources
> Vlv2TbltDevicePkg: Set CAPSULE_ENABLE to TRUE
> Vlv2TbltDevicePkg/PlatformInitPei: Workaround unaligned SMRAM size
> Vlv2TbltDevicePkg: Remove SMM binary modules from FDF
> Vlv2TbltDevicePkg/PlatformFlashAccessLib: Fix IA32 build issues
> Vlv2TbltDevicePkg: Fix IA32 boot timeouts
>
> .../PlatformFlashAccessLib/PlatformFlashAccessLib.c | 12
> ++++++------
> Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c | 15
> ++++++++++++++-
> Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h | 3 ++-
> Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf | 3 ++-
> Vlv2TbltDevicePkg/PlatformPkg.fdf | 9
> +++++++--
> Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 2 +-
> Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 9
> +++++++--
> Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 9
> +++------
> Vlv2TbltDevicePkg/bld_vlv.bat | 2 +-
> 9 files changed, 43 insertions(+), 21 deletions(-)
>
> --
> 2.6.3.windows.1
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-11-29 11:33 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-29 10:11 [Patch 0/6] Fix MinnowMax build and boot issues Michael Kinney
2016-11-29 10:11 ` [Patch 1/6] Vlv2TbltDevicePkg: Allow BaseTools to run from sources Michael Kinney
2016-11-29 10:11 ` [Patch 2/6] Vlv2TbltDevicePkg: Set CAPSULE_ENABLE to TRUE Michael Kinney
2016-11-29 10:11 ` [Patch 3/6] Vlv2TbltDevicePkg/PlatformInitPei: Workaround unaligned SMRAM size Michael Kinney
2016-11-29 10:11 ` [Patch 4/6] Vlv2TbltDevicePkg: Remove SMM binary modules from FDF Michael Kinney
2016-11-29 10:11 ` [Patch 5/6] Vlv2TbltDevicePkg/PlatformFlashAccessLib: Fix IA32 build issues Michael Kinney
2016-11-29 10:11 ` [Patch 6/6] Vlv2TbltDevicePkg: Fix IA32 boot timeouts Michael Kinney
2016-11-29 11:33 ` [Patch 0/6] Fix MinnowMax build and boot issues Yao, Jiewen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox