public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH] [edk2-platforms/devel-IntelAtomProcessorE3900] FDF has unused PCDs
@ 2018-09-21 18:28 Steele, Kelly
  2018-09-27  6:01 ` Guo, Mang
  0 siblings, 1 reply; 2+ messages in thread
From: Steele, Kelly @ 2018-09-21 18:28 UTC (permalink / raw)
  To: edk2-devel@lists.01.org; +Cc: Wei, David, Guo, Mang

>From 64a0e3c16bcc91be85e368ad3150a340628a9fcc Mon Sep 17 00:00:00 2001
From: Kelly Steele <kelly.steele@intel.com>
Date: Fri, 21 Sep 2018 11:17:09 -0700
Subject: [PATCH] [edk2-platforms/devel-IntelAtomProcessorE3900] FDF has unused
PCDs

There were several PCDs that were not being used in the FDF. Removed them
and fixed up FvCallback.c to not use an additional 2 so they could be
removed as well.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Kelly Steele <kelly.steele@intel.com>
---
.../PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf      |   6 +-
.../PlatformPreMemPei/FvCallback.c                 | 104 ++++++++++++---------
.../PlatformPreMemPei/PlatformPreMemPei.inf        |   4 +-
Platform/BroxtonPlatformPkg/PlatformPkg.dec        |  10 +-
Platform/BroxtonPlatformPkg/PlatformPkg.fdf        |  41 +++-----
.../SouthCluster/ScInit/Dxe/ScInitDxe.inf          |   6 +-
6 files changed, 75 insertions(+), 96 deletions(-)

diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf b/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf
index acb5a84bbf..8725527563 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf
@@ -1,7 +1,7 @@
## @file
#  Module Infomation file for PEI PeiPolicyUpdateLib Library.
#
-#  Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2011 - 2018, 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
@@ -86,8 +86,4 @@
[FixedPcd]
   gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize
   gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress
-  gPlatformModuleTokenSpaceGuid.PcdFlashIbbRegionMappedBase
-  gPlatformModuleTokenSpaceGuid.PcdFlashIbbRegionSize
-  gPlatformModuleTokenSpaceGuid.PcdFlashObbRegionMappedBase
-  gPlatformModuleTokenSpaceGuid.PcdFlashObbRegionSize
diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/FvCallback.c b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/FvCallback.c
index 02cda154b8..f87845bdbf 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/FvCallback.c
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/FvCallback.c
@@ -46,11 +46,11 @@ PrintSetupVariableData (
   for (Index = 0; Index < DataSize; Index++) {
     if (Index % 0x10 == 0) {
-      DEBUG ((EFI_D_INFO, "\n%08X:", Index));
+      DEBUG ((DEBUG_INFO, "\n%08X:", Index));
     }
-    DEBUG ((EFI_D_INFO, " %02X", *Data8++));
+    DEBUG ((DEBUG_INFO, " %02X", *Data8++));
   }
-  DEBUG ((EFI_D_INFO, "\n"));
+  DEBUG ((DEBUG_INFO, "\n"));
}

@@ -81,7 +81,7 @@ CreateDefaultVariableHob (
     return EFI_INVALID_PARAMETER;
   }
-  DEBUG ((EFI_D_INFO, "Total size requested for HOB = %d.\n", (sizeof (VARIABLE_STORE_HEADER) + DefaultVariableDataSize + HEADER_ALIGNMENT - 1)));
+  DEBUG ((DEBUG_INFO, "Total size requested for HOB = %d.\n", (sizeof (VARIABLE_STORE_HEADER) + DefaultVariableDataSize + HEADER_ALIGNMENT - 1)));
   VariableStoreHeaderHob = (VARIABLE_STORE_HEADER *) BuildGuidHob (&VariableStoreHeader->Signature,
                                                                    sizeof (VARIABLE_STORE_HEADER) + DefaultVariableDataSize + HEADER_ALIGNMENT - 1);
@@ -90,7 +90,7 @@ CreateDefaultVariableHob (
     return EFI_OUT_OF_RESOURCES;
   }
-  DEBUG ((EFI_D_INFO, "Default HOB allocated at 0x%x\n", VariableStoreHeaderHob));
+  DEBUG ((DEBUG_INFO, "Default HOB allocated at 0x%x\n", VariableStoreHeaderHob));
   //
   // Copy the variable store header to the beginning of the HOB
@@ -148,27 +148,27 @@ CreateVariableHobs (
   VARIABLE_HEADER                   *LastVariableStoreVariableHeader  = NULL;
   SYSTEM_CONFIGURATION              *SystemConfiguration              = NULL;
-  DEBUG ((EFI_D_INFO, "Loading variable defaults from NvStorage...\n"));
-  DEBUG ((EFI_D_INFO, "  NvStorageHeader at 0x%x\n", NvStorageFvHeader));
+  DEBUG ((DEBUG_INFO, "Loading variable defaults from NvStorage...\n"));
+  DEBUG ((DEBUG_INFO, "  NvStorageHeader at 0x%x\n", NvStorageFvHeader));
   if (NvStorageFvHeader == NULL \
     || NvStorageFvHeader->Signature != EFI_FVH_SIGNATURE \
     || !CompareGuid (&gEfiSystemNvDataFvGuid, &NvStorageFvHeader->FileSystemGuid)) {
-    DEBUG ((EFI_D_ERROR, "  NvStorage FV passed to gather setup defaults is invalid!\n"));
+    DEBUG ((DEBUG_ERROR, "  NvStorage FV passed to gather setup defaults is invalid!\n"));
     return EFI_INVALID_PARAMETER;
   }
   VariableStoreBase   = (EFI_PHYSICAL_ADDRESS) ((UINTN) NvStorageFvHeader + (UINTN)(NvStorageFvHeader->HeaderLength));
   VariableStoreHeader = (VARIABLE_STORE_HEADER *) (UINTN) VariableStoreBase;
-  DEBUG ((EFI_D_INFO, "  VariableStoreHeader at 0x%x. VariableStoreSize = %d\n", VariableStoreHeader, (UINTN) VariableStoreHeader->Size));
+  DEBUG ((DEBUG_INFO, "  VariableStoreHeader at 0x%x. VariableStoreSize = %d\n", VariableStoreHeader, (UINTN) VariableStoreHeader->Size));
   AuthenticatedVariableStore = (BOOLEAN) CompareGuid (&VariableStoreHeader->Signature, &gEfiAuthenticatedVariableGuid);
   StartVariableStoreVariableHeader = (VARIABLE_HEADER *) HEADER_ALIGN (VariableStoreHeader + 1);
   LastVariableStoreVariableHeader = (VARIABLE_HEADER *) HEADER_ALIGN ((CHAR8 *) VariableStoreHeader + VariableStoreHeader->Size);
-  DEBUG ((EFI_D_INFO, "  StartVariableStoreVariableHeader at 0x%x. LastVariableSearchHeader at 0x%x\n", StartVariableStoreVariableHeader, LastVariableStoreVariableHeader));
+  DEBUG ((DEBUG_INFO, "  StartVariableStoreVariableHeader at 0x%x. LastVariableSearchHeader at 0x%x\n", StartVariableStoreVariableHeader, LastVariableStoreVariableHeader));
   ASSERT (StartVariableStoreVariableHeader < LastVariableStoreVariableHeader);
@@ -196,20 +196,20 @@ CreateVariableHobs (
       VariableState    = ((AUTHENTICATED_VARIABLE_HEADER *) VariableSearchHeader)->State;
     }
-    DEBUG ((EFI_D_INFO, "  VariableName at 0x%x.\n", VariableName));
+    DEBUG ((DEBUG_INFO, "  VariableName at 0x%x.\n", VariableName));
     VariableSearchCandidateDataPtr = (UINT8 *) (((CHAR8 *) VariableSearchHeader + VariableHeaderSize) \
                                        + VariableNameSize \
                                        + GET_PAD_SIZE (VariableNameSize));
-    DEBUG ((EFI_D_INFO, "  VariableSearchCandidatePtr at 0x%x.\n", (UINTN) VariableSearchCandidateDataPtr));
-    DEBUG ((EFI_D_INFO, "    Variable name is %s.\n", VariableName));
-    DEBUG ((EFI_D_INFO, "    Variable data size is %d bytes.\n", VariableDataSize));
+    DEBUG ((DEBUG_INFO, "  VariableSearchCandidatePtr at 0x%x.\n", (UINTN) VariableSearchCandidateDataPtr));
+    DEBUG ((DEBUG_INFO, "    Variable name is %s.\n", VariableName));
+    DEBUG ((DEBUG_INFO, "    Variable data size is %d bytes.\n", VariableDataSize));
     if (CompareGuid (&VariableGuid, &gEfiSetupVariableGuid) \
       && !StrCmp (L"Setup", VariableName) \
       && (VariableState == VAR_ADDED)) {
-      DEBUG ((EFI_D_INFO, "  Found the Setup defaults via BPDT to cache.\n"));
+      DEBUG ((DEBUG_INFO, "  Found the Setup defaults via BPDT to cache.\n"));
       SystemConfiguration   = (SYSTEM_CONFIGURATION *) VariableSearchCandidateDataPtr;
       SetupVariableSize     = VariableDataSize;
@@ -225,13 +225,13 @@ CreateVariableHobs (
   }
   if (!FoundVariableDefaults) {
-    DEBUG ((EFI_D_ERROR, "Could not find the setup defaults in the NvStorage FV!\n"));
+    DEBUG ((DEBUG_ERROR, "Could not find the setup defaults in the NvStorage FV!\n"));
     return EFI_NOT_FOUND;
   }
-  DEBUG ((EFI_D_INFO, "  Setup data before update at address 0x%x\n", SystemConfiguration));
-  DEBUG ((EFI_D_INFO, "  Size of data in Setup header = %d bytes. Size of SYSTEM_CONFIGURATION = %d bytes.\n", SetupVariableSize, sizeof (SYSTEM_CONFIGURATION)));
-  DEBUG ((EFI_D_INFO, "  Printing system configuration variable data read from the FV:\n"));
+  DEBUG ((DEBUG_INFO, "  Setup data before update at address 0x%x\n", SystemConfiguration));
+  DEBUG ((DEBUG_INFO, "  Size of data in Setup header = %d bytes. Size of SYSTEM_CONFIGURATION = %d bytes.\n", SetupVariableSize, sizeof (SYSTEM_CONFIGURATION)));
+  DEBUG ((DEBUG_INFO, "  Printing system configuration variable data read from the FV:\n"));
   PrintSetupVariableData ((UINT8 *) SystemConfiguration, VariableDataSize);
   //
@@ -239,19 +239,19 @@ CreateVariableHobs (
   //
   Status = UpdateSetupDataValues (SystemConfiguration);
   if (EFI_ERROR (Status)) {
-    DEBUG ((EFI_D_ERROR, "  Couldn't override memory and platform information system configuration values.\n"));
+    DEBUG ((DEBUG_ERROR, "  Couldn't override memory and platform information system configuration values.\n"));
   }
-  DEBUG ((EFI_D_INFO, "  Total size of data to copy for default HOB = %d bytes.\n", (UINT32) ((VariableSearchCandidateDataPtr + VariableDataSize) - (UINTN) StartVariableStoreVariableHeader)));
+  DEBUG ((DEBUG_INFO, "  Total size of data to copy for default HOB = %d bytes.\n", (UINT32) ((VariableSearchCandidateDataPtr + VariableDataSize) - (UINTN) StartVariableStoreVariableHeader)));
   Status = CreateDefaultVariableHob (VariableStoreHeader, (UINT32) ((VariableSearchCandidateDataPtr + VariableDataSize) - (UINTN) StartVariableStoreVariableHeader));
   if (EFI_ERROR (Status)) {
-    DEBUG ((EFI_D_ERROR, "  Error occurred creating the default variable HOB. Variable data is invalid.\n"));
+    DEBUG ((DEBUG_ERROR, "  Error occurred creating the default variable HOB. Variable data is invalid.\n"));
     ASSERT_EFI_ERROR (Status);
     return Status;
   }
-  DEBUG ((EFI_D_INFO, "Successfully read Setup defaults.\n"));
+  DEBUG ((DEBUG_INFO, "Successfully read Setup defaults.\n"));
   return Status;
}
@@ -279,22 +279,22 @@ ParseObbPayload (
   UINT32                           FspSImageBase;
   VOID                             *Memory;
-  DEBUG ((EFI_D_INFO, "Parsing and checking OBB Payload\n"));
+  DEBUG ((DEBUG_INFO, "Parsing and checking OBB Payload\n"));
   FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *) PayloadPtr;
   PayloadTail = (UINTN) PayloadPtr + PayloadSize;
-  DEBUG ((EFI_D_INFO, "FvHeader = 0x%x; PayloadTail = 0x%x\n", (UINT32) FvHeader, PayloadTail));
+  DEBUG ((DEBUG_INFO, "FvHeader = 0x%x; PayloadTail = 0x%x\n", (UINT32) FvHeader, PayloadTail));
   FspHeader = (FSP_INFO_HEADER *) FspFindFspHeader ((UINT32) FvHeader);
   if (FspHeader == NULL) {
-    DEBUG ((EFI_D_INFO, "Cannot find FSP-S header!\n"));
+    DEBUG ((DEBUG_INFO, "Cannot find FSP-S header!\n"));
     return EFI_DEVICE_ERROR;
   }
   FspSImageBase = FspHeader->ImageBase;
-  DEBUG ((EFI_D_INFO, "FSP-S FV Base = 0x%X\n", (UINT32) FvHeader));
-  DEBUG ((EFI_D_INFO, "FSP-S FV Length = 0x%X\n", (UINT32) FvHeader->FvLength));
-  DEBUG ((EFI_D_INFO, "FSP-S Fsp Base = 0x%X\n", (UINT32) FspSImageBase));
-  DEBUG ((EFI_D_INFO, "FSP-S Fsp Size = 0x%X\n", FspHeader->ImageSize));
+  DEBUG ((DEBUG_INFO, "FSP-S FV Base = 0x%X\n", (UINT32) FvHeader));
+  DEBUG ((DEBUG_INFO, "FSP-S FV Length = 0x%X\n", (UINT32) FvHeader->FvLength));
+  DEBUG ((DEBUG_INFO, "FSP-S Fsp Base = 0x%X\n", (UINT32) FspSImageBase));
+  DEBUG ((DEBUG_INFO, "FSP-S Fsp Size = 0x%X\n", FspHeader->ImageSize));
   //
   // Copy to FSP-S to preferred base. The preferred base is defined in FSP Integration Guide.
@@ -311,7 +311,7 @@ ParseObbPayload (
   while ((UINT32) FvHeader < PayloadTail) {
     if (FvHeader->Signature != EFI_FVH_SIGNATURE) {
-      DEBUG ((EFI_D_ERROR, "Found Fv with invalid signature -- Stop parsing OBB.\n"));
+      DEBUG ((DEBUG_ERROR, "Found Fv with invalid signature -- Stop parsing OBB.\n"));
       break;
     }
@@ -320,13 +320,13 @@ ParseObbPayload (
     } else {
       FvName = (EFI_GUID *) ((UINTN) FvHeader + FvHeader->ExtHeaderOffset);
     }
-    DEBUG ((EFI_D_INFO, "Found Fv with GUID: %g\n", FvName));
+    DEBUG ((DEBUG_INFO, "Found Fv with GUID: %g\n", FvName));
     if (CompareGuid (&FvHeader->FileSystemGuid, &gEfiSystemNvDataFvGuid)) {
-      DEBUG ((EFI_D_INFO, "NVStorage FV at 0x%x.\n", (UINT32) FvHeader));
+      DEBUG ((DEBUG_INFO, "NVStorage FV at 0x%x.\n", (UINT32) FvHeader));
       Status = PeiServicesLocatePpi (&gEfiPeiReadOnlyVariable2PpiGuid, 0, NULL, (VOID **) &VariableServices);
       if (EFI_ERROR (Status)) {
-        DEBUG ((EFI_D_ERROR, "Could not locate EFI_PEI_READ_ONLY_VARIABLE2_PPI.\n"));
+        DEBUG ((DEBUG_ERROR, "Could not locate EFI_PEI_READ_ONLY_VARIABLE2_PPI.\n"));
         ASSERT_EFI_ERROR (Status);
         return EFI_NOT_FOUND;
       }
@@ -343,18 +343,18 @@ ParseObbPayload (
                                    );
       if (Status == EFI_NOT_FOUND || FdoEnabledGuidHob != NULL) {
-        DEBUG ((EFI_D_INFO, "Initializing variable defaults from BPDT...\n"));
+        DEBUG ((DEBUG_INFO, "Initializing variable defaults from BPDT...\n"));
         //
         // Create the variable default HOB
         //
         Status = CreateVariableHobs (FvHeader);
       } else if (EFI_ERROR (Status)) {
-        DEBUG ((EFI_D_ERROR, "Unable to read Setup variable to determine if defauls should be loaded.\n"));
+        DEBUG ((DEBUG_ERROR, "Unable to read Setup variable to determine if defauls should be loaded.\n"));
         ASSERT_EFI_ERROR (Status);
       }
     } else if (CompareGuid (FvName, &gObbyFirmwareFileSystemFvGuid)) {
-      DEBUG ((EFI_D_INFO, "Found OBBY: Saving info and skipping Install FV.\n"));
+      DEBUG ((DEBUG_INFO, "Found OBBY: Saving info and skipping Install FV.\n"));
       GuidHobPtr = GetFirstGuidHob (&gEfiPlatformInfoGuid);
       ASSERT (GuidHobPtr != NULL);
       PlatformInfo = GET_GUID_HOB_DATA (GuidHobPtr);
@@ -404,12 +404,16 @@ GetFvNotifyCallback (
   IN VOID                       *Ppi
   )
{
-  EFI_STATUS                    Status = EFI_SUCCESS;
-  EFI_BOOT_MODE                 BootMode;
-  BPDT_PAYLOAD_DATA             *BpdtPayloadPtr;
+  EFI_STATUS                     Status = EFI_SUCCESS;
+  EFI_BOOT_MODE                  BootMode;
+  BPDT_PAYLOAD_DATA             *ObbPayloadPtr;
   EFI_HOB_GUID_TYPE             *GuidHobPtr;
   BPDT_HEADER                   *Bp1HdrPtr;
   BPDT_HEADER                   *Bp2HdrPtr;
+  SUBPART_DIR_HEADER            *DirectoryHeader;
+  SUBPART_DIR_ENTRY             *DirectoryEntry;
+  VOID                          *ObbDataPtr;
+  UINT32                         ObbDataSize;
   PeiServicesGetBootMode (&BootMode);
@@ -419,10 +423,10 @@ GetFvNotifyCallback (
   //
   GuidHobPtr = GetFirstGuidHob (&gEfiBpdtLibBp2DataGuid);
   if (GuidHobPtr != NULL) {
-    DEBUG ((EFI_D_INFO, "GetFvNotifyCallback already called. Skipping.\n"));
+    DEBUG ((DEBUG_INFO, "GetFvNotifyCallback already called. Skipping.\n"));
     return Status;
   }
-
+
   //
   // Locate headers of both Boot partion 1 and 2
   //
@@ -436,7 +440,15 @@ GetFvNotifyCallback (
   //
   //  Get the OBB payload, shadow it, and check the hash before processing it.
   //
-  GetBpdtPayloadData (BootPart2, BpdtObb, &BpdtPayloadPtr);
+  Status = GetBpdtPayloadData (BootPart2, BpdtObb, &ObbPayloadPtr);
+  if (EFI_ERROR (Status)) {
+    DEBUG((DEBUG_ERROR, "ERROR: Failed to find OBB, Status = %r\n", Status));
+    CpuDeadLoop();
+  }
+  DirectoryHeader = (SUBPART_DIR_HEADER *) ObbPayloadPtr->DataPtr;
+  DirectoryEntry  = (SUBPART_DIR_ENTRY *) ((UINTN) DirectoryHeader + sizeof (SUBPART_DIR_HEADER));
+  ObbDataPtr      = (VOID *) ((UINTN) DirectoryHeader + DirectoryEntry->EntryOffset);
+  ObbDataSize     = ObbPayloadPtr->Size - 0x1000;
 #if (BOOT_GUARD_ENABLE == 1)
   //
@@ -448,15 +460,15 @@ GetFvNotifyCallback (
   if (BootMode != BOOT_ON_S3_RESUME) {
     Status = LocateAndVerifyHashBpm (HashObb);
     if (EFI_ERROR (Status)) {
-      DEBUG((EFI_D_ERROR, "Verify OBB failed, Status = %r\n", Status));
+      DEBUG((DEBUG_ERROR, "Verify OBB failed, Status = %r\n", Status));
       CpuDeadLoop();
     }
   }
#endif
-  DEBUG ((EFI_D_INFO, "GetFvNotifyCallback: Processing OBB Payload.\n"));
+  DEBUG ((DEBUG_INFO, "GetFvNotifyCallback: Processing OBB Payload.\n"));
-  ParseObbPayload ((UINT8*) PcdGet32 (PcdFlashObbPayloadMappedBase), PcdGet32 (PcdFlashObbPayloadSize), BootMode);
+  ParseObbPayload ((UINT8*) ObbDataPtr, ObbDataSize, BootMode);
   //
   // Set Zephr ID
diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformPreMemPei.inf b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformPreMemPei.inf
index 2c3ba738e3..fc728b2f35 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformPreMemPei.inf
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformPreMemPei.inf
@@ -34,7 +34,7 @@
#   2. MemoryCallback.c - Includes a memory call back function notified when
#      MRC is done.
#
-#  Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2012 - 2018, 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
@@ -160,8 +160,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase
   gPlatformModuleTokenSpaceGuid.PcdFlashFvOBBYBase
   gPlatformModuleTokenSpaceGuid.PcdFlashFvOBBYSize
-  gPlatformModuleTokenSpaceGuid.PcdFlashObbPayloadMappedBase
-  gPlatformModuleTokenSpaceGuid.PcdFlashObbPayloadSize
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
   gEfiBxtTokenSpaceGuid.PcdScAcpiIoPortBaseAddress
   gEfiBxtTokenSpaceGuid.PcdIafwPlatformInfo              ## PRODUCES
diff --git a/Platform/BroxtonPlatformPkg/PlatformPkg.dec b/Platform/BroxtonPlatformPkg/PlatformPkg.dec
index c27ac042ab..a12ac5f5e9 100644
--- a/Platform/BroxtonPlatformPkg/PlatformPkg.dec
+++ b/Platform/BroxtonPlatformPkg/PlatformPkg.dec
@@ -111,7 +111,7 @@
   gHiiExportDatabaseGuid                  = { 0x1b838190, 0x4625, 0x4ead, { 0xab, 0xc9, 0xcd, 0x5e, 0x6a, 0xf1, 0x8f, 0xe0 } }
   gEfiHtBistHobGuid                       = { 0xBE644001, 0xE7D4, 0x48B1, { 0xB0, 0x96, 0x8B, 0xA0, 0x47, 0xBC, 0x7A, 0xE7 } }
-  gEfiTscFrequencyGuid                = { 0xdba6a7e3, 0xbb57, 0x4be7, { 0x8a, 0xf8, 0xd5, 0x78, 0xdb, 0x7e, 0x56, 0x87 }}
+  gEfiTscFrequencyGuid                    = { 0xdba6a7e3, 0xbb57, 0x4be7, { 0x8a, 0xf8, 0xd5, 0x78, 0xdb, 0x7e, 0x56, 0x87 } }
   # GUID for EEPROM variables - {EE96CA33-5F59-4594-9869-07F79AA3C06F}
   gEepromVariableGuid                     = { 0xEE96CA33, 0x5F59, 0x4594, { 0x98, 0x69, 0x07, 0xF7, 0x9A, 0xA3, 0xC0, 0x6F } }
@@ -215,7 +215,6 @@
   ## This PCD is used to enable or disable PCIE port 3
   gPlatformModuleTokenSpaceGuid.PcdPciePort3Enable|TRUE|BOOLEAN|0x80000020
-
   ## MemoryCheck value for checking memory before boot OS.
   ## To save the boot performance, the default MemoryCheck is set to 0.
   gClientCommonModuleTokenSpaceGuid.PcdPlatformMemoryCheck|0|UINT8|0x40000005
@@ -297,12 +296,6 @@
   gPlatformModuleTokenSpaceGuid.PcdFlashFvIBBLSize|0x00001000|UINT32|0x20000003
   gPlatformModuleTokenSpaceGuid.PcdFlashNvStorageBase|0xFFF60000|UINT32|0x20000007
   gPlatformModuleTokenSpaceGuid.PcdFlashNvStorageSize|0x00010000|UINT32|0x20000008
-  gPlatformModuleTokenSpaceGuid.PcdFlashObbPayloadMappedBase|0xFFC82040|UINT32|0x2000000B
-  gPlatformModuleTokenSpaceGuid.PcdFlashObbPayloadSize|0x002DA000|UINT32|0x2000000C
-  gPlatformModuleTokenSpaceGuid.PcdFlashIbbRegionMappedBase|0xFF980000|UINT32|0x2000000D
-  gPlatformModuleTokenSpaceGuid.PcdFlashIbbRegionSize|0x0007A000|UINT32|0x2000000E
-  gPlatformModuleTokenSpaceGuid.PcdFlashObbRegionMappedBase|0xFFC82000|UINT32|0x2000000F
-  gPlatformModuleTokenSpaceGuid.PcdFlashObbRegionSize|0x002DB000|UINT32|0x20000010
   gClientCommonModuleTokenSpaceGuid.PcdMaxConsoleDeviceNum|0x05|UINT8|0x10000007
   gMinnowModuleTokenSpaceGuid.PcdDefaultFabId|0x03|UINT8|0x20000001
   gEfiIchTokenSpaceGuid.PcdPeiIchEhciControllerMemoryBaseAddress|0xFD000000|UINT32|0x30000019
@@ -365,7 +358,6 @@
   gPlatformModuleTokenSpaceGuid.PcdGpioWhiteList|{0xFF, 0xFF, 0xFF, 0xFF}|VOID*|0xEEEE2005
 [PcdsPatchableInModule]
-
   ## MemoryCheck value for checking memory before boot OS.
   ## To save the boot performance, the default MemoryCheck is set to 0.
   gClientCommonModuleTokenSpaceGuid.PcdPlatformMemoryCheck|0|UINT8|0x40000005
diff --git a/Platform/BroxtonPlatformPkg/PlatformPkg.fdf b/Platform/BroxtonPlatformPkg/PlatformPkg.fdf
index 365f7d2628..f0e520da06 100644
--- a/Platform/BroxtonPlatformPkg/PlatformPkg.fdf
+++ b/Platform/BroxtonPlatformPkg/PlatformPkg.fdf
@@ -73,23 +73,14 @@
   DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE       = 0x00040000
   DEFINE FLASH_REGION_FV_IBBM_OFFSET                              = $(FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET) + $(FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE)
-  DEFINE FLASH_REGION_FV_IBBL_SIZE                                = 0x00001000
-
   DEFINE FLASH_REGION_FV_IBBM_SIZE                                = $(BLD_IBBM_SIZE)
+
+  DEFINE FLASH_REGION_FV_IBBL_SIZE                                = 0x00001000
   DEFINE FLASH_REGION_FV_IBBL_OFFSET                              = $(FLASH_SIZE) - $(FLASH_REGION_FV_IBBL_SIZE)
   DEFINE FLASH_FV_RECOVERY_BASE                                   = 0xFFF80000
   DEFINE FLASH_FV_RECOVERY_SIZE                                   = 0x00080000
-  DEFINE FLASH_OBB_PAYLOAD_MAPPED_BASE                            = 0xFFC82040
-  DEFINE FLASH_OBB_PAYLOAD_SIZE                                   = 0x002EA000
-
-  DEFINE FLASH_IBB_REGION_MAPPED_BASE                             = 0xFF980000
-  DEFINE FLASH_IBB_REGION_SIZE                                    = 0x0007A000
-
-  DEFINE FLASH_OBB_REGION_MAPPED_BASE                             = 0xFFC82000
-  DEFINE FLASH_OBB_REGION_SIZE                                    = 0x002EB000
-
################################################################################
#
# FD Section
@@ -122,12 +113,6 @@
   SET gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize                   = $(FLASH_AREA_SIZE)
   SET gPlatformModuleTokenSpaceGuid.PcdFlashNvStorageBase              = $(FLASH_BASE) + $(FLASH_REGION_VPD_OFFSET)
   SET gPlatformModuleTokenSpaceGuid.PcdFlashNvStorageSize              = $(FLASH_REGION_VPD_SIZE) + $(FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_SIZE) + $(FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE)
-  SET gPlatformModuleTokenSpaceGuid.PcdFlashObbPayloadMappedBase       = $(FLASH_OBB_PAYLOAD_MAPPED_BASE)
-  SET gPlatformModuleTokenSpaceGuid.PcdFlashObbPayloadSize             = $(FLASH_OBB_PAYLOAD_SIZE)
-  SET gPlatformModuleTokenSpaceGuid.PcdFlashIbbRegionMappedBase        = $(FLASH_IBB_REGION_MAPPED_BASE)
-  SET gPlatformModuleTokenSpaceGuid.PcdFlashIbbRegionSize              = $(FLASH_IBB_REGION_SIZE)
-  SET gPlatformModuleTokenSpaceGuid.PcdFlashObbRegionMappedBase        = $(FLASH_OBB_REGION_MAPPED_BASE)
-  SET gPlatformModuleTokenSpaceGuid.PcdFlashObbRegionSize              = $(FLASH_OBB_REGION_SIZE)
 ################################################################################
#
@@ -242,24 +227,24 @@
   INF $(PLATFORM_PACKAGE_COMMON)/SampleCode/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
   INF $(PLATFORM_PACKAGE_COMMON)/PlatformSettings/PlatformPostMemPei/PlatformPostMemPei.inf
-
+
!if $(PEI_DISPLAY_ENABLE) == TRUE
   FILE FREEFORM = PCD(gPlatformModuleTokenSpaceGuid.PcdTianoCoreLogoFileGuid) {
     SECTION RAW = $(PLATFORM_PACKAGE_COMMON)/Binaries/Logo/Tianocore.bmp
   }
-
+
   # VBT For Leaf Hill (File Guid is gPeiLeafHillVbtGuid)
   FILE FREEFORM = 6AE80680-5E3F-4E63-A5F5-78E5214F13FE {
     SECTION RAW = $(PLATFORM_NAME)/Board/LeafHill/Vbt/VbtBxtMipi.bin
     SECTION UI = "IntelGopVbt1"
   }
-
+
   # VBT For Minnowboard 3 (File Guid is gPeiMinnowBoard3VbtGuid)
   FILE FREEFORM = E08CA6D5-8D02-43ae-ABB1-952CC787C933 {
     SECTION RAW = $(PLATFORM_NAME)/Board/MinnowBoard3/Vbt/VbtBxtMipi.bin
     SECTION UI = "IntelGopVbt1"
   }
-
+
   # VBT For Minnowboard 3 Module (File Guid is gPeiMinnow3ModuleVbtGuid)
   FILE FREEFORM = 1F9CBB42-107E-46A4-A2CB-92F586F9FB31 {
     SECTION RAW = $(PLATFORM_NAME)/Board/MinnowBoard3Module/Vbt/VbtBxtMipi.bin
@@ -317,7 +302,7 @@
   #
   INF $(PLATFORM_PACKAGE_COMMON)/PlatformSettings/PlatformVTdInfoPei/PlatformVTdInfoPei.inf
   INF IntelSiliconPkg/Feature/VTd/IntelVTdPmrPei/IntelVTdPmrPei.inf
-
+
[FV.FVIBBM]
   BlockSize          = $(FLASH_BLOCK_SIZE)
   FvBaseAddress      = 0xFEF45000
@@ -612,11 +597,11 @@ APRIORI DXE {
   INF $(PLATFORM_PACKAGE_COMMON)/Console/GraphicsOutputDxe/GraphicsOutputDxe.inf
   FILE FREEFORM = PCD(gPlatformModuleTokenSpaceGuid.PcdTianoCoreLogoFileGuid) {
-  SECTION RAW = $(PLATFORM_PACKAGE_COMMON)/Binaries/Logo/Tianocore.bmp
+    SECTION RAW = $(PLATFORM_PACKAGE_COMMON)/Binaries/Logo/Tianocore.bmp
   }
-
+
   FILE FREEFORM = PCD(gPlatformModuleTokenSpaceGuid.PcdLogoFileGuid) {
-  SECTION RAW = $(PLATFORM_NAME)/Board/MinnowBoard3/Logo/MinnowBoardLogo.bmp
+    SECTION RAW = $(PLATFORM_NAME)/Board/MinnowBoard3/Logo/MinnowBoardLogo.bmp
   }
   INF $(PLATFORM_PACKAGE_COMMON)/PnpDxe/PnpDxe.inf
@@ -711,7 +696,7 @@ APRIORI DXE {
   #
   INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
   INF $(PLATFORM_PACKAGE_COMMON)/Features/Smbios/SmBiosMiscDxe/SmBiosMiscDxe.inf
-
+
   #
   #SM Bus
   #
@@ -721,7 +706,7 @@ APRIORI DXE {
   # LAN/Network
   #
!if $(NETWORK_ENABLE) == TRUE
-
+
   FILE DRIVER = 51B24E4E-FDD2-4047-BE4D-131873A457B2 {
     SECTION PE32 = BroxtonPlatformPkg/Common/Binaries/UNDI/AX88179/AX88179_178A_UEFI_V2.8.0_X64.efi
     SECTION UI = "UNDI"
@@ -782,7 +767,7 @@ APRIORI DXE {
   #
   INF  $(PLATFORM_PACKAGE_COMMON)/Acpi/UsbTypeCDxe/UsbTypeCDxe.inf
-
+
   #
   # VT-d for MDA Protection
   #
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Dxe/ScInitDxe.inf b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Dxe/ScInitDxe.inf
index 5b31b18fab..2694813cc7 100644
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Dxe/ScInitDxe.inf
+++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Dxe/ScInitDxe.inf
@@ -1,7 +1,7 @@
## @file
#  SC Initialization driver
#
-#  Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2012 - 2018, 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
@@ -94,10 +94,6 @@
   gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize
   gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress
-  gPlatformModuleTokenSpaceGuid.PcdFlashIbbRegionMappedBase
-  gPlatformModuleTokenSpaceGuid.PcdFlashIbbRegionSize
-  gPlatformModuleTokenSpaceGuid.PcdFlashObbRegionMappedBase
-  gPlatformModuleTokenSpaceGuid.PcdFlashObbRegionSize
 [Depex]
   gEfiSmmControl2ProtocolGuid
--
2.11.0.windows.1



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] [edk2-platforms/devel-IntelAtomProcessorE3900] FDF has unused PCDs
  2018-09-21 18:28 [PATCH] [edk2-platforms/devel-IntelAtomProcessorE3900] FDF has unused PCDs Steele, Kelly
@ 2018-09-27  6:01 ` Guo, Mang
  0 siblings, 0 replies; 2+ messages in thread
