Upgrade core

Upgrade core to UDK2017

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Guo Mang <mang.guo@intel.com>
Reviewed-by: zwei4 <david.wei@intel.com>

11 files changed, 21 insertions, 25 deletions

diff --git a/Platform/BroxtonPlatformPkg/BuildBios.bat b/Platform/BroxtonPlatformPkg/BuildBios.bat
index 0ebc5705a7..b57188d349 100644
--- a/Platform/BroxtonPlatformPkg/BuildBios.bat
+++ b/Platform/BroxtonPlatformPkg/BuildBios.bat
@@ -49,7 +49,7 @@ copy /y %WORKSPACE%\%PLATFORM_PATH%\DeviceCommonPkg\Override\BaseTools\Conf\tool
 :: Setup EDK environment. Edksetup puts new copies of target.txt, tools_def.txt, build_rule.txt in WorkSpace\Conf

 :: Also run edksetup as soon as possible to avoid it from changing environment variables we're overriding

 set "VCINSTALLDIR="

-set EDK_TOOLS_PATH=%CORE_PATH%\BaseTools

+set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools

 call edksetup.bat

 @echo off

 

diff --git a/Platform/BroxtonPlatformPkg/Common/Library/ResetSystemLib/ResetSystemLib.c b/Platform/BroxtonPlatformPkg/Common/Library/ResetSystemLib/ResetSystemLib.c
index 02b16e8928..1ef71cab8c 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/ResetSystemLib/ResetSystemLib.c
+++ b/Platform/BroxtonPlatformPkg/Common/Library/ResetSystemLib/ResetSystemLib.c
@@ -19,8 +19,8 @@
 #include <Library/IoLib.h>

 #include <Library/DebugLib.h>

 #include <Library/PciLib.h>

+#include <ScRegs/RegsPcu.h>

 

-#include "ScRegs.h"

 

 #define RESET_GENERATOR_PORT 0xCF9

 

diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/PlatformDxe.inf b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/PlatformDxe.inf
index cf8ca08ccf..37eaf4623c 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/PlatformDxe.inf
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/PlatformDxe.inf
@@ -125,7 +125,7 @@
   gEfiBxtTokenSpaceGuid.PcdPmcSsramBaseAddress0

   gEfiBxtTokenSpaceGuid.PcdPmcGcrBaseAddress

   gPlatformModuleTokenSpaceGuid.PcdPBTNDisableInterval

-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdFastPS2Detection

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFastPS2Detection

   gEfiBxtTokenSpaceGuid.PcdP2SBBaseAddress

 

 [Depex]

