Upgrade core to UDK2018

Contributed-under: TianoCore Contribution Agreement 1.1

Signed-off-by: Guo Mang <mang.guo@intel.com>

7 files changed, 65 insertions, 14 deletions

diff --git a/Platform/BroxtonPlatformPkg/Common/Include/GenericIch.h b/Platform/BroxtonPlatformPkg/Common/Include/GenericIch.h
new file mode 100644
index 0000000000..697ea049ee
--- /dev/null
+++ b/Platform/BroxtonPlatformPkg/Common/Include/GenericIch.h
@@ -0,0 +1,55 @@
+/** @file

+  Generic definitions for registers in the Intel Ich devices.

+

+  These definitions should work for any version of Ich.

+

+  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>

+  This program and the accompanying materials

+  are licensed and made available under the terms and conditions of the BSD License

+  which accompanies this distribution.  The full text of the license may be found at

+  http://opensource.org/licenses/bsd-license.php

+

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+

+**/

+

+#ifndef _GENERIC_ICH_H_

+#define _GENERIC_ICH_H_

+

+/** GenericIchDefs  Generic ICH Definitions.

+

+Definitions beginning with "R_" are registers.

+Definitions beginning with "B_" are bits within registers.

+Definitions beginning with "V_" are meaningful values of bits within the registers.

+**/

+///@{

+

+/// IchPciAddressing  PCI Bus Address for ICH.

+///@{

+#define PCI_BUS_NUMBER_ICH                0x00  ///< ICH is on PCI Bus 0.

+#define PCI_DEVICE_NUMBER_ICH_LPC           31  ///< ICH is Device 31.

+#define PCI_FUNCTION_NUMBER_ICH_LPC          0  ///< ICH is Function 0.

+///@}

+

+/// IchAcpiCntr   Control for the ICH's ACPI Counter.

+///@{

+#define R_ICH_LPC_ACPI_BASE                   0x40

+#define   B_ICH_LPC_ACPI_BASE_BAR                 0x0000FF80

+#define R_ICH_LPC_ACPI_CNT                    0x44

+#define   B_ICH_LPC_ACPI_CNT_ACPI_EN              0x80

+///@}

+

+/// IchAcpiTimer  The ICH's ACPI Timer.

+///@{

+#define R_ACPI_PM1_TMR                        0x08

+#define   V_ACPI_TMR_FREQUENCY                    3579545

+#define   V_ACPI_PM1_TMR_MAX_VAL                  0x1000000 ///< The timer is 24 bit overflow.

+///@}

+

+/// Macro to generate the PCI address of any given ICH Register.

+#define PCI_ICH_LPC_ADDRESS(Register) \

+  ((UINTN)(PCI_LIB_ADDRESS (PCI_BUS_NUMBER_ICH, PCI_DEVICE_NUMBER_ICH_LPC, PCI_FUNCTION_NUMBER_ICH_LPC, Register)))

+

+///@}

+#endif  // _GENERIC_ICH_H_

diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/DxeTscTimerLib.c b/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/DxeTscTimerLib.c
index 4e90f4eaea..49d38eb45c 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/DxeTscTimerLib.c
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/DxeTscTimerLib.c
@@ -17,7 +17,7 @@
 

   A Processor's support for invariant TSC is indicated by CPUID.0x80000007.EDX[8].

 

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

+  Copyright (c) 2009 - 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

   which accompanies this distribution. The full text of the license may be found at

@@ -32,7 +32,6 @@
 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/UefiLib.h>

 #include <Library/DebugLib.h>

-#include <Guid/TscFrequency.h>

 #include "TscTimerLibInternal.h"

 

 UINT64 mTscFrequency;

diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/DxeTscTimerLib.inf b/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/DxeTscTimerLib.inf
index a2ff9d05dd..1f77907470 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/DxeTscTimerLib.inf
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/DxeTscTimerLib.inf
@@ -12,7 +12,7 @@
 #  TSC reads are much more efficient and do not incur the overhead associated with a ring transition or

 #  access to a platform resource.

 #

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

+#  Copyright (c) 2009 - 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

@@ -44,7 +44,6 @@
 

 [Packages]

   MdePkg/MdePkg.dec