From: Guo, Mang @ 2018-09-27  6:01 UTC (permalink / raw)
  To: Steele, Kelly, edk2-devel@lists.01.org; +Cc: Wei, David

Reviewed-by: Guo Mang <mang.guo@intel.com<mailto:mang.guo@intel.com>>


Thanks,
Mang

From: Steele, Kelly
Sent: Saturday, September 22, 2018 2:29 AM
To: edk2-devel@lists.01.org
Cc: Wei, David; Guo, Mang
Subject: [PATCH] [edk2-platforms/devel-IntelAtomProcessorE3900] FDF has unused PCDs

>From 64a0e3c16bcc91be85e368ad3150a340628a9fcc Mon Sep 17 00:00:00 2001
From: Kelly Steele <kelly.steele@intel.com>
Date: Fri, 21 Sep 2018 11:17:09 -0700
Subject: [PATCH] [edk2-platforms/devel-IntelAtomProcessorE3900] FDF has unused
PCDs

There were several PCDs that were not being used in the FDF. Removed them
and fixed up FvCallback.c to not use an additional 2 so they could be
removed as well.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Kelly Steele <kelly.steele@intel.com>
---
.../PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf      |   6 +-
.../PlatformPreMemPei/FvCallback.c                 | 104 ++++++++++++---------
.../PlatformPreMemPei/PlatformPreMemPei.inf        |   4 +-
Platform/BroxtonPlatformPkg/PlatformPkg.dec        |  10 +-
Platform/BroxtonPlatformPkg/PlatformPkg.fdf        |  41 +++-----
.../SouthCluster/ScInit/Dxe/ScInitDxe.inf          |   6 +-
6 files changed, 75 insertions(+), 96 deletions(-)

diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf b/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf
index acb5a84bbf..8725527563 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf
@@ -1,7 +1,7 @@
## @file
#  Module Infomation file for PEI PeiPolicyUpdateLib Library.
#
-#  Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2011 - 2018, 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
@@ -86,8 +86,4 @@
[FixedPcd]
   gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize
   gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress
-  gPlatformModuleTokenSpaceGuid.PcdFlashIbbRegionMappedBase
-  gPlatformModuleTokenSpaceGuid.PcdFlashIbbRegionSize
-  gPlatformModuleTokenSpaceGuid.PcdFlashObbRegionMappedBase
-  gPlatformModuleTokenSpaceGuid.PcdFlashObbRegionSize

diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/FvCallback.c b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/FvCallback.c
index 02cda154b8..f87845bdbf 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/FvCallback.c
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/FvCallback.c
@@ -46,11 +46,11 @@ PrintSetupVariableData (

   for (Index = 0; Index < DataSize; Index++) {
     if (Index % 0x10 == 0) {
-      DEBUG ((EFI_D_INFO, "\n%08X:", Index));
+      DEBUG ((DEBUG_INFO, "\n%08X:", Index));
     }
-    DEBUG ((EFI_D_INFO, " %02X", *Data8++));
+    DEBUG ((DEBUG_INFO, " %02X", *Data8++));
   }
-  DEBUG ((EFI_D_INFO, "\n"));
+  DEBUG ((DEBUG_INFO, "\n"));
}