diff --git a/Platform/BroxtonPlatformPkg/Common/SampleCode/MdeModulePkg/Universal/PCD/Pei/Pcd.c b/Platform/BroxtonPlatformPkg/Common/SampleCode/MdeModulePkg/Universal/PCD/Pei/Pcd.c
index 107dd16a6a..dc396eb28b 100644
--- a/Platform/BroxtonPlatformPkg/Common/SampleCode/MdeModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/Platform/BroxtonPlatformPkg/Common/SampleCode/MdeModulePkg/Universal/PCD/Pei/Pcd.c
@@ -1,7 +1,7 @@
 /** @file

   All Pcd Ppi services are implemented here.

 

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

+  Copyright (c) 2006 - 2017, 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

@@ -257,7 +257,7 @@ PeiGetPcdInfoGetSku (
   VOID

   )

 {

-  return GetPcdDatabase()->SystemSkuId;

+  return (UINTN) GetPcdDatabase()->SystemSkuId;

 }

 

 /**

diff --git a/Platform/BroxtonPlatformPkg/Common/SampleCode/MdeModulePkg/Universal/PCD/Pei/Service.h b/Platform/BroxtonPlatformPkg/Common/SampleCode/MdeModulePkg/Universal/PCD/Pei/Service.h
index e54c812e2a..b34fd02df0 100644
--- a/Platform/BroxtonPlatformPkg/Common/SampleCode/MdeModulePkg/Universal/PCD/Pei/Service.h
+++ b/Platform/BroxtonPlatformPkg/Common/SampleCode/MdeModulePkg/Universal/PCD/Pei/Service.h
@@ -37,7 +37,7 @@
 // Please make sure the PCD Serivce PEIM Version is consistent with

 // the version of the generated PEIM PCD Database by build tool.

 //

-#define PCD_SERVICE_PEIM_VERSION      5

+#define PCD_SERVICE_PEIM_VERSION      6

 

 //

 // PCD_PEI_SERVICE_DRIVER_VERSION is defined in Autogen.h.

diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc
index d39ec6d4bf..a58086138a 100644
--- a/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc
@@ -72,6 +72,8 @@
   $(PLATFORM_SI_PACKAGE)/SiInit/Dxe/SiInitDxe.inf

   MdeModulePkg/Universal/Metronome/Metronome.inf

 

+  MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf

+

   IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf {

     <PcdsPatchableInModule>

       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043

@@ -213,16 +215,6 @@
   $(PLATFORM_PACKAGE_COMMON)/SampleCode/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf

 !endif

 

-

-  PerformancePkg/Dp_App/Dp.inf {

-  <LibraryClasses>

-  !if $(PERFORMANCE_ENABLE) == TRUE

-    PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf

-    TimerLib|$(PLATFORM_PACKAGE_COMMON)/Library/PlatformTscTimerLib/DxeTscTimerLib.inf

-  !endif

-  }

-

-

 !if $(TPM12_ENABLE) == TRUE

   SecurityPkg/Tcg/TcgDxe/TcgDxe.inf

   SecurityPkg/Tcg/TcgSmm/TcgSmm.inf

diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.DxeSmmDriver.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.DxeSmmDriver.dsc
index 8d3a5544b7..5a2feaaa38 100644
--- a/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.DxeSmmDriver.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.DxeSmmDriver.dsc
@@ -1,7 +1,7 @@
 ## @file

 #  Dxe Smm Driver Library Classes Description.

 #

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

+#  Copyright (c) 2016 - 2017, 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

@@ -39,4 +39,4 @@
   !endif

 

   SmmCpuFeaturesLib|UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf

-

+  CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf

diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.dsc
index 971dc4a080..b3fb10a81f 100644
--- a/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.dsc
@@ -98,6 +98,9 @@
       S3BootScriptLib|MdePkg/Library/BaseS3BootScriptLibNull/BaseS3BootScriptLibNull.inf

    !endif

 

+   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf

+   FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

+   

    #

    # Generic Modules

    #

diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsDynamicDefault.Default.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsDynamicDefault.Default.dsc
index e2a84b617e..19c302db13 100644
--- a/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsDynamicDefault.Default.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsDynamicDefault.Default.dsc
@@ -1,7 +1,7 @@
 ## @file

 #  Platform Dynamic Pcd Description.

 #

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

+#  Copyright (c) 2016 - 2017, 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

@@ -53,5 +53,5 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0xfff60000

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0xfff9e000

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0xfffa0000

-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdFastPS2Detection|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFastPS2Detection|FALSE

 

diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsFeatureFlag.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsFeatureFlag.dsc
index 19e27ad1a9..ed00aac9e2 100644
--- a/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsFeatureFlag.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsFeatureFlag.dsc
@@ -83,8 +83,8 @@
   !endif

 

   # Optimize Driver init time in FastBoot Mode

-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPs2KbdExtendedVerification|FALSE

-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPs2MouseExtendedVerification|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPs2KbdExtendedVerification|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPs2MouseExtendedVerification|FALSE

 

   # Disable Deprecated Function

   # bugbug benben: set this to FALSE to allow PcdSetXXX() to work in SecurityPkg. Check

diff --git a/Platform/BroxtonPlatformPkg/PlatformPkg.fdf b/Platform/BroxtonPlatformPkg/PlatformPkg.fdf
index b98426e2ce..3b4d9e7801 100644
--- a/Platform/BroxtonPlatformPkg/PlatformPkg.fdf
+++ b/Platform/BroxtonPlatformPkg/PlatformPkg.fdf
@@ -37,12 +37,12 @@
   DEFINE FLASH_AREA_SIZE                                        = 0x00800000

 

   DEFINE FLASH_REGION_FV_IBBR_OFFSET                            = 0x00000000

-  DEFINE FLASH_REGION_FV_IBBR_SIZE                              = 0x00060000

+  DEFINE FLASH_REGION_FV_IBBR_SIZE                              = 0x00050000

   DEFINE FLASH_REGION_OBB_OFFSET                                = $(FLASH_REGION_FV_IBBR_OFFSET) + $(FLASH_REGION_FV_IBBR_SIZE)

-  DEFINE FLASH_REGION_OBB_SIZE                                  = 0x0007B000

+  DEFINE FLASH_REGION_OBB_SIZE                                  = 0x00076000

   DEFINE FLASH_REGION_OBBX_OFFSET                               = $(FLASH_REGION_OBB_OFFSET) + $(FLASH_REGION_OBB_SIZE)

   !if $(EXT_BIOS_ENABLE) == FALSE

-    DEFINE FLASH_REGION_OBBX_SIZE                               = 0x00165000

+    DEFINE FLASH_REGION_OBBX_SIZE                               = 0x0017A000

   !else

     DEFINE FLASH_REGION_OBBX_SIZE                               = 0x002EC000

   !endif

@@ -451,6 +451,7 @@ APRIORI DXE {
   INF $(PLATFORM_SI_PACKAGE)/SouthCluster/Sdio/Dxe/SD/SdControllerDxe/SdControllerDxe.inf

   INF $(PLATFORM_SI_PACKAGE)/SouthCluster/Sdio/Dxe/SD/SdMediaDeviceDxe/SdMediaDeviceDxe.inf

 

+  INF MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf

   INF IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf

 

   #