-  PerformancePkg/PerformancePkg.dec

   BroxtonSiPkg/BroxtonSiPkg.dec

   BroxtonPlatformPkg/PlatformPkg.dec

 

@@ -61,6 +60,6 @@
   gEfiTscFrequencyGuid                          ## CONSUMES ## SystemTable

 

 [Pcd.common]

-  gPerformancePkgTokenSpaceGuid.PcdPerfPkgAcpiIoPortBaseAddress   ## SOMETIMES_CONSUMES

+  gPlatformModuleTokenSpaceGuid.PcdPerfPkgAcpiIoPortBaseAddress   ## SOMETIMES_CONSUMES

   gEfiBxtTokenSpaceGuid.PcdScAcpiIoPortBaseAddress

 

diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/PeiTscTimerLib.c b/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/PeiTscTimerLib.c
index caf1925748..397502bc92 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/PeiTscTimerLib.c
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/PeiTscTimerLib.c
@@ -17,7 +17,7 @@
 

   A Processor's support for invariant TSC is indicated by CPUID.0x80000007.EDX[8].

 

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

+  Copyright (c) 2009 - 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

@@ -31,7 +31,6 @@
 

 #include <PiPei.h>

 #include <Library/HobLib.h>

-#include <Guid/TscFrequency.h>

 #include "TscTimerLibInternal.h"

 

 

diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/PeiTscTimerLib.inf b/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/PeiTscTimerLib.inf
index 0821983139..3b17cef70d 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/PeiTscTimerLib.inf
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/PeiTscTimerLib.inf
@@ -12,7 +12,7 @@
 #  TSC reads are much more efficient and do not incur the overhead associated with a ring transition or

 #  access to a platform resource.

 #

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

+#  Copyright (c) 2009 - 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

@@ -43,7 +43,7 @@
 

 [Packages]

   MdePkg/MdePkg.dec

-  PerformancePkg/PerformancePkg.dec

+  BroxtonPlatformPkg/PlatformPkg.dec

   BroxtonSiPkg/BroxtonSiPkg.dec

 

 [LibraryClasses]

@@ -57,6 +57,6 @@
   gEfiTscFrequencyGuid                          ## PRODUCES ## HOB

 

 [Pcd.common]

-  gPerformancePkgTokenSpaceGuid.PcdPerfPkgAcpiIoPortBaseAddress     ## SOMETIMES_CONSUMES

+  gPlatformModuleTokenSpaceGuid.PcdPerfPkgAcpiIoPortBaseAddress     ## SOMETIMES_CONSUMES

   gEfiBxtTokenSpaceGuid.PcdScAcpiIoPortBaseAddress

 

diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/TscTimerLibInternal.h b/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/TscTimerLibInternal.h
index 99f6fcdee4..272c763ed6 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/TscTimerLibInternal.h
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformTscTimerLib/TscTimerLibInternal.h
@@ -1,7 +1,7 @@
 /** @file

   Internal header file for TscTimerLib instances.

 

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

+  Copyright (c) 2009 - 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

@@ -16,7 +16,7 @@
 #ifndef _TSC_TIMER_LIB_INTERNAL_H_

 #define _TSC_TIMER_LIB_INTERNAL_H_

 

-#include <Ich/GenericIch.h>

+#include <GenericIch.h>

 #include <Library/TimerLib.h>

 #include <Library/BaseLib.h>

 #include <Library/IoLib.h>

diff --git a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat
index 8ace30f8db..351ccd8555 100644
--- a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat
+++ b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat
@@ -8,9 +8,8 @@ copy /y nul Stitching.log >nul
 

 :: Set tool env

 set WORKSPACE=%CD%

-set CORE_TOOLS_PATH=%WORKSPACE%\..\..\..\..\..\BaseTools\Bin\Win32

 if %WORKSPACE:~-1%==\ set WORKSPACE=%WORKSPACE:~0,-1%

-PATH=%PATH%;%WORKSPACE%\Tools;%WORKSPACE%\Tools\VLV_Merge_Tools;%WORKSPACE%\;%CORE_TOOLS_PATH%

+PATH=%PATH%;%WORKSPACE%\Tools;%WORKSPACE%\Tools\VLV_Merge_Tools;%WORKSPACE%\;

 

 :: Set default Suffix as:  YYYY_MM_DD_HHMM

 set hour=%time: =0%