@@ -81,7 +81,7 @@ CreateDefaultVariableHob (
     return EFI_INVALID_PARAMETER;
   }

-  DEBUG ((EFI_D_INFO, "Total size requested for HOB = %d.\n", (sizeof (VARIABLE_STORE_HEADER) + DefaultVariableDataSize + HEADER_ALIGNMENT - 1)));
+  DEBUG ((DEBUG_INFO, "Total size requested for HOB = %d.\n", (sizeof (VARIABLE_STORE_HEADER) + DefaultVariableDataSize + HEADER_ALIGNMENT - 1)));

   VariableStoreHeaderHob = (VARIABLE_STORE_HEADER *) BuildGuidHob (&VariableStoreHeader->Signature,
                                                                    sizeof (VARIABLE_STORE_HEADER) + DefaultVariableDataSize + HEADER_ALIGNMENT - 1);
@@ -90,7 +90,7 @@ CreateDefaultVariableHob (
     return EFI_OUT_OF_RESOURCES;
   }

-  DEBUG ((EFI_D_INFO, "Default HOB allocated at 0x%x\n", VariableStoreHeaderHob));
+  DEBUG ((DEBUG_INFO, "Default HOB allocated at 0x%x\n", VariableStoreHeaderHob));

   //
   // Copy the variable store header to the beginning of the HOB
@@ -148,27 +148,27 @@ CreateVariableHobs (
   VARIABLE_HEADER                   *LastVariableStoreVariableHeader  = NULL;
   SYSTEM_CONFIGURATION              *SystemConfiguration              = NULL;

-  DEBUG ((EFI_D_INFO, "Loading variable defaults from NvStorage...\n"));
-  DEBUG ((EFI_D_INFO, "  NvStorageHeader at 0x%x\n", NvStorageFvHeader));
+  DEBUG ((DEBUG_INFO, "Loading variable defaults from NvStorage...\n"));
+  DEBUG ((DEBUG_INFO, "  NvStorageHeader at 0x%x\n", NvStorageFvHeader));

   if (NvStorageFvHeader == NULL \
     || NvStorageFvHeader->Signature != EFI_FVH_SIGNATURE \
     || !CompareGuid (&gEfiSystemNvDataFvGuid, &NvStorageFvHeader->FileSystemGuid)) {
-    DEBUG ((EFI_D_ERROR, "  NvStorage FV passed to gather setup defaults is invalid!\n"));
+    DEBUG ((DEBUG_ERROR, "  NvStorage FV passed to gather setup defaults is invalid!\n"));
     return EFI_INVALID_PARAMETER;
   }

   VariableStoreBase   = (EFI_PHYSICAL_ADDRESS) ((UINTN) NvStorageFvHeader + (UINTN)(NvStorageFvHeader->HeaderLength));
   VariableStoreHeader = (VARIABLE_STORE_HEADER *) (UINTN) VariableStoreBase;

-  DEBUG ((EFI_D_INFO, "  VariableStoreHeader at 0x%x. VariableStoreSize = %d\n", VariableStoreHeader, (UINTN) VariableStoreHeader->Size));
+  DEBUG ((DEBUG_INFO, "  VariableStoreHeader at 0x%x. VariableStoreSize = %d\n", VariableStoreHeader, (UINTN) VariableStoreHeader->Size));

   AuthenticatedVariableStore = (BOOLEAN) CompareGuid (&VariableStoreHeader->Signature, &gEfiAuthenticatedVariableGuid);

   StartVariableStoreVariableHeader = (VARIABLE_HEADER *) HEADER_ALIGN (VariableStoreHeader + 1);
   LastVariableStoreVariableHeader = (VARIABLE_HEADER *) HEADER_ALIGN ((CHAR8 *) VariableStoreHeader + VariableStoreHeader->Size);

-  DEBUG ((EFI_D_INFO, "  StartVariableStoreVariableHeader at 0x%x. LastVariableSearchHeader at 0x%x\n", StartVariableStoreVariableHeader, LastVariableStoreVariableHeader));
+  DEBUG ((DEBUG_INFO, "  StartVariableStoreVariableHeader at 0x%x. LastVariableSearchHeader at 0x%x\n", StartVariableStoreVariableHeader, LastVariableStoreVariableHeader));

   ASSERT (StartVariableStoreVariableHeader < LastVariableStoreVariableHeader);

@@ -196,20 +196,20 @@ CreateVariableHobs (
       VariableState    = ((AUTHENTICATED_VARIABLE_HEADER *) VariableSearchHeader)->State;
     }

-    DEBUG ((EFI_D_INFO, "  VariableName at 0x%x.\n", VariableName));
+    DEBUG ((DEBUG_INFO, "  VariableName at 0x%x.\n", VariableName));

     VariableSearchCandidateDataPtr = (UINT8 *) (((CHAR8 *) VariableSearchHeader + VariableHeaderSize) \
                                        + VariableNameSize \
                                        + GET_PAD_SIZE (VariableNameSize));

-    DEBUG ((EFI_D_INFO, "  VariableSearchCandidatePtr at 0x%x.\n", (UINTN) VariableSearchCandidateDataPtr));
-    DEBUG ((EFI_D_INFO, "    Variable name is %s.\n", VariableName));
-    DEBUG ((EFI_D_INFO, "    Variable data size is %d bytes.\n", VariableDataSize));
+    DEBUG ((DEBUG_INFO, "  VariableSearchCandidatePtr at 0x%x.\n", (UINTN) VariableSearchCandidateDataPtr));
+    DEBUG ((DEBUG_INFO, "    Variable name is %s.\n", VariableName));
+    DEBUG ((DEBUG_INFO, "    Variable data size is %d bytes.\n", VariableDataSize));

     if (CompareGuid (&VariableGuid, &gEfiSetupVariableGuid) \
       && !StrCmp (L"Setup", VariableName) \
       && (VariableState == VAR_ADDED)) {
-      DEBUG ((EFI_D_INFO, "  Found the Setup defaults via BPDT to cache.\n"));
+      DEBUG ((DEBUG_INFO, "  Found the Setup defaults via BPDT to cache.\n"));

       SystemConfiguration   = (SYSTEM_CONFIGURATION *) VariableSearchCandidateDataPtr;
       SetupVariableSize     = VariableDataSize;
@@ -225,13 +225,13 @@ CreateVariableHobs (
   }

   if (!FoundVariableDefaults) {
-    DEBUG ((EFI_D_ERROR, "Could not find the setup defaults in the NvStorage FV!\n"));
+    DEBUG ((DEBUG_ERROR, "Could not find the setup defaults in the NvStorage FV!\n"));
     return EFI_NOT_FOUND;
   }

-  DEBUG ((EFI_D_INFO, "  Setup data before update at address 0x%x\n", SystemConfiguration));
-  DEBUG ((EFI_D_INFO, "  Size of data in Setup header = %d bytes. Size of SYSTEM_CONFIGURATION = %d bytes.\n", SetupVariableSize, sizeof (SYSTEM_CONFIGURATION)));
-  DEBUG ((EFI_D_INFO, "  Printing system configuration variable data read from the FV:\n"));
+  DEBUG ((DEBUG_INFO, "  Setup data before update at address 0x%x\n", SystemConfiguration));
+  DEBUG ((DEBUG_INFO, "  Size of data in Setup header = %d bytes. Size of SYSTEM_CONFIGURATION = %d bytes.\n", SetupVariableSize, sizeof (SYSTEM_CONFIGURATION)));
+  DEBUG ((DEBUG_INFO, "  Printing system configuration variable data read from the FV:\n"));
   PrintSetupVariableData ((UINT8 *) SystemConfiguration, VariableDataSize);

   //
@@ -239,19 +239,19 @@ CreateVariableHobs (
   //
   Status = UpdateSetupDataValues (SystemConfiguration);
   if (EFI_ERROR (Status)) {
-    DEBUG ((EFI_D_ERROR, "  Couldn't override memory and platform information system configuration values.\n"));
+    DEBUG ((DEBUG_ERROR, "  Couldn't override memory and platform information system configuration values.\n"));
   }

-  DEBUG ((EFI_D_INFO, "  Total size of data to copy for default HOB = %d bytes.\n", (UINT32) ((VariableSearchCandidateDataPtr + VariableDataSize) - (UINTN) StartVariableStoreVariableHeader)));
+  DEBUG ((DEBUG_INFO, "  Total size of data to copy for default HOB = %d bytes.\n", (UINT32) ((VariableSearchCandidateDataPtr + VariableDataSize) - (UINTN) StartVariableStoreVariableHeader)));

   Status = CreateDefaultVariableHob (VariableStoreHeader, (UINT32) ((VariableSearchCandidateDataPtr + VariableDataSize) - (UINTN) StartVariableStoreVariableHeader));
   if (EFI_ERROR (Status)) {
-    DEBUG ((EFI_D_ERROR, "  Error occurred creating the default variable HOB. Variable data is invalid.\n"));
+    DEBUG ((DEBUG_ERROR, "  Error occurred creating the default variable HOB. Variable data is invalid.\n"));
     ASSERT_EFI_ERROR (Status);
     return Status;
   }

-  DEBUG ((EFI_D_INFO, "Successfully read Setup defaults.\n"));
+  DEBUG ((DEBUG_INFO, "Successfully read Setup defaults.\n"));

   return Status;
}
@@ -279,22 +279,22 @@ ParseObbPayload (
   UINT32                           FspSImageBase;
   VOID                             *Memory;

-  DEBUG ((EFI_D_INFO, "Parsing and checking OBB Payload\n"));
+  DEBUG ((DEBUG_INFO, "Parsing and checking OBB Payload\n"));

   FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *) PayloadPtr;
   PayloadTail = (UINTN) PayloadPtr + PayloadSize;
-  DEBUG ((EFI_D_INFO, "FvHeader = 0x%x; PayloadTail = 0x%x\n", (UINT32) FvHeader, PayloadTail));
+  DEBUG ((DEBUG_INFO, "FvHeader = 0x%x; PayloadTail = 0x%x\n", (UINT32) FvHeader, PayloadTail));

   FspHeader = (FSP_INFO_HEADER *) FspFindFspHeader ((UINT32) FvHeader);
   if (FspHeader == NULL) {
-    DEBUG ((EFI_D_INFO, "Cannot find FSP-S header!\n"));
+    DEBUG ((DEBUG_INFO, "Cannot find FSP-S header!\n"));
     return EFI_DEVICE_ERROR;
   }
   FspSImageBase = FspHeader->ImageBase;
-  DEBUG ((EFI_D_INFO, "FSP-S FV Base = 0x%X\n", (UINT32) FvHeader));
-  DEBUG ((EFI_D_INFO, "FSP-S FV Length = 0x%X\n", (UINT32) FvHeader->FvLength));
-  DEBUG ((EFI_D_INFO, "FSP-S Fsp Base = 0x%X\n", (UINT32) FspSImageBase));
-  DEBUG ((EFI_D_INFO, "FSP-S Fsp Size = 0x%X\n", FspHeader->ImageSize));
+  DEBUG ((DEBUG_INFO, "FSP-S FV Base = 0x%X\n", (UINT32) FvHeader));
+  DEBUG ((DEBUG_INFO, "FSP-S FV Length = 0x%X\n", (UINT32) FvHeader->FvLength));
+  DEBUG ((DEBUG_INFO, "FSP-S Fsp Base = 0x%X\n", (UINT32) FspSImageBase));
+  DEBUG ((DEBUG_INFO, "FSP-S Fsp Size = 0x%X\n", FspHeader->ImageSize));

   //
   // Copy to FSP-S to preferred base. The preferred base is defined in FSP Integration Guide.
@@ -311,7 +311,7 @@ ParseObbPayload (

   while ((UINT32) FvHeader < PayloadTail) {
     if (FvHeader->Signature != EFI_FVH_SIGNATURE) {
-      DEBUG ((EFI_D_ERROR, "Found Fv with invalid signature -- Stop parsing OBB.\n"));
+      DEBUG ((DEBUG_ERROR, "Found Fv with invalid signature -- Stop parsing OBB.\n"));
       break;
     }

@@ -320,13 +320,13 @@ ParseObbPayload (
     } else {
       FvName = (EFI_GUID *) ((UINTN) FvHeader + FvHeader->ExtHeaderOffset);
     }
-    DEBUG ((EFI_D_INFO, "Found Fv with GUID: %g\n", FvName));
+    DEBUG ((DEBUG_INFO, "Found Fv with GUID: %g\n", FvName));

     if (CompareGuid (&FvHeader->FileSystemGuid, &gEfiSystemNvDataFvGuid)) {
-      DEBUG ((EFI_D_INFO, "NVStorage FV at 0x%x.\n", (UINT32) FvHeader));
+      DEBUG ((DEBUG_INFO, "NVStorage FV at 0x%x.\n", (UINT32) FvHeader));
       Status = PeiServicesLocatePpi (&gEfiPeiReadOnlyVariable2PpiGuid, 0, NULL, (VOID **) &VariableServices);
       if (EFI_ERROR (Status)) {
-        DEBUG ((EFI_D_ERROR, "Could not locate EFI_PEI_READ_ONLY_VARIABLE2_PPI.\n"));
+        DEBUG ((DEBUG_ERROR, "Could not locate EFI_PEI_READ_ONLY_VARIABLE2_PPI.\n"));
         ASSERT_EFI_ERROR (Status);
         return EFI_NOT_FOUND;
       }
@@ -343,18 +343,18 @@ ParseObbPayload (
                                    );

       if (Status == EFI_NOT_FOUND || FdoEnabledGuidHob != NULL) {
-        DEBUG ((EFI_D_INFO, "Initializing variable defaults from BPDT...\n"));
+        DEBUG ((DEBUG_INFO, "Initializing variable defaults from BPDT...\n"));

         //
         // Create the variable default HOB
         //
         Status = CreateVariableHobs (FvHeader);
       } else if (EFI_ERROR (Status)) {
-        DEBUG ((EFI_D_ERROR, "Unable to read Setup variable to determine if defauls should be loaded.\n"));
+        DEBUG ((DEBUG_ERROR, "Unable to read Setup variable to determine if defauls should be loaded.\n"));
         ASSERT_EFI_ERROR (Status);
       }
     } else if (CompareGuid (FvName, &gObbyFirmwareFileSystemFvGuid)) {
-      DEBUG ((EFI_D_INFO, "Found OBBY: Saving info and skipping Install FV.\n"));
+      DEBUG ((DEBUG_INFO, "Found OBBY: Saving info and skipping Install FV.\n"));
       GuidHobPtr = GetFirstGuidHob (&gEfiPlatformInfoGuid);
       ASSERT (GuidHobPtr != NULL);
       PlatformInfo = GET_GUID_HOB_DATA (GuidHobPtr);
@@ -404,12 +404,16 @@ GetFvNotifyCallback (
   IN VOID                       *Ppi
   )
{
-  EFI_STATUS                    Status = EFI_SUCCESS;
-  EFI_BOOT_MODE                 BootMode;
-  BPDT_PAYLOAD_DATA             *BpdtPayloadPtr;
+  EFI_STATUS                     Status = EFI_SUCCESS;
+  EFI_BOOT_MODE                  BootMode;
+  BPDT_PAYLOAD_DATA             *ObbPayloadPtr;
   EFI_HOB_GUID_TYPE             *GuidHobPtr;
   BPDT_HEADER                   *Bp1HdrPtr;
   BPDT_HEADER                   *Bp2HdrPtr;
+  SUBPART_DIR_HEADER            *DirectoryHeader;
+  SUBPART_DIR_ENTRY             *DirectoryEntry;
+  VOID                          *ObbDataPtr;
+  UINT32                         ObbDataSize;

   PeiServicesGetBootMode (&BootMode);

@@ -419,10 +423,10 @@ GetFvNotifyCallback (
   //
   GuidHobPtr = GetFirstGuidHob (&gEfiBpdtLibBp2DataGuid);
   if (GuidHobPtr != NULL) {
-    DEBUG ((EFI_D_INFO, "GetFvNotifyCallback already called. Skipping.\n"));
+    DEBUG ((DEBUG_INFO, "GetFvNotifyCallback already called. Skipping.\n"));
     return Status;
   }
-
+
   //
   // Locate headers of both Boot partion 1 and 2
   //
@@ -436,7 +440,15 @@ GetFvNotifyCallback (
   //
   //  Get the OBB payload, shadow it, and check the hash before processing it.
   //
-  GetBpdtPayloadData (BootPart2, BpdtObb, &BpdtPayloadPtr);
+  Status = GetBpdtPayloadData (BootPart2, BpdtObb, &ObbPayloadPtr);
+  if (EFI_ERROR (Status)) {
+    DEBUG((DEBUG_ERROR, "ERROR: Failed to find OBB, Status = %r\n", Status));
+    CpuDeadLoop();
+  }
+  DirectoryHeader = (SUBPART_DIR_HEADER *) ObbPayloadPtr->DataPtr;
+  DirectoryEntry  = (SUBPART_DIR_ENTRY *) ((UINTN) DirectoryHeader + sizeof (SUBPART_DIR_HEADER));
+  ObbDataPtr      = (VOID *) ((UINTN) DirectoryHeader + DirectoryEntry->EntryOffset);
+  ObbDataSize     = ObbPayloadPtr->Size - 0x1000;

 #if (BOOT_GUARD_ENABLE == 1)
   //
@@ -448,15 +460,15 @@ GetFvNotifyCallback (
   if (BootMode != BOOT_ON_S3_RESUME) {
     Status = LocateAndVerifyHashBpm (HashObb);
     if (EFI_ERROR (Status)) {
-      DEBUG((EFI_D_ERROR, "Verify OBB failed, Status = %r\n", Status));
+      DEBUG((DEBUG_ERROR, "Verify OBB failed, Status = %r\n", Status));
       CpuDeadLoop();
     }
   }
#endif

-  DEBUG ((EFI_D_INFO, "GetFvNotifyCallback: Processing OBB Payload.\n"));
+  DEBUG ((DEBUG_INFO, "GetFvNotifyCallback: Processing OBB Payload.\n"));

-  ParseObbPayload ((UINT8*) PcdGet32 (PcdFlashObbPayloadMappedBase), PcdGet32 (PcdFlashObbPayloadSize), BootMode);
+  ParseObbPayload ((UINT8*) ObbDataPtr, ObbDataSize, BootMode);

   //
   // Set Zephr ID
diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformPreMemPei.inf b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformPreMemPei.inf
index 2c3ba738e3..fc728b2f35 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformPreMemPei.inf
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformPreMemPei.inf
@@ -34,7 +34,7 @@
#   2. MemoryCallback.c - Includes a memory call back function notified when
#      MRC is done.
#
-#  Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2012 - 2018, 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
@@ -160,8 +160,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase
   gPlatformModuleTokenSpaceGuid.PcdFlashFvOBBYBase
   gPlatformModuleTokenSpaceGuid.PcdFlashFvOBBYSize
-  gPlatformModuleTokenSpaceGuid.PcdFlashObbPayloadMappedBase
-  gPlatformModuleTokenSpaceGuid.PcdFlashObbPayloadSize
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
   gEfiBxtTokenSpaceGuid.PcdScAcpiIoPortBaseAddress
   gEfiBxtTokenSpaceGuid.PcdIafwPlatformInfo              ## PRODUCES
diff --git a/Platform/BroxtonPlatformPkg/PlatformPkg.dec b/Platform/BroxtonPlatformPkg/PlatformPkg.dec
index c27ac042ab..a12ac5f5e9 100644
--- a/Platform/BroxtonPlatformPkg/PlatformPkg.dec
+++ b/Platform/BroxtonPlatformPkg/PlatformPkg.dec
@@ -111,7 +111,7 @@
   gHiiExportDatabaseGuid                  = { 0x1b838190, 0x4625, 0x4ead, { 0xab, 0xc9, 0xcd, 0x5e, 0x6a, 0xf1, 0x8f, 0xe0 } }

   gEfiHtBistHobGuid                       = { 0xBE644001, 0xE7D4, 0x48B1, { 0xB0, 0x96, 0x8B, 0xA0, 0x47, 0xBC, 0x7A, 0xE7 } }
-  gEfiTscFrequencyGuid                = { 0xdba6a7e3, 0xbb57, 0x4be7, { 0x8a, 0xf8, 0xd5, 0x78, 0xdb, 0x7e, 0x56, 0x87 }}
+  gEfiTscFrequencyGuid                    = { 0xdba6a7e3, 0xbb57, 0x4be7, { 0x8a, 0xf8, 0xd5, 0x78, 0xdb, 0x7e, 0x56, 0x87 } }

   # GUID for EEPROM variables - {EE96CA33-5F59-4594-9869-07F79AA3C06F}
   gEepromVariableGuid                     = { 0xEE96CA33, 0x5F59, 0x4594, { 0x98, 0x69, 0x07, 0xF7, 0x9A, 0xA3, 0xC0, 0x6F } }
@@ -215,7 +215,6 @@
   ## This PCD is used to enable or disable PCIE port 3
   gPlatformModuleTokenSpaceGuid.PcdPciePort3Enable|TRUE|BOOLEAN|0x80000020

-
   ## MemoryCheck value for checking memory before boot OS.
   ## To save the boot performance, the default MemoryCheck is set to 0.
   gClientCommonModuleTokenSpaceGuid.PcdPlatformMemoryCheck|0|UINT8|0x40000005
@@ -297,12 +296,6 @@
   gPlatformModuleTokenSpaceGuid.PcdFlashFvIBBLSize|0x00001000|UINT32|0x20000003
   gPlatformModuleTokenSpaceGuid.PcdFlashNvStorageBase|0xFFF60000|UINT32|0x20000007
   gPlatformModuleTokenSpaceGuid.PcdFlashNvStorageSize|0x00010000|UINT32|0x20000008
-  gPlatformModuleTokenSpaceGuid.PcdFlashObbPayloadMappedBase|0xFFC82040|UINT32|0x2000000B
-  gPlatformModuleTokenSpaceGuid.PcdFlashObbPayloadSize|0x002DA000|UINT32|0x2000000C
-  gPlatformModuleTokenSpaceGuid.PcdFlashIbbRegionMappedBase|0xFF980000|UINT32|0x2000000D
-  gPlatformModuleTokenSpaceGuid.PcdFlashIbbRegionSize|0x0007A000|UINT32|0x2000000E
-  gPlatformModuleTokenSpaceGuid.PcdFlashObbRegionMappedBase|0xFFC82000|UINT32|0x2000000F
-  gPlatformModuleTokenSpaceGuid.PcdFlashObbRegionSize|0x002DB000|UINT32|0x20000010
   gClientCommonModuleTokenSpaceGuid.PcdMaxConsoleDeviceNum|0x05|UINT8|0x10000007
   gMinnowModuleTokenSpaceGuid.PcdDefaultFabId|0x03|UINT8|0x20000001
   gEfiIchTokenSpaceGuid.PcdPeiIchEhciControllerMemoryBaseAddress|0xFD000000|UINT32|0x30000019
@@ -365,7 +358,6 @@
   gPlatformModuleTokenSpaceGuid.PcdGpioWhiteList|{0xFF, 0xFF, 0xFF, 0xFF}|VOID*|0xEEEE2005

 [PcdsPatchableInModule]
-
   ## MemoryCheck value for checking memory before boot OS.
   ## To save the boot performance, the default MemoryCheck is set to 0.
   gClientCommonModuleTokenSpaceGuid.PcdPlatformMemoryCheck|0|UINT8|0x40000005
diff --git a/Platform/BroxtonPlatformPkg/PlatformPkg.fdf b/Platform/BroxtonPlatformPkg/PlatformPkg.fdf
index 365f7d2628..f0e520da06 100644
--- a/Platform/BroxtonPlatformPkg/PlatformPkg.fdf
+++ b/Platform/BroxtonPlatformPkg/PlatformPkg.fdf
@@ -73,23 +73,14 @@
   DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE       = 0x00040000

   DEFINE FLASH_REGION_FV_IBBM_OFFSET                              = $(FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET) + $(FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE)
-  DEFINE FLASH_REGION_FV_IBBL_SIZE                                = 0x00001000
-
   DEFINE FLASH_REGION_FV_IBBM_SIZE                                = $(BLD_IBBM_SIZE)
+
+  DEFINE FLASH_REGION_FV_IBBL_SIZE                                = 0x00001000
   DEFINE FLASH_REGION_FV_IBBL_OFFSET                              = $(FLASH_SIZE) - $(FLASH_REGION_FV_IBBL_SIZE)

   DEFINE FLASH_FV_RECOVERY_BASE                                   = 0xFFF80000
   DEFINE FLASH_FV_RECOVERY_SIZE                                   = 0x00080000

-  DEFINE FLASH_OBB_PAYLOAD_MAPPED_BASE                            = 0xFFC82040
-  DEFINE FLASH_OBB_PAYLOAD_SIZE                                   = 0x002EA000
-
-  DEFINE FLASH_IBB_REGION_MAPPED_BASE                             = 0xFF980000
-  DEFINE FLASH_IBB_REGION_SIZE                                    = 0x0007A000
-
-  DEFINE FLASH_OBB_REGION_MAPPED_BASE                             = 0xFFC82000
-  DEFINE FLASH_OBB_REGION_SIZE                                    = 0x002EB000
-
################################################################################
#
# FD Section
@@ -122,12 +113,6 @@
   SET gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize                   = $(FLASH_AREA_SIZE)
   SET gPlatformModuleTokenSpaceGuid.PcdFlashNvStorageBase              = $(FLASH_BASE) + $(FLASH_REGION_VPD_OFFSET)
   SET gPlatformModuleTokenSpaceGuid.PcdFlashNvStorageSize              = $(FLASH_REGION_VPD_SIZE) + $(FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_SIZE) + $(FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE)
-  SET gPlatformModuleTokenSpaceGuid.PcdFlashObbPayloadMappedBase       = $(FLASH_OBB_PAYLOAD_MAPPED_BASE)
-  SET gPlatformModuleTokenSpaceGuid.PcdFlashObbPayloadSize             = $(FLASH_OBB_PAYLOAD_SIZE)
-  SET gPlatformModuleTokenSpaceGuid.PcdFlashIbbRegionMappedBase        = $(FLASH_IBB_REGION_MAPPED_BASE)
-  SET gPlatformModuleTokenSpaceGuid.PcdFlashIbbRegionSize              = $(FLASH_IBB_REGION_SIZE)
-  SET gPlatformModuleTokenSpaceGuid.PcdFlashObbRegionMappedBase        = $(FLASH_OBB_REGION_MAPPED_BASE)
-  SET gPlatformModuleTokenSpaceGuid.PcdFlashObbRegionSize              = $(FLASH_OBB_REGION_SIZE)

 ################################################################################
#
@@ -242,24 +227,24 @@
   INF $(PLATFORM_PACKAGE_COMMON)/SampleCode/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf

   INF $(PLATFORM_PACKAGE_COMMON)/PlatformSettings/PlatformPostMemPei/PlatformPostMemPei.inf
-
+
!if $(PEI_DISPLAY_ENABLE) == TRUE
   FILE FREEFORM = PCD(gPlatformModuleTokenSpaceGuid.PcdTianoCoreLogoFileGuid) {
     SECTION RAW = $(PLATFORM_PACKAGE_COMMON)/Binaries/Logo/Tianocore.bmp
   }
-
+
   # VBT For Leaf Hill (File Guid is gPeiLeafHillVbtGuid)
   FILE FREEFORM = 6AE80680-5E3F-4E63-A5F5-78E5214F13FE {
     SECTION RAW = $(PLATFORM_NAME)/Board/LeafHill/Vbt/VbtBxtMipi.bin
     SECTION UI = "IntelGopVbt1"
   }
-
+
   # VBT For Minnowboard 3 (File Guid is gPeiMinnowBoard3VbtGuid)
   FILE FREEFORM = E08CA6D5-8D02-43ae-ABB1-952CC787C933 {
     SECTION RAW = $(PLATFORM_NAME)/Board/MinnowBoard3/Vbt/VbtBxtMipi.bin
     SECTION UI = "IntelGopVbt1"
   }
-
+
   # VBT For Minnowboard 3 Module (File Guid is gPeiMinnow3ModuleVbtGuid)
   FILE FREEFORM = 1F9CBB42-107E-46A4-A2CB-92F586F9FB31 {
     SECTION RAW = $(PLATFORM_NAME)/Board/MinnowBoard3Module/Vbt/VbtBxtMipi.bin
@@ -317,7 +302,7 @@
   #
   INF $(PLATFORM_PACKAGE_COMMON)/PlatformSettings/PlatformVTdInfoPei/PlatformVTdInfoPei.inf
   INF IntelSiliconPkg/Feature/VTd/IntelVTdPmrPei/IntelVTdPmrPei.inf
-
+
[FV.FVIBBM]
   BlockSize          = $(FLASH_BLOCK_SIZE)
   FvBaseAddress      = 0xFEF45000
@@ -612,11 +597,11 @@ APRIORI DXE {
   INF $(PLATFORM_PACKAGE_COMMON)/Console/GraphicsOutputDxe/GraphicsOutputDxe.inf

   FILE FREEFORM = PCD(gPlatformModuleTokenSpaceGuid.PcdTianoCoreLogoFileGuid) {
-  SECTION RAW = $(PLATFORM_PACKAGE_COMMON)/Binaries/Logo/Tianocore.bmp
+    SECTION RAW = $(PLATFORM_PACKAGE_COMMON)/Binaries/Logo/Tianocore.bmp
   }
-
+
   FILE FREEFORM = PCD(gPlatformModuleTokenSpaceGuid.PcdLogoFileGuid) {
-  SECTION RAW = $(PLATFORM_NAME)/Board/MinnowBoard3/Logo/MinnowBoardLogo.bmp
+    SECTION RAW = $(PLATFORM_NAME)/Board/MinnowBoard3/Logo/MinnowBoardLogo.bmp
   }

   INF $(PLATFORM_PACKAGE_COMMON)/PnpDxe/PnpDxe.inf
@@ -711,7 +696,7 @@ APRIORI DXE {
   #
   INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
   INF $(PLATFORM_PACKAGE_COMMON)/Features/Smbios/SmBiosMiscDxe/SmBiosMiscDxe.inf
-
+
   #
   #SM Bus
   #
@@ -721,7 +706,7 @@ APRIORI DXE {
   # LAN/Network
   #
!if $(NETWORK_ENABLE) == TRUE
-
+
   FILE DRIVER = 51B24E4E-FDD2-4047-BE4D-131873A457B2 {
     SECTION PE32 = BroxtonPlatformPkg/Common/Binaries/UNDI/AX88179/AX88179_178A_UEFI_V2.8.0_X64.efi
     SECTION UI = "UNDI"
@@ -782,7 +767,7 @@ APRIORI DXE {
   #
   INF  $(PLATFORM_PACKAGE_COMMON)/Acpi/UsbTypeCDxe/UsbTypeCDxe.inf

-
+
   #
   # VT-d for MDA Protection
   #
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Dxe/ScInitDxe.inf b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Dxe/ScInitDxe.inf
index 5b31b18fab..2694813cc7 100644
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Dxe/ScInitDxe.inf
+++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Dxe/ScInitDxe.inf
@@ -1,7 +1,7 @@
## @file
#  SC Initialization driver
#
-#  Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2012 - 2018, 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
@@ -94,10 +94,6 @@

   gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize
   gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress
-  gPlatformModuleTokenSpaceGuid.PcdFlashIbbRegionMappedBase
-  gPlatformModuleTokenSpaceGuid.PcdFlashIbbRegionSize
-  gPlatformModuleTokenSpaceGuid.PcdFlashObbRegionMappedBase
-  gPlatformModuleTokenSpaceGuid.PcdFlashObbRegionSize

 [Depex]
   gEfiSmmControl2ProtocolGuid
--
2.11.0.windows.1



^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-09-27  6:05 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-21 18:28 [PATCH] [edk2-platforms/devel-IntelAtomProcessorE3900] FDF has unused PCDs Steele, Kelly
2018-09-27  6:01 ` Guo, Mang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox