Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: zwei4 <david.wei@intel.com>
---
 .../Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c     |   5 +-
 .../Common/Acpi/AcpiPlatformDxe/AcpiPlatform.h     |   9 +-
 .../Acpi/AcpiPlatformDxe/AcpiPlatformHooks.c       |   7 +-
 .../Acpi/AcpiTablesPCAT/DptfAcpiTable/Dptf.asl     |   6 +-
 .../Common/Acpi/AcpiTablesPCAT/Facp/Facp.aslc      |   4 +-
 .../Common/Acpi/AcpiTablesPCAT/Lpit/Lpit.aslc      |  51 ++--
 .../Common/Acpi/AcpiTablesPCAT/Mcfg/Mcfg.aslc      |  72 +++---
 .../Common/Acpi/AcpiTablesPCAT/ScAudio.asl         |  26 +-
 .../Common/Acpi/AcpiTablesPCAT/Wsmt/Wsmt.act       |  10 +-
 .../Common/Acpi/UsbTypeCDxe/UsbTypeC.c             |   7 +-
 .../PlatformGopPolicyDxe/PlatformGopPolicy.c       |   8 +-
 .../SmramSaveInfoHandlerSmm.c                      |   4 +-
 .../MiscNumberOfInstallableLanguagesFunction.c     |   2 +-
 .../Smbios/SmBiosMiscDxe/MiscOemType0x94Function.c |   6 +-
 .../Common/Features/UsbDeviceDxe/UsbDeviceDxe.c    |   2 +-
 .../Common/Features/UsbDeviceDxe/UsbFuncIo.c       |   4 +-
 .../Common/Features/UsbDeviceDxe/XdciDWC.c         |   7 +-
 .../Common/Features/UsbDeviceDxe/XdciInterface.h   |   2 +-
 .../FspPlatformInfoLibSample.c                     |   5 +-
 .../Library/PeiFspHobProcessLib/FspHobProcessLib.c |  13 +-
 .../Common/Include/Guid/SetupVariable.h            |  15 +-
 .../Library/DxePolicyUpdateLib/DxeSaPolicyUpdate.c |   4 +-
 .../PeiPolicyUpdateLib/PeiCpuPolicyUpdate.c        |   4 +-
 .../Common/Library/PlatformBdsLib/BdsPlatform.c    |   6 +-
 .../Common/Library/PlatformBdsLib/BdsPlatform.h    |  31 ++-
 .../Common/Library/PlatformBdsLib/PlatformData.c   |  30 ++-
 .../Library/PlatformSecLib/Ia32/Chipset_S.inc      |  29 +--
 .../Common/Library/PlatformSecLib/Ia32/Ia32_S.inc  |  27 +-
 .../Library/PlatformSecLib/Ia32/Platform_S.inc     |  28 +--
 .../Library/PlatformSecLib/Ia32/SecCore_S.inc      |  28 +--
 .../Common/Library/PlatformSecLib/Ia32/SecEntry.S  |   8 +-
 .../Common/PlatformSettings/PlatformDxe/Platform.c |  18 +-
 .../PlatformSettings/PlatformDxe/PlatformDxe.h     |   4 +-
 .../PlatformPostMemPei/PlatformInit.c              |   8 +-
 .../PlatformPreMemPei/PlatformInitPreMem.c         |   4 +-
 .../PlatformSetupDxe/PlatformSetupDxe.c            |   2 +-
 .../PlatformSetupDxe/SetupInfoRecords.c            |   2 +-
 .../PlatformSettings/PlatformSetupDxe/Vfr.vfr      |   6 +-
 .../Common/PlatformSmm/Platform.c                  |  19 +-
 .../Common/PnpDxe/AunitBiosSettings.h              | 230 ++++++++---------
 .../Common/PnpDxe/BunitBiosSettings.h              | 206 +++++++--------
 .../Common/PnpDxe/TunitBiosSettings.h              | 278 ++++++++++-----------
 .../FspmWrapperPeim/FspmWrapperPeim.inf            |   8 +-
 .../FspsWrapperPeim/FspsWrapperPeim.inf            |   8 +-
 .../MemoryTest/NullMemoryTestDxe/NullMemoryTest.c  |   2 +-
 45 files changed, 638 insertions(+), 617 deletions(-)

diff --git a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c
index 854bd48a2..b5cd9f7fe 100644
--- a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c
+++ b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c
@@ -1,7 +1,7 @@
 /** @file
   ACPI Platform Driver.
 
-  Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2012 - 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
@@ -64,6 +64,7 @@ CHAR16    gACPIOSFRModelStringVariableName[]  = ACPI_OSFR_MODEL_STRING_VARIABLE_
 CHAR16    gACPIOSFRRefDataBlockVariableName[] = ACPI_OSFR_REF_DATA_BLOCK_VARIABLE_NAME;
 CHAR16    gACPIOSFRMfgStringVariableName[]    = ACPI_OSFR_MFG_STRING_VARIABLE_NAME;
 
+EFI_GLOBAL_NVS_AREA_PROTOCOL  mGlobalNvsArea;
 EFI_CPU_IO2_PROTOCOL          *mCpuIo;
 
 BOOLEAN                       mFirstNotify;
@@ -280,7 +281,7 @@ InstallAcpiTableForPlatformSsdt (
                       &gPlatformSsdtImageGuid,
                       EFI_SECTION_RAW,
                       Instance,
-                      &CurrentTable,
+                      (VOID **)&CurrentTable,
                       (UINTN *) &Size,
                       &FvStatus
                       );
diff --git a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.h b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.h
index 727cf0b56..97e9daaab 100644
--- a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.h
+++ b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.h
@@ -3,7 +3,7 @@
   this driver are defined in the Tiano ACPI External Product Specification,
   revision 0.3.6.
 
-  Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 1999 - 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,7 +53,12 @@
 //
 // Global variables
 //
-EFI_GLOBAL_NVS_AREA_PROTOCOL  mGlobalNvsArea;
+extern EFI_GLOBAL_NVS_AREA_PROTOCOL  mGlobalNvsArea;
+
+//
+// Global for the CPU I/O Protocol that is consumed by this driver
+//
+extern EFI_CPU_IO2_PROTOCOL        *mCpuIo;
 
 //
 // ACPI table information used to initialize tables.
diff --git a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatformHooks.c b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatformHooks.c
index 7ad46fe1a..ff7410c71 100644
--- a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatformHooks.c
+++ b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatformHooks.c
@@ -1,7 +1,7 @@
 /** @file
   ACPI Platform Driver Hooks.
 
-  Copyright (c) 1996 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 1996 - 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
@@ -33,11 +33,6 @@ extern SYSTEM_CONFIGURATION             mSystemConfiguration;
 ENHANCED_SPEEDSTEP_PROTOCOL             *mEistProtocol  = NULL;
 
 
-//
-// Global for the CPU I/O Protocol that is consumed by this driver
-//
-EFI_CPU_IO2_PROTOCOL        *mCpuIo;
-
 EFI_CPU_ID_MAP              mCpuApicIdAcpiIdMapTable[MAX_CPU_NUM];
 
 EFI_STATUS
diff --git a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/DptfAcpiTable/Dptf.asl b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/DptfAcpiTable/Dptf.asl
index 6cedff40e..27308d60c 100644
--- a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/DptfAcpiTable/Dptf.asl
+++ b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/DptfAcpiTable/Dptf.asl
@@ -1,5 +1,5 @@
 /** @file
-  Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 1999 - 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
@@ -572,7 +572,7 @@ Scope(\_SB)
 //
 // CPU Participant
 //
-Include("TCPUParticipant.asl")
+Include("TcpuParticipant.asl")
 
 Include("DPLYParticipant.asl")
 
@@ -589,7 +589,7 @@ Include("TFN1Participant.asl")
 //
 // Participants using device sensors.
 //
-Include("TPWRParticipant.asl")
+Include("TPwrParticipant.asl")
 
 //
 // Participants using motherboard thermistors.
diff --git a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/Facp/Facp.aslc b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/Facp/Facp.aslc
index 3123cd16e..cbc04b65b 100644
--- a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/Facp/Facp.aslc
+++ b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/Facp/Facp.aslc
@@ -1,7 +1,7 @@
 /** @file
   Fixed ACPI Description Table
 
-  Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 1999 - 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
@@ -136,7 +136,7 @@ EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE FACP = {
   // X_General Purpose Event 0 Register Block
   //
   EFI_ACPI_5_0_SYSTEM_IO,
-  0x100,
+  0x80,
   0x00,
   EFI_ACPI_5_0_BYTE,
   GPE0_BLK,
diff --git a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/Lpit/Lpit.aslc b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/Lpit/Lpit.aslc
index c018f57ca..286271505 100644
--- a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/Lpit/Lpit.aslc
+++ b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/Lpit/Lpit.aslc
@@ -131,32 +131,31 @@ typedef struct _EFI_ACPI_LOW_POWER_IDLE_TABLE {
 #pragma pack()
 
 EFI_ACPI_LOW_POWER_IDLE_TABLE Lpit = {
-
-  //
-  // Header
-  //
-
-
-  EFI_ACPI_LOW_POWER_IDLE_TABLE_SIGNATURE,
-  sizeof (EFI_ACPI_LOW_POWER_IDLE_TABLE),
-  EFI_ACPI_LOW_POWER_IDLE_TABLE_REVISION ,
-
-  //
-  // Checksum will be updated at runtime
-  //
-  0x00,
-
-  //
-  // It is expected that these values will be updated at runtime
-  //
-  ' ', ' ', ' ', ' ', ' ', ' ',
-
-  0,
-  EFI_ACPI_OEM_LPIT_REVISION,
-  0,
-  0,
-
-
+  {
+    //
+    // Header
+    //
+
+
+    EFI_ACPI_LOW_POWER_IDLE_TABLE_SIGNATURE,
+    sizeof (EFI_ACPI_LOW_POWER_IDLE_TABLE),
+    EFI_ACPI_LOW_POWER_IDLE_TABLE_REVISION ,
+
+    //
+    // Checksum will be updated at runtime
+    //
+    0x00,
+
+    //
+    // It is expected that these values will be updated at runtime
+    //
+    {' ', ' ', ' ', ' ', ' ', ' '},
+
+    0,
+    EFI_ACPI_OEM_LPIT_REVISION,
+    0,
+    0
+  },
 
   //
   // Descriptor
diff --git a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/Mcfg/Mcfg.aslc b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/Mcfg/Mcfg.aslc
index e3120e83f..b8fb8cae8 100644
--- a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/Mcfg/Mcfg.aslc
+++ b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/Mcfg/Mcfg.aslc
@@ -1,7 +1,7 @@
 /** @file
   ACPI Memory mapped configuration space base address Description Table
 
-  Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 1999 - 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
@@ -22,31 +22,37 @@
 // MCFG Table definition
 //
 EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE MCFG = {
-  EFI_ACPI_3_0_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_SIGNATURE,
-  sizeof (EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE),
-  EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_REVISION,
-  //
-  // Checksum will be updated at runtime
-  //
-  0x00,
-  //
-  // It is expected that these values will be programmed at runtime
-  //
-  ' ',
-  ' ',
-  ' ',
-  ' ',
-  ' ',
-  ' ',
-
-  0,
-  EFI_ACPI_OEM_MCFG_REVISION,
-  0,
-  0,
-  //
-  // Beginning of MCFG specific fields
-  //
-  EFI_ACPI_RESERVED_QWORD,
+  {
+ 
+    {
+      EFI_ACPI_3_0_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_SIGNATURE,
+      sizeof (EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE),
+      EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_REVISION,
+      //
+      // Checksum will be updated at runtime
+      //
+      0x00,
+      //
+      // It is expected that these values will be programmed at runtime
+      //
+      {
+       ' ',
+       ' ',
+       ' ',
+       ' ',
+       ' ',
+       ' ',
+      },
+      0,
+      EFI_ACPI_OEM_MCFG_REVISION,
+      0,
+      0,
+    },
+    //
+    // Beginning of MCFG specific fields
+    //
+    EFI_ACPI_RESERVED_QWORD
+  },
   //
   // Sample Memory Mapped Configuration Space Base Address Structure
   //
@@ -58,11 +64,15 @@ EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE MCFG = {
   //
   // Memory Mapped Configuration Space Base Address Structure for BNB
   //
-  0x0,                      // Base Address, will be updated by AcpiPlatform
-  0x0,                      // PCI Segment Group Number
-  0x0,                      // Start Bus Number
-  PLATFORM_MAX_BUS_NUM,     // End Bus Number
-  EFI_ACPI_RESERVED_DWORD,  // Reserved
+  {
+    {
+     0x0,                      // Base Address, will be updated by AcpiPlatform
+     0x0,                      // PCI Segment Group Number
+     0x0,                      // Start Bus Number
+     PLATFORM_MAX_BUS_NUM,     // End Bus Number
+     EFI_ACPI_RESERVED_DWORD
+    }  // Reserved
+  }
 };
 
 VOID*
diff --git a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/ScAudio.asl b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/ScAudio.asl
index 80da490ce..d16bc4e95 100644
--- a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/ScAudio.asl
+++ b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/ScAudio.asl
@@ -1,5 +1,5 @@
 /** @file
-  Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2011 - 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
@@ -161,73 +161,73 @@
             // PP Module Waves (module XAMAXXAU)
             // Check PP module with GUID B489C2DE-0F96-42E1-8A2D-C25B5091EE49
             If (LEqual(Arg3, ToUUID ("B489C2DE-0F96-42E1-8A2D-C25B5091EE49"))) {
-              Return(And(ADPM, BIT0)) // ADPM[BIT0] set - supported (return true)
+              Return(And(ADPM, 0x01)) // ADPM[BIT0] set - supported (return true)
             }
 
             // PP Module DTS (module PRMSND)
             // Check PP module with GUID E1284052-8664-4FE4-A353-3878F72704C3
             If (LEqual(Arg3, ToUUID ("E1284052-8664-4FE4-A353-3878F72704C3"))) {
-              Return(And(ADPM, BIT1)) // ADPM[BIT1] set - supported (return true)
+              Return(And(ADPM, 0x02)) // ADPM[BIT1] set - supported (return true)
             }
 
               // PP Module IntelSst Speech
             // Check PP module with GUID 7C708106-3AFF-40FE-88BE-8C999B3F7445
             If (LEqual(Arg3, ToUUID ("7C708106-3AFF-40FE-88BE-8C999B3F7445"))) {
-              Return(And(ADPM, BIT2)) // ADPM[BIT2] set - supported (return true)
+              Return(And(ADPM, 0x04)) // ADPM[BIT2] set - supported (return true)
             }
 
             // PP Module Dolby
             // Check PP module with GUID E0E018A8-3550-4B54-A8D0-A8E05D0FCBA2
             If (LEqual(Arg3, ToUUID ("E0E018A8-3550-4B54-A8D0-A8E05D0FCBA2"))) {
-              Return(And(ADPM, BIT3)) // ADPM[BIT3] set - supported (return true)
+              Return(And(ADPM, 0x08)) // ADPM[BIT3] set - supported (return true)
             }
 
             // PP Module Samsung SoundAlive
             // Check PP module with GUID 202BADB5-8870-4290-B536-F2380C63F55D
             If (LEqual(Arg3, ToUUID ("202BADB5-8870-4290-B536-F2380C63F55D"))) {
-              Return(And(ADPM, BIT4)) // ADPM[BIT4] set - supported (return true)
+              Return(And(ADPM, 0x10)) // ADPM[BIT4] set - supported (return true)
             }
 
             // PP Module Samsung SoundBooster
             // Check PP module with GUID EB3FEA76-394B-495D-A14D-8425092D5CB7
             If (LEqual(Arg3, ToUUID ("EB3FEA76-394B-495D-A14D-8425092D5CB7"))) {
-              Return(And(ADPM, BIT5)) // ADPM[BIT5] set - supported (return true)
+              Return(And(ADPM, 0x20)) // ADPM[BIT5] set - supported (return true)
             }
 
             // PP Module Samsung EQ/DRC
             // Check PP module with GUID F1C69181-329A-45F0-8EEF-D8BDDF81E036
             If (LEqual(Arg3, ToUUID ("F1C69181-329A-45F0-8EEF-D8BDDF81E036"))) {
-              Return(And(ADPM, BIT6)) // ADPM[BIT6] set - supported (return true)
+              Return(And(ADPM, 0x40)) // ADPM[BIT6] set - supported (return true)
             }
 
             // PP Module ForteMedia SAMSoft
             // Check PP module with GUID B3573EFF-6441-4A75-91F7-4281EEC4597D
             If (LEqual(Arg3, ToUUID ("B3573EFF-6441-4A75-91F7-4281EEC4597D"))) {
-              Return(And(ADPM, BIT7)) // ADPM[BIT7] set - supported (return true)
+              Return(And(ADPM, 0x80)) // ADPM[BIT7] set - supported (return true)
             }
 
             // PP Module WoV Intel
             // Check PP module with GUID EC774FA9-28D3-424A-90E4-69F984F1EEB7
             If (LEqual(Arg3, ToUUID ("EC774FA9-28D3-424A-90E4-69F984F1EEB7"))) {
-              Return(And(ADPM, BIT8)) // ADPM[BIT8] set - supported (return true)
+              Return(And(ADPM, 0x100)) // ADPM[BIT8] set - supported (return true)
             }
 
             // PP Module WoV Sensory
             // Check PP module with GUID F101FEF0-FF5A-4AD4-8710-43592A6F7948
             If (LEqual(Arg3, ToUUID ("F101FEF0-FF5A-4AD4-8710-43592A6F7948"))) {
-              Return(And(ADPM, BIT9)) // ADPM[BIT9] set - supported (return true)
+              Return(And(ADPM, 0x200)) // ADPM[BIT9] set - supported (return true)
             }
 
             // PP Module Conexant
             // Check PP module with GUID F3578986-4400-4ADF-AE7E-CD433CD3F26E
             If (LEqual(Arg3, ToUUID ("F3578986-4400-4ADF-AE7E-CD433CD3F26E"))) {
-              Return(And(ADPM, BIT10)) // ADPM[BIT10] set - supported (return true)
+              Return(And(ADPM, 0x0400)) // ADPM[BIT10] set - supported (return true)
             }
 
             // PP Module Aware
             // Check PP module with GUID 13B5E4D7-A91A-4059-8290-605B01CCB650
             If (LEqual(Arg3, ToUUID ("13B5E4D7-A91A-4059-8290-605B01CCB650"))) {
-              Return(And(ADPM, BIT11)) // ADPM[BIT11] set - supported (return true)
+              Return(And(ADPM, 0x0800)) // ADPM[BIT11] set - supported (return true)
             }
 
               Return(0) // Is not supported
diff --git a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/Wsmt/Wsmt.act b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/Wsmt/Wsmt.act
index 334c58df3..b5d0a3263 100644
--- a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/Wsmt/Wsmt.act
+++ b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/Wsmt/Wsmt.act
@@ -1,7 +1,7 @@
 /** @file
   ACPI WSMT table
 
-  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
@@ -27,14 +27,17 @@ ACPI_WINDOWS_SMM_SECURITY_MITIGATIONS_STRUCTURE Wsmt = {
   0x00,
 
   //OEMID
+  {
   0x00,
   0x00,
   0x00,
   0x00,
   0x00,
-  0x00,
+  0x00
+  },
 
   //OEMTableID
+  {
   0x00,
   0x00,
   0x00,
@@ -42,7 +45,8 @@ ACPI_WINDOWS_SMM_SECURITY_MITIGATIONS_STRUCTURE Wsmt = {
   0x00,
   0x00,
   0x00,
-  0x00,
+  0x00
+  },
 
   //OEMRevision
   0x00000000,
diff --git a/Platform/BroxtonPlatformPkg/Common/Acpi/UsbTypeCDxe/UsbTypeC.c b/Platform/BroxtonPlatformPkg/Common/Acpi/UsbTypeCDxe/UsbTypeC.c
index e2a5ac612..f07161388 100644
--- a/Platform/BroxtonPlatformPkg/Common/Acpi/UsbTypeCDxe/UsbTypeC.c
+++ b/Platform/BroxtonPlatformPkg/Common/Acpi/UsbTypeCDxe/UsbTypeC.c
@@ -1,7 +1,7 @@
 /** @file
   Implements Overclocking Interface for OS Application ie Iron city.
 
-  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2015 - 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
@@ -85,6 +85,7 @@ static UINT16 GetUcsiRev(VOID)
 
 **/
 EFI_STATUS
+EFIAPI
 UsbTypeCEntryPoint (
   IN EFI_HANDLE       ImageHandle,
   IN EFI_SYSTEM_TABLE *SystemTable
@@ -95,7 +96,7 @@ UsbTypeCEntryPoint (
 
   DEBUG ((DEBUG_INFO, "UsbTypeC entrypoint.\n"));
 
-  Status = gBS->LocateProtocol (&gEfiGlobalNvsAreaProtocolGuid, NULL, &GlobalNvsAreaProtocol);
+  Status = gBS->LocateProtocol (&gEfiGlobalNvsAreaProtocolGuid, NULL, (VOID **)&GlobalNvsAreaProtocol);
   ASSERT_EFI_ERROR (Status);
   if (EFI_ERROR (Status)) {
     return Status;
@@ -106,7 +107,7 @@ UsbTypeCEntryPoint (
   //
   // Allocate memory in ACPI NVS
   //
-  Status = AllocateMemoryBelow4G (EfiACPIMemoryNVS, 0x1000, &OpmBuffer);
+  Status = AllocateMemoryBelow4G (EfiACPIMemoryNVS, 0x1000, (VOID **)&OpmBuffer);
   ASSERT_EFI_ERROR (Status);
 
   if (EFI_ERROR (Status)) {
diff --git a/Platform/BroxtonPlatformPkg/Common/Console/PlatformGopPolicyDxe/PlatformGopPolicy.c b/Platform/BroxtonPlatformPkg/Common/Console/PlatformGopPolicyDxe/PlatformGopPolicy.c
index 26dc95c77..8f3bc4428 100644
--- a/Platform/BroxtonPlatformPkg/Common/Console/PlatformGopPolicyDxe/PlatformGopPolicy.c
+++ b/Platform/BroxtonPlatformPkg/Common/Console/PlatformGopPolicyDxe/PlatformGopPolicy.c
@@ -1,7 +1,7 @@
 /** @file
   Platform GOP Driver Policy.
 
-  Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 1999 - 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
@@ -23,7 +23,7 @@
 #include <Library/HobLib.h>
 #include <Guid/PlatformInfo.h>
 
-EFI_BOOT_SERVICES   *gBS;
+extern EFI_BOOT_SERVICES   *gBS;
 
 PLATFORM_GOP_POLICY_PROTOCOL  mPlatformGOPPolicy;
 
@@ -82,7 +82,7 @@ GetVbtData (
   SYSTEM_CONFIGURATION          SystemConfiguration;
   UINTN                         VarSize;
   EFI_STATUS                    Status;
-  EFI_GUID  BmpImageGuid = { 0xE08CA6D5, 0x8D02, 0x43ae, 0xAB, 0xB1, 0x95, 0x2C, 0xC7, 0x87, 0xC9, 0x33 };
+  EFI_GUID  BmpImageGuid = { 0xE08CA6D5, 0x8D02, 0x43ae, {0xAB, 0xB1, 0x95, 0x2C, 0xC7, 0x87, 0xC9, 0x33} };
   UINTN                         FvProtocolCount;
   EFI_HANDLE                    *FvHandles;
   EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv;
@@ -130,7 +130,7 @@ GetVbtData (
                      &BmpImageGuid,
                      EFI_SECTION_RAW,
                      0,
-                     &Buffer,
+                     (VOID **)&Buffer,
                      &VbtBufferSize,
                      &AuthenticationStatus
                      );
diff --git a/Platform/BroxtonPlatformPkg/Common/Features/S3/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.c b/Platform/BroxtonPlatformPkg/Common/Features/S3/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.c
index 82efcfe36..ef45fdb6b 100644
--- a/Platform/BroxtonPlatformPkg/Common/Features/S3/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.c
+++ b/Platform/BroxtonPlatformPkg/Common/Features/S3/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.c
@@ -1,7 +1,7 @@
 /** @file
   A helper driver to save information to SMRAM after SMRR is enabled.
 
-  Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2011 - 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
@@ -19,7 +19,7 @@
 
 #define EFI_SMRAM_CPU_NVS_HEADER_GUID \
   { \
-    0x429501d9, 0xe447, 0x40f4, 0x86, 0x7b, 0x75, 0xc9, 0x3a, 0x1d, 0xb5, 0x4e \
+    0x429501d9, 0xe447, 0x40f4, {0x86, 0x7b, 0x75, 0xc9, 0x3a, 0x1d, 0xb5, 0x4e} \
   }
 
 GLOBAL_REMOVE_IF_UNREFERENCED UINT8   mSmiDataRegister;
diff --git a/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c b/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c
index f52cad23f..b511e96cc 100644
--- a/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c
+++ b/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c
@@ -48,7 +48,7 @@ CurrentLanguageMatch (
     return;
   }
 
-  GetEfiGlobalVariable2 (L"PlatformLang", &CurrentLang, NULL);
+  GetEfiGlobalVariable2 (L"PlatformLang", (VOID **)&CurrentLang, NULL);
   DefaultLang  = (CHAR8 *) PcdGetPtr (PcdUefiVariableDefaultPlatformLang);
   BestLanguage = GetBestLanguage (
                    Languages,
diff --git a/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscOemType0x94Function.c b/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscOemType0x94Function.c
index 0382858fe..68d68d327 100644
--- a/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscOemType0x94Function.c
+++ b/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscOemType0x94Function.c
@@ -1,7 +1,7 @@
 /** @file
   The function that processes the Smbios data type 0x94.
 
-  Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 1999 - 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
@@ -30,7 +30,7 @@
 #include <Protocol/CpuIo2.h>
 #include <Library/IoLib.h>
 #include <Library/PlatformSecureDefaultsLib.h>
-#include <Library/I2clib.h>
+#include <Library/I2CLib.h>
 #include <Library/CpuIA32.h>
 #include <Library/DriverLib.h>
 #include <Library/UefiRuntimeServicesTableLib.h>
@@ -1576,7 +1576,7 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscOemType0x94)
 
   Status = EfiCreateEventReadyToBootEx (
              TPL_CALLBACK,
-             AddSmbiosT0x94Callback,
+             (EFI_EVENT_NOTIFY)AddSmbiosT0x94Callback,
              RecordData,
              &AddSmbiosT0x94CallbackEvent
              );
diff --git a/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/UsbDeviceDxe.c b/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/UsbDeviceDxe.c
index 03bf27d6e..06705c8b6 100644
--- a/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/UsbDeviceDxe.c
+++ b/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/UsbDeviceDxe.c
@@ -342,7 +342,7 @@ UsbDeviceDxeDriverStop (
   Status = gBS->OpenProtocol (
                   Controller,
                   &gEfiUsbFnIoProtocolGuid,
-                  &UsbFunIoProtocol,
+                  (VOID **)&UsbFunIoProtocol,
                   This->DriverBindingHandle,
                   Controller,
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL
diff --git a/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/UsbFuncIo.c b/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/UsbFuncIo.c
index 9a156ba9b..e1027d248 100644
--- a/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/UsbFuncIo.c
+++ b/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/UsbFuncIo.c
@@ -1901,7 +1901,7 @@ StartXdciController (
   UsbFuncIoDevPtr->DeviceId = USBFU_PID;
   UsbFuncIoDevPtr->StartUpController = TRUE;
 
-  Status = UsbDeviceInit (&ConfigParams, &UsbFuncIoDevPtr->DrvCore);
+  Status = UsbDeviceInit (&ConfigParams, (VOID **)&UsbFuncIoDevPtr->DrvCore);
   if (Status != EFI_SUCCESS) {
     Status = EFI_DEVICE_ERROR;
     goto EXIT_START_CONTROLLER;
@@ -2166,6 +2166,7 @@ DEV_INIT_EXIT:
 }
 
 EFI_STATUS
+EFIAPI
 StartController (
   IN EFI_USBFN_IO_PROTOCOL        *This
   )
@@ -2210,6 +2211,7 @@ DEV_DEINIT_EXIT:
 }
 
 EFI_STATUS
+EFIAPI
 StopController (
   IN EFI_USBFN_IO_PROTOCOL        *This
   )
diff --git a/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/XdciDWC.c b/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/XdciDWC.c
index 47c5b80bd..2c1e929ab 100644
--- a/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/XdciDWC.c
+++ b/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/XdciDWC.c
@@ -15,7 +15,6 @@
 #include "XdciInterface.h"
 #include "XdciDWC.h"
 
-#pragma optimize ("", off)
 
 UINT32
 UsbRegRead (
@@ -3628,8 +3627,8 @@ UsbXdciCoreReinit (
     DWC_XDCI_DCTL_REG,
     UsbRegRead (BaseAddr, DWC_XDCI_DCTL_REG) &
     (~DWC_XDCI_DCTL_KEEP_CONNECT_MASK) &
-    (~DWC_XDCI_DCTL_STATE_CHANGE_REQ_MASK) |
-    (DWC_XDCI_DCTL_STATE_CHANGE_REQ_RX_DETECT << DWC_XDCI_DCTL_STATE_CHANGE_REQ_BIT_POS)
+    ((~DWC_XDCI_DCTL_STATE_CHANGE_REQ_MASK) |
+    (DWC_XDCI_DCTL_STATE_CHANGE_REQ_RX_DETECT << DWC_XDCI_DCTL_STATE_CHANGE_REQ_BIT_POS))
     );
 
   DEBUG ((DEBUG_INFO, "Device controller Synopsys ID: %x\n", UsbRegRead (BaseAddr, DWC_XDCI_GSNPSID_REG)));
@@ -4029,5 +4028,3 @@ UsbXdciCoreFlushEpFifo (
 
   return Status;
 }
-#pragma optimize ("", on)
-
diff --git a/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/XdciInterface.h b/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/XdciInterface.h
index 90264e84f..93eb77367 100644
--- a/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/XdciInterface.h
+++ b/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/XdciInterface.h
@@ -65,7 +65,7 @@ EFI_STATUS
 (EFIAPI *DEV_CORE_REG_CALLBACK) (
   IN VOID                      *CoreHandle,
   IN USB_DEVICE_EVENT_ID       Event,
-  IN EFI_STATUS                (*callbackFn)(IN USB_DEVICE_CALLBACK_PARAM *CbEventParams)
+  IN USB_DEVICE_CALLBACK_FUNC  CallbackFn
   );
 
 typedef
diff --git a/Platform/BroxtonPlatformPkg/Common/FspSupport/Library/BaseFspPlatformInfoLibSample/FspPlatformInfoLibSample.c b/Platform/BroxtonPlatformPkg/Common/FspSupport/Library/BaseFspPlatformInfoLibSample/FspPlatformInfoLibSample.c
index ac8e42e6d..077266ace 100644
--- a/Platform/BroxtonPlatformPkg/Common/FspSupport/Library/BaseFspPlatformInfoLibSample/FspPlatformInfoLibSample.c
+++ b/Platform/BroxtonPlatformPkg/Common/FspSupport/Library/BaseFspPlatformInfoLibSample/FspPlatformInfoLibSample.c
@@ -1,7 +1,7 @@
 /** @file
   Sample to provide FSP platform information related function.
 
-  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2014 - 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
@@ -230,16 +230,13 @@ GetS3MemoryInfo (
   ACPI_VARIABLE_SET               *AcpiVariableSet;
   EFI_PEI_HOB_POINTERS            GuidHob;
   EFI_PHYSICAL_ADDRESS            *AcpiVariableAddress;
-  UINTN                           AcpiVarHobSize;
 
   GuidHob.Raw = GetHobList ();
   AcpiVariableAddress = NULL;
-  AcpiVarHobSize = 0;
 
   if (GuidHob.Raw != NULL) {
     if ((GuidHob.Raw = GetNextGuidHob (&gEfiAcpiVariableCompatiblityGuid, GuidHob.Raw)) != NULL) {
       AcpiVariableAddress = GET_GUID_HOB_DATA (GuidHob.Guid);
-      AcpiVarHobSize = GET_GUID_HOB_DATA_SIZE (GuidHob.Guid);
     }
   }
 
diff --git a/Platform/BroxtonPlatformPkg/Common/FspSupport/Library/PeiFspHobProcessLib/FspHobProcessLib.c b/Platform/BroxtonPlatformPkg/Common/FspSupport/Library/PeiFspHobProcessLib/FspHobProcessLib.c
index 499e5fc05..ec3ea8dcf 100644
--- a/Platform/BroxtonPlatformPkg/Common/FspSupport/Library/PeiFspHobProcessLib/FspHobProcessLib.c
+++ b/Platform/BroxtonPlatformPkg/Common/FspSupport/Library/PeiFspHobProcessLib/FspHobProcessLib.c
@@ -1,7 +1,7 @@
 /** @file
   Null instance of Platform Sec Lib.
 
-  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2014 - 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
@@ -64,14 +64,13 @@ GetMemorySizeInMemoryTypeInformation (
   IN EFI_PEI_SERVICES **PeiServices
   )
 {
-  EFI_STATUS                  Status;
   EFI_PEI_HOB_POINTERS        Hob;
   EFI_MEMORY_TYPE_INFORMATION *MemoryData;
   UINT8                       Index;
   UINTN                       TempPageNum;
 
   MemoryData = NULL;
-  Status     = (*PeiServices)->GetHobList (PeiServices, (VOID **) &Hob.Raw);
+  (*PeiServices)->GetHobList ((CONST EFI_PEI_SERVICES **)PeiServices, (VOID **) &Hob.Raw);
   while (!END_OF_HOB_LIST (Hob)) {
     if (Hob.Header->HobType == EFI_HOB_TYPE_GUID_EXTENSION &&
       CompareGuid (&Hob.Guid->Name, &gEfiMemoryTypeInformationGuid)) {
@@ -181,10 +180,6 @@ FspHobProcessForMemoryResource (
   BOOLEAN               FoundFspMemHob;
   EFI_STATUS            Status;
   EFI_BOOT_MODE         BootMode;
-  EFI_PEI_SERVICES      **PeiServices;
-  FSPM_UPD              *FspmUpd;
-
-  PeiServices = (EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();
 
   PeiServicesGetBootMode (&BootMode);
 
@@ -195,7 +190,6 @@ FspHobProcessForMemoryResource (
   FspMemoryBase = 0;
   FoundFspMemHob = FALSE;
 
-  FspmUpd = (FSPM_UPD *) GetFspMemoryInitUpdDataPointer ();
 
   //
   // Parse the hob list from fsp
@@ -352,7 +346,6 @@ ProcessFspHobList (
 )
 {
   EFI_PEI_HOB_POINTERS   FspHob;
-  EFI_PEI_HOB_POINTERS   DxeHob;
   BOOLEAN                TransferFlag;
 
   //
@@ -400,7 +393,7 @@ ProcessFspHobList (
 
     if (TransferFlag) {
       DEBUG ((DEBUG_INFO, "FSP  Extended    GUID HOB: {%g} HobLength = %x\n", &(FspHob.Guid->Name), FspHob.Header->HobLength));
-      DxeHob.Raw = BuildGuidDataHob(&FspHob.Guid->Name, GET_GUID_HOB_DATA(FspHob.Raw), GET_GUID_HOB_DATA_SIZE(FspHob.Raw));
+      BuildGuidDataHob(&FspHob.Guid->Name, GET_GUID_HOB_DATA(FspHob.Raw), GET_GUID_HOB_DATA_SIZE(FspHob.Raw));
     }
     FspHob.Raw = GET_NEXT_HOB (FspHob);
   }
diff --git a/Platform/BroxtonPlatformPkg/Common/Include/Guid/SetupVariable.h b/Platform/BroxtonPlatformPkg/Common/Include/Guid/SetupVariable.h
index fe95ee7c9..c6ced4616 100644
--- a/Platform/BroxtonPlatformPkg/Common/Include/Guid/SetupVariable.h
+++ b/Platform/BroxtonPlatformPkg/Common/Include/Guid/SetupVariable.h
@@ -1,7 +1,7 @@
 /** @file
   Header file for Setup Variable.
 
-  Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2012 - 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
@@ -21,29 +21,29 @@
 //
 // {EC87D643-EBA4-4bb5-A1E5-3F3E36B20DA9}
 //
-#define SYSTEM_CONFIGURATION_GUID  { 0xec87d643, 0xeba4, 0x4bb5, 0xa1, 0xe5, 0x3f, 0x3e, 0x36, 0xb2, 0xd, 0xa9 }
+#define SYSTEM_CONFIGURATION_GUID  { 0xec87d643, 0xeba4, 0x4bb5, {0xa1, 0xe5, 0x3f, 0x3e, 0x36, 0xb2, 0xd, 0xa9 }}
 
-#define ROOT_SECURITY_GUID  { 0xd387d688, 0xeba4, 0x45b5, 0xa1, 0xe5, 0x3f, 0x3e, 0x36, 0xb2, 0xd, 0x37 }
+#define ROOT_SECURITY_GUID  { 0xd387d688, 0xeba4, 0x45b5, {0xa1, 0xe5, 0x3f, 0x3e, 0x36, 0xb2, 0xd, 0x37} }
 
 //
 // {6936B3BD-4350-46d9-8940-1FA20961AEB1}
 //
-#define SYSTEM_ROOT_MAIN_GUID  { 0x6936b3bd, 0x4350, 0x46d9, 0x89, 0x40, 0x1f, 0xa2, 0x9, 0x61, 0xae, 0xb1 }
+#define SYSTEM_ROOT_MAIN_GUID  { 0x6936b3bd, 0x4350, 0x46d9, {0x89, 0x40, 0x1f, 0xa2, 0x9, 0x61, 0xae, 0xb1} }
 
 //
 // {21FEE8DB-0D29-477e-B5A9-96EB343BA99C}
 //
-#define ADDITIONAL_SYSTEM_INFO_GUID  {  0x21fee8db, 0xd29, 0x477e, 0xb5, 0xa9, 0x96, 0xeb, 0x34, 0x3b, 0xa9, 0x9c }
+#define ADDITIONAL_SYSTEM_INFO_GUID  {  0x21fee8db, 0xd29, 0x477e, {0xb5, 0xa9, 0x96, 0xeb, 0x34, 0x3b, 0xa9, 0x9c }}
 
 //
 // {EC87D643-EBA4-4BB5-A1E5-3F3E36B20DA9}
 //
-#define SETUP_GUID  { 0xEC87D643, 0xEBA4, 0x4BB5, 0xA1, 0xE5, 0x3F, 0x3E, 0x36, 0xB2, 0x0D, 0xA9 }
+#define SETUP_GUID  { 0xEC87D643, 0xEBA4, 0x4BB5, {0xA1, 0xE5, 0x3F, 0x3E, 0x36, 0xB2, 0x0D, 0xA9 }}
 
 //
 // {1B838190-4625-4ead-ABC9-CD5E6AF18FE0}
 //
-#define EFI_HII_EXPORT_DATABASE_GUID { 0x1b838190, 0x4625, 0x4ead, 0xab, 0xc9, 0xcd, 0x5e, 0x6a, 0xf1, 0x8f, 0xe0 }
+#define EFI_HII_EXPORT_DATABASE_GUID { 0x1b838190, 0x4625, 0x4ead, {0xab, 0xc9, 0xcd, 0x5e, 0x6a, 0xf1, 0x8f, 0xe0} }
 
 #define PASSWORD_MAX_SIZE            20
 #define MAX_CUSTOM_VID_TABLE_STATES  6
@@ -80,7 +80,6 @@
 #define EFI_HDD_WARNING_OFF   0x00
 #define EFI_CD_WARNING_OFF    0x00
 #define EFI_SMART_WARNING_OFF 0x00
-#define OFFSET_0              0x00
 
 #ifndef VFRCOMPILE
   extern EFI_GUID gEfiSetupVariableGuid;
diff --git a/Platform/BroxtonPlatformPkg/Common/Library/DxePolicyUpdateLib/DxeSaPolicyUpdate.c b/Platform/BroxtonPlatformPkg/Common/Library/DxePolicyUpdateLib/DxeSaPolicyUpdate.c
index 4fa42747e..2b24a9a3b 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/DxePolicyUpdateLib/DxeSaPolicyUpdate.c
+++ b/Platform/BroxtonPlatformPkg/Common/Library/DxePolicyUpdateLib/DxeSaPolicyUpdate.c
@@ -1,7 +1,7 @@
 /** @file
   This file is the library for SA DXE Policy initialzation.
 
-  Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2004 - 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
@@ -60,7 +60,7 @@ UpdateDxeSaPolicy (
   Status = gBS->LocateProtocol (
                   &gPlatformGOPPolicyGuid,
                   NULL,
-                  &GopPolicy
+                  (VOID **)&GopPolicy
                   );
 
   if (EFI_ERROR (Status) || (GopPolicy == NULL)) {
diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiCpuPolicyUpdate.c b/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiCpuPolicyUpdate.c
index dbb2bc53d..27c4dfc71 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiCpuPolicyUpdate.c
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PeiPolicyUpdateLib/PeiCpuPolicyUpdate.c
@@ -1,7 +1,7 @@
 /** @file
   This file is SampleCode of the library for Intel CPU PEI Policy Update initialization.
 
-  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 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
@@ -43,7 +43,6 @@ UpdatePeiCpuPolicy (
   CPU_CONFIG                  *CpuConfig;
   POWER_MGMT_CONFIG           *PowerMgmtConfig;
   EFI_PEI_HOB_POINTERS        Hob;
-  EFI_PLATFORM_INFO_HOB       *PlatformInfo;
 
   Status = GetConfigBlock ((CONFIG_BLOCK_TABLE_HEADER *) SiCpuPolicyPpi, &gCpuConfigGuid, (VOID *) &CpuConfig);
   ASSERT_EFI_ERROR (Status);
@@ -55,7 +54,6 @@ UpdatePeiCpuPolicy (
 
   Hob.Raw = GetFirstGuidHob (&gEfiPlatformInfoGuid);
   ASSERT (Hob.Raw != NULL);
-  PlatformInfo = GET_GUID_HOB_DATA (Hob.Raw);
 
   CpuConfig->ActiveProcessorCores        = SystemConfiguration->ActiveProcessorCores;
   CpuConfig->DisableCore1                = SystemConfiguration->Core1;
diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PlatformBdsLib/BdsPlatform.c b/Platform/BroxtonPlatformPkg/Common/Library/PlatformBdsLib/BdsPlatform.c
index 53a5ee7e2..fa0f0212b 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformBdsLib/BdsPlatform.c
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformBdsLib/BdsPlatform.c
@@ -1,7 +1,7 @@
 /** @file
   This file include all platform action which can be customized by IBV/OEM.
 
-  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
@@ -34,7 +34,7 @@
 
 extern EFI_GUID gUndiDriverImageGuid;
 
-EFI_GUID gUefiShellFileGuid = { 0x7C04A583, 0x9E3E, 0x4f1c, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 };
+EFI_GUID gUefiShellFileGuid = { 0x7C04A583, 0x9E3E, 0x4f1c, {0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }};
 
 EFI_USER_PROFILE_HANDLE                           mCurrentUser = NULL;
 EFI_EVENT                                         mHotKeyTimerEvent = NULL;
@@ -443,7 +443,7 @@ FastBootUpdateConInVarByConInBehavior (
   EfiCreateProtocolNotifyEvent (
     &gSetupEnterGuid,
     TPL_CALLBACK,
-    ConnectAllConsolesForSetupMenu,
+    (EFI_EVENT_NOTIFY)ConnectAllConsolesForSetupMenu,
     NULL,
     &SetupRegistration
     );
diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PlatformBdsLib/BdsPlatform.h b/Platform/BroxtonPlatformPkg/Common/Library/PlatformBdsLib/BdsPlatform.h
index 18c5f8877..55f237c6b 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformBdsLib/BdsPlatform.h
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformBdsLib/BdsPlatform.h
@@ -1,7 +1,7 @@
 /** @file
   Header file for BDS Platform specific code.
 
-  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
@@ -71,16 +71,25 @@ extern EFI_DEVICE_PATH_PROTOCOL  *gSerialIoConnect[];
 #define SUBCLASS_BOOT       1
 #define PROTOCOL_KEYBOARD   1
 
+//
+// the short form device path for Usb keyboard
+//
+#define CLASS_HID           3
+#define SUBCLASS_BOOT       1
+#define PROTOCOL_KEYBOARD   1
+
 #define PCI_DEVICE_PATH_NODE(Func, Dev) \
   { \
-    HARDWARE_DEVICE_PATH, \
-    HW_PCI_DP, \
     { \
-      (UINT8) (sizeof (PCI_DEVICE_PATH)), \
-      (UINT8) ((sizeof (PCI_DEVICE_PATH)) >> 8) \
-    }, \
-    (Func), \
-    (Dev) \
+      HARDWARE_DEVICE_PATH, \
+      HW_PCI_DP, \
+      { \
+        (UINT8) (sizeof (PCI_DEVICE_PATH)), \
+        (UINT8) ((sizeof (PCI_DEVICE_PATH)) >> 8) \
+      } \
+     }, \
+     (Func), \
+     (Dev) \
   }
 
 #define PNPID_DEVICE_PATH_NODE(PnpId) \
@@ -132,8 +141,10 @@ extern EFI_DEVICE_PATH_PROTOCOL  *gSerialIoConnect[];
     { \
       MESSAGING_DEVICE_PATH, \
       MSG_USB_CLASS_DP, \
-      (UINT8) (sizeof (USB_CLASS_DEVICE_PATH)), \
-      (UINT8) ((sizeof (USB_CLASS_DEVICE_PATH)) >> 8) \
+      {\
+        (UINT8) (sizeof (USB_CLASS_DEVICE_PATH)), \
+        (UINT8) ((sizeof (USB_CLASS_DEVICE_PATH)) >> 8) \
+      }\
     }, \
     0xffff, \
     0xffff, \
diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PlatformBdsLib/PlatformData.c b/Platform/BroxtonPlatformPkg/Common/Library/PlatformBdsLib/PlatformData.c
index 8f619da55..dd9808c0b 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformBdsLib/PlatformData.c
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformBdsLib/PlatformData.c
@@ -2,7 +2,7 @@
   Defined the platform specific device path which will be used by
   platform Bbd to perform the platform policy connect.
 
-  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
@@ -117,13 +117,17 @@ EFI_DEVICE_PATH_PROTOCOL* gPlatformAllPossiblePciVgaConsole [] = {
 //
 LEGACY_HD_DEVICE_PATH gLegacyHd = {
   {
-    BBS_DEVICE_PATH,
-    BBS_BBS_DP,
-    (UINT8) (sizeof (BBS_BBS_DEVICE_PATH)),
-    (UINT8) ((sizeof (BBS_BBS_DEVICE_PATH)) >> 8),
+    {
+      BBS_DEVICE_PATH,
+      BBS_BBS_DP,
+      {
+        (UINT8) (sizeof (BBS_BBS_DEVICE_PATH)),
+        (UINT8) ((sizeof (BBS_BBS_DEVICE_PATH)) >> 8)
+      }
+    },
     BBS_TYPE_HARDDRIVE,
     0,
-    0
+    {0}
   },
   gEndEntire
 };
@@ -133,13 +137,17 @@ LEGACY_HD_DEVICE_PATH gLegacyHd = {
 //
 LEGACY_HD_DEVICE_PATH gLegacyCdrom = {
   {
-    BBS_DEVICE_PATH,
-    BBS_BBS_DP,
-    (UINT8) (sizeof (BBS_BBS_DEVICE_PATH)),
-    (UINT8) ((sizeof (BBS_BBS_DEVICE_PATH)) >> 8),
+    {
+      BBS_DEVICE_PATH,
+      BBS_BBS_DP,
+      {
+        (UINT8) (sizeof (BBS_BBS_DEVICE_PATH)),
+        (UINT8) ((sizeof (BBS_BBS_DEVICE_PATH)) >> 8),
+       } 
+    },
     BBS_TYPE_CDROM,
     0,
-    0
+    {0}
   },
   gEndEntire
 };
diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/Chipset_S.inc b/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/Chipset_S.inc
index 067ddf6c5..3d735fd81 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/Chipset_S.inc
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/Chipset_S.inc
@@ -1,17 +1,17 @@
-;; @file
-;  Chipset constants and macros.
-;
-;  Copyright (c) 2012 - 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
-;  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
-;
-;;
+# @file
+#  Chipset constants and macros.
+#
+#  Copyright (c) 2012 - 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
+#  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
+#
+#
 
 #
 # APIC register
@@ -92,6 +92,7 @@
 
 .equ R_PMC_MMIO_BAR0,               ((0x0D * 8 + 0x01) * 0x1000 + 0x0010 + CPU_HEC_BASE)  #BAR0 IO config register. B0:D13:F1 0x10
 .equ R_PMC_MMIO_BAR1,               ((0x0D * 8 + 0x01) * 0x1000 + 0x0018 + CPU_HEC_BASE)  #BAR1 IO config register. B0:D13:F1 0x18
+.equ R_PMC_MMIO_BAR1_OFFSET_4,      0x04 
 .equ SYRE_CPURST,                   14
 
 #
diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/Ia32_S.inc b/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/Ia32_S.inc
index 3279f074a..cad7daea9 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/Ia32_S.inc
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/Ia32_S.inc
@@ -1,17 +1,16 @@
-;; @file
-;  IA32 architecture MSRs.
-;
-;  Copyright (c) 1999 - 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
-;  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
-;
-;;
+# @file
+#  IA32 architecture MSRs.
+#
+#  Copyright (c) 1999 - 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
+#  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
+#
 
 .equ IA32_MTRR_CAP,                 0xFE
 .equ MTRR_PHYS_BASE_0,              0x200
diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/Platform_S.inc b/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/Platform_S.inc
index a50fc4aac..4bba49b6b 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/Platform_S.inc
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/Platform_S.inc
@@ -1,17 +1,17 @@
-;; @file
-;  Platform Specific Definitions.
-;
-;  Copyright (c) 2008 - 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
-;  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
-;
-;;
+# @file
+#  Platform Specific Definitions.
+#
+#  Copyright (c) 2008 - 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
+#  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
+#
+#
 
 #INCLUDE FlashMap.inc #ECP porting
 
diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/SecCore_S.inc b/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/SecCore_S.inc
index 3a9126fcb..def9014c2 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/SecCore_S.inc
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/SecCore_S.inc
@@ -1,17 +1,17 @@
-;; @file
-;  SecCore constants and macros.
-;
-;  Copyright (c) 1999 - 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
-;  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
-;
-;;
+# @file
+#  SecCore constants and macros.
+#
+#  Copyright (c) 1999 - 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
+#  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
+#
+#
 
 #
 # Set to 1 to enable debug
diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/SecEntry.S b/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/SecEntry.S
index 534c62c73..03467674b 100644
--- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/SecEntry.S
+++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecLib/Ia32/SecEntry.S
@@ -2,7 +2,7 @@
 #  This is the code that goes from real-mode to protected mode.
 #  It consumes the reset vector.
 #
-#  Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 1999 - 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
@@ -187,13 +187,13 @@ ASM_PFX (PlatformInitialization):
   movl    $R_PMC_MMIO_BAR0, %edi
   movl    $IPC1_BASE_ADDRESS, (%edi)
 
-  movl    $(R_PMC_MMIO_BAR0 + $4), %edi
+  movl    $(R_PMC_MMIO_BAR0 + R_PMC_MMIO_BAR1_OFFSET_4), %edi
   movl    $0x00, (%edi)
 
   movl    $R_PMC_MMIO_BAR1, %edi
   movl    $SSRAM_BASE_ADDRESS, (%edi)
 
-  movl    $( R_PMC_MMIO_BAR1 + $4), %edi
+  movl    $( R_PMC_MMIO_BAR1 + R_PMC_MMIO_BAR1_OFFSET_4), %edi
   movl    $0x00, (%edi)
   
   #
@@ -333,7 +333,7 @@ no_RTC_pwr_failure:
   outw    %ax, %dx
 
 .if 1
-  ; Do nothing
+  # Do nothing
 .else
   #
   # Clear the Second Timeout Status bit by writing 1
diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/Platform.c b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/Platform.c
index d27569a05..e5e9c9319 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/Platform.c
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/Platform.c
@@ -631,15 +631,15 @@ InitPlatformResolution (
   )
 {
   PANEL_RESOLUTION PanelResolution[] = {
-    0, 0,     0,     // Native Mode, Find the highest resolution which GOP supports.
-    1, 640,   480,
-    2, 800,   600,
-    3, 1024,  768,
-    4, 1280,  1024,
-    5, 1366,  768,
-    6, 1680,  1050,
-    7, 1920,  1200,
-    8, 1280,  800,
+    {0, 0,     0},     // Native Mode, Find the highest resolution which GOP supports.
+    {1, 640,   480},
+    {2, 800,   600},
+    {3, 1024,  768},
+    {4, 1280,  1024},
+    {5, 1366,  768},
+    {6, 1680,  1050},
+    {7, 1920,  1200},
+    {8, 1280,  800}
   };
 
   //
diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/PlatformDxe.h b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/PlatformDxe.h
index 843d912bc..1475c4cab 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/PlatformDxe.h
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/PlatformDxe.h
@@ -1,7 +1,7 @@
 /** @file
   Header file for Platform Initialization Driver.
 
-  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2015 - 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
@@ -69,7 +69,7 @@
 // Platform driver GUID
 //
 #define EFI_PLATFORM_DRIVER_GUID \
-  { 0x056E7324, 0xA718, 0x465b, 0x9A, 0x84, 0x22, 0x8F, 0x06, 0x64, 0x2B, 0x4F }
+  { 0x056E7324, 0xA718, 0x465b, {0x9A, 0x84, 0x22, 0x8F, 0x06, 0x64, 0x2B, 0x4F }}
 
 #define EFI_SECTION_STRING                  0x1C
 #define EFI_FORWARD_DECLARATION(x) typedef struct _##x x
diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.c b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.c
index 0853f8fbb..91334f9e7 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.c
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.c
@@ -21,7 +21,7 @@
 #include <Library/PcdLib.h>
 #include <Private/Library/CpuS3Lib.h>
 #include <Library/HeciMsgLib.h>
-#include <Ppi/SecUma.h>
+#include <Ppi/SeCUma.h>
 
 #ifdef __GNUC__
   #pragma GCC push_options
@@ -281,8 +281,8 @@ BXTPolicyInit (
 {
   VOID*                           Buffer;
   UINT32                          Size;
-  EFI_GUID                        PeiLogoGuid        = { 0x7BB28B99, 0x61BB, 0x11D5, 0x9A, 0x5D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D };
-  EFI_GUID                        TianmaVbtGuid      = { 0xE08CA6D5, 0x8D02, 0x43ae, 0xAB, 0xB1, 0x95, 0x2C, 0xC7, 0x87, 0xC9, 0x33 };
+  EFI_GUID                        PeiLogoGuid        = { 0x7BB28B99, 0x61BB, 0x11D5, {0x9A, 0x5D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D} };
+  EFI_GUID                        TianmaVbtGuid      = { 0xE08CA6D5, 0x8D02, 0x43ae, {0xAB, 0xB1, 0x95, 0x2C, 0xC7, 0x87, 0xC9, 0x33} };
   VBT_INFO                        VbtInfo;
 
 
@@ -307,7 +307,7 @@ BXTPolicyInit (
   //
   // Build the VBT data into HOB for DXE GOP
   //
-  VbtInfo.VbtAddress = (EFI_PHYSICAL_ADDRESS) Buffer;
+  VbtInfo.VbtAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)Buffer;
   VbtInfo.VbtSize = Size;
   DEBUG ((DEBUG_INFO, "VbtInfo VbtAddress is 0x%x\n", Buffer));
   DEBUG ((DEBUG_INFO, "VbtInfo VbtSize is 0x%x\n", Size));
diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c
index 854d737c2..630c2c1d1 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c
@@ -24,7 +24,7 @@
 #include <Ppi/TemporaryRamSupport.h>
 #include <Ppi/BlockIo.h>
 #include <Ppi/ReadOnlyVariable2.h>
-#include <Ppi/SecUma.h>
+#include <Ppi/SeCUma.h>
 #include <Ppi/FvLoadFile.h>
 #include <Ppi/Stall.h>
 #include <Ppi/MemoryDiscovered.h>
@@ -53,7 +53,7 @@
 #include <Library/MemoryAllocationLib.h>
 #include <Library/PerformanceLib.h>
 #include <Library/MtrrLib.h>
-#include <Library/I2cLib.h>
+#include <Library/I2CLib.h>
 #include <Library/PmicLib.h>
 #include <Library/PeiVariableCacheLib.h>
 #include <Library/PeiSiPolicyLib.h>
diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/PlatformSetupDxe.c b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/PlatformSetupDxe.c
index 5cbe13605..e6df76e8f 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/PlatformSetupDxe.c
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/PlatformSetupDxe.c
@@ -69,7 +69,7 @@ EFI_HANDLE            mImageHandle;
 // module global data
 //
 #define EFI_NORMAL_SETUP_GUID \
-  { 0xec87d643, 0xeba4, 0x4bb5, 0xa1, 0xe5, 0x3f, 0x3e, 0x36, 0xb2, 0xd, 0xa9 }
+  { 0xec87d643, 0xeba4, 0x4bb5, {0xa1, 0xe5, 0x3f, 0x3e, 0x36, 0xb2, 0xd, 0xa9} }
 
 EFI_GUID                     mNormalSetupGuid = EFI_NORMAL_SETUP_GUID;
 
diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/SetupInfoRecords.c b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/SetupInfoRecords.c
index 768893ea4..c3fd787c7 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/SetupInfoRecords.c
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/SetupInfoRecords.c
@@ -1101,7 +1101,7 @@ UpdatePlatformInformation (
   //
   // Update VBIOS version in Setup
   //
-  Status = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, &LegacyBios);
+  Status = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, (VOID **)&LegacyBios);
   if (!EFI_ERROR (Status)) {
     RegSet.X.AX = 0x5f01;
     Status = LegacyBios->Int86 (LegacyBios, 0x10, &RegSet);
diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Vfr.vfr b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Vfr.vfr
index 63d5e7f23..4b10a49bf 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Vfr.vfr
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Vfr.vfr
@@ -1,6 +1,6 @@
 // /** @file
 //
-//  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
@@ -115,7 +115,7 @@ formset
   #include "Thermal.vfi"
   #include "SystemComponent.vfi"
   #include "DebugConfig.vfi"
-  #include "AcpiSetup.Vfi"
-  #include "RTD3.Vfi"
+  #include "AcpiSetup.vfi"
+  #include "RtD3.vfi"
 
 endformset;
diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSmm/Platform.c b/Platform/BroxtonPlatformPkg/Common/PlatformSmm/Platform.c
index e0c6c7138..b0c96267d 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSmm/Platform.c
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSmm/Platform.c
@@ -124,6 +124,7 @@ CpuSmmSxWorkAround(
 
 **/
 EFI_STATUS
+EFIAPI
 InitializePlatformSmm (
   IN EFI_HANDLE        ImageHandle,
   IN EFI_SYSTEM_TABLE  *SystemTable
@@ -210,7 +211,7 @@ InitializePlatformSmm (
     PowerButtonContext.Phase = EfiPowerButtonEntry;
     Status = PowerButtonDispatch->Register(
                                     PowerButtonDispatch,
-                                    PowerButtonCallback,
+                                    (EFI_SMM_HANDLER_ENTRY_POINT2)PowerButtonCallback,
                                     &PowerButtonContext,
                                     &Handle
                                     );
@@ -235,7 +236,7 @@ InitializePlatformSmm (
 
   Status = SxDispatch->Register (
                          SxDispatch,
-                         SxSleepEntryCallBack,
+                         (EFI_SMM_HANDLER_ENTRY_POINT2)SxSleepEntryCallBack,
                          &EntryDispatchContext,
                          &Handle
                          );
@@ -244,7 +245,7 @@ InitializePlatformSmm (
 
   Status = SxDispatch->Register (
                          SxDispatch,
-                         S4S5CallBack,
+                         (EFI_SMM_HANDLER_ENTRY_POINT2)S4S5CallBack,
                          &EntryDispatchContext,
                          &Handle
                          );
@@ -254,7 +255,7 @@ InitializePlatformSmm (
 
   Status = SxDispatch->Register (
                          SxDispatch,
-                         S4S5CallBack,
+                         (EFI_SMM_HANDLER_ENTRY_POINT2)S4S5CallBack,
                          &EntryDispatchContext,
                          &Handle
                          );
@@ -262,7 +263,7 @@ InitializePlatformSmm (
 
   Status = SxDispatch->Register (
                          SxDispatch,
-                         S5SleepAcLossCallBack,
+                         (EFI_SMM_HANDLER_ENTRY_POINT2)S5SleepAcLossCallBack,
                          &EntryDispatchContext,
                          &Handle
                          );
@@ -284,7 +285,7 @@ InitializePlatformSmm (
   SwContext.SwSmiInputValue = ACPI_ENABLE;
   Status = SwDispatch->Register (
                          SwDispatch,
-                         EnableAcpiCallback,
+                         (EFI_SMM_HANDLER_ENTRY_POINT2)EnableAcpiCallback,
                          &SwContext,
                          &Handle
                          );
@@ -296,7 +297,7 @@ InitializePlatformSmm (
   SwContext.SwSmiInputValue = ACPI_DISABLE;
   Status = SwDispatch->Register (
                          SwDispatch,
-                         DisableAcpiCallback,
+                         (EFI_SMM_HANDLER_ENTRY_POINT2)DisableAcpiCallback,
                          &SwContext,
                          &Handle
                          );
@@ -309,7 +310,7 @@ InitializePlatformSmm (
 
   Status = SwDispatch->Register (
                          SwDispatch,
-                         TpmPtsSmbsCallback,
+                         (EFI_SMM_HANDLER_ENTRY_POINT2)TpmPtsSmbsCallback,
                          &SwContext,
                          &Handle
                          );
@@ -344,7 +345,7 @@ InitializePlatformSmm (
     IchnContext.Type = mTco1Sources[Index];
     Status = IchnDispatch->Register(
                              IchnDispatch,
-                             DummyTco1Callback,
+                             (EFI_SMM_ICHN_DISPATCH)DummyTco1Callback,
                              &IchnContext,
                              &Handle
                              );
diff --git a/Platform/BroxtonPlatformPkg/Common/PnpDxe/AunitBiosSettings.h b/Platform/BroxtonPlatformPkg/Common/PnpDxe/AunitBiosSettings.h
index 1aa293442..a4bb16a9b 100644
--- a/Platform/BroxtonPlatformPkg/Common/PnpDxe/AunitBiosSettings.h
+++ b/Platform/BroxtonPlatformPkg/Common/PnpDxe/AunitBiosSettings.h
@@ -1,5 +1,5 @@
 /** @file
-  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2015 - 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
@@ -16,128 +16,128 @@
 
 #define AUNIT_VALUEFORPERF_MSG_VALUES_PLATFORM_DEFAULT \
 \
-    0x4d, 0x6430,   7,   0, 0x1,   \
-    0x4d, 0x6430,  15,   8, 0x1,   \
-    0x4d, 0x6430,  23,  16, 0x0,   \
-    0x4d, 0x6430,  31,  24, 0x1,   \
-    0x4d, 0x6434,   7,   0, 0x0,   \
-    0x4d, 0x6434,  15,   8, 0x1,   \
-    0x4d, 0x6434,  23,  16, 0x1,   \
-    0x4d, 0x6434,  31,  24, 0x1,   \
-    0x4d, 0x6438,   7,   0, 0x1,   \
-    0x4d, 0x6438,  15,   8, 0x1,   \
-    0x4d, 0x6438,  23,  16, 0x1,   \
-    0x4d, 0x6438,  31,  24, 0x1,   \
-    0x4d, 0x643c,   7,   0, 0x1,   \
-    0x4d, 0x643c,  15,   8, 0x1,   \
-    0x4d, 0x643c,  23,  16, 0x1,   \
-    0x4d, 0x643c,  31,  24, 0x1,   \
-    0x4d, 0x6440,   7,   0, 0x1,   \
-    0x4d, 0x6440,  15,   8, 0x1,   \
-    0x4d, 0x6440,  23,  16, 0x0,   \
-    0x4d, 0x6440,  31,  24, 0x0,   \
-    0x4d, 0x6444,   7,   0, 0x1,   \
-    0x4d, 0x6444,  15,   8, 0x1,   \
-    0x4d, 0x6444,  23,  16, 0x1,   \
-    0x4d, 0x6448,   7,   0, 0x8,   \
-    0x4d, 0x6448,  15,   8, 0xff,   \
-    0x4d, 0x6448,  23,  16, 0xff,   \
-    0x4d, 0x6448,  31,  24, 0xff,   \
-    0x4d, 0x644c,   7,   0, 0xff,   \
-    0x4d, 0x644c,  15,   8, 0xff,   \
-    0x4d, 0x644c,  23,  16, 0xff,   \
-    0x4d, 0x644c,  31,  24, 0xff,   \
-    0x4d, 0x6450,   0,   0, 0x0,   \
-    0x4d, 0x6450,   1,   1, 0x0,   \
-    0x4d, 0x6450,   3,   2, 0x2,   \
-    0x4d, 0x6450,  19,   6, 0x9,   \
-    0x4d, 0x6450,  51,  38, 0x36,   \
-    0x4d, 0x6484,   7,   0, 0xff,   \
-    0x4d, 0x6484,  23,  16, 0xff  \
+    {0x4d, 0x6430,   7,   0, 0x1},   \
+    {0x4d, 0x6430,  15,   8, 0x1},   \
+    {0x4d, 0x6430,  23,  16, 0x0},   \
+    {0x4d, 0x6430,  31,  24, 0x1},   \
+    {0x4d, 0x6434,   7,   0, 0x0},   \
+    {0x4d, 0x6434,  15,   8, 0x1},   \
+    {0x4d, 0x6434,  23,  16, 0x1},   \
+    {0x4d, 0x6434,  31,  24, 0x1},   \
+    {0x4d, 0x6438,   7,   0, 0x1},   \
+    {0x4d, 0x6438,  15,   8, 0x1},   \
+    {0x4d, 0x6438,  23,  16, 0x1},   \
+    {0x4d, 0x6438,  31,  24, 0x1},   \
+    {0x4d, 0x643c,   7,   0, 0x1},   \
+    {0x4d, 0x643c,  15,   8, 0x1},   \
+    {0x4d, 0x643c,  23,  16, 0x1},   \
+    {0x4d, 0x643c,  31,  24, 0x1},   \
+    {0x4d, 0x6440,   7,   0, 0x1},   \
+    {0x4d, 0x6440,  15,   8, 0x1},   \
+    {0x4d, 0x6440,  23,  16, 0x0},   \
+    {0x4d, 0x6440,  31,  24, 0x0},   \
+    {0x4d, 0x6444,   7,   0, 0x1},   \
+    {0x4d, 0x6444,  15,   8, 0x1},   \
+    {0x4d, 0x6444,  23,  16, 0x1},   \
+    {0x4d, 0x6448,   7,   0, 0x8},   \
+    {0x4d, 0x6448,  15,   8, 0xff},   \
+    {0x4d, 0x6448,  23,  16, 0xff},   \
+    {0x4d, 0x6448,  31,  24, 0xff},   \
+    {0x4d, 0x644c,   7,   0, 0xff},   \
+    {0x4d, 0x644c,  15,   8, 0xff},   \
+    {0x4d, 0x644c,  23,  16, 0xff},   \
+    {0x4d, 0x644c,  31,  24, 0xff},   \
+    {0x4d, 0x6450,   0,   0, 0x0},   \
+    {0x4d, 0x6450,   1,   1, 0x0},   \
+    {0x4d, 0x6450,   3,   2, 0x2},   \
+    {0x4d, 0x6450,  19,   6, 0x9},   \
+    {0x4d, 0x6450,  51,  38, 0x36},   \
+    {0x4d, 0x6484,   7,   0, 0xff},   \
+    {0x4d, 0x6484,  23,  16, 0xff}  \
 
 
 #define AUNIT_VALUEFORPOWER_MSG_VALUES_PLATFORM_DEFAULT \
  \
-    0x4d, 0x6430,   7,   0, 0x1,   \
-    0x4d, 0x6430,  15,   8, 0x1,   \
-    0x4d, 0x6430,  23,  16, 0x0,   \
-    0x4d, 0x6430,  31,  24, 0x1,   \
-    0x4d, 0x6434,   7,   0, 0x0,   \
-    0x4d, 0x6434,  15,   8, 0x1,   \
-    0x4d, 0x6434,  23,  16, 0x1,   \
-    0x4d, 0x6434,  31,  24, 0x1,   \
-    0x4d, 0x6438,   7,   0, 0x1,   \
-    0x4d, 0x6438,  15,   8, 0x1,   \
-    0x4d, 0x6438,  23,  16, 0x1,   \
-    0x4d, 0x6438,  31,  24, 0x1,   \
-    0x4d, 0x643c,   7,   0, 0x1,   \
-    0x4d, 0x643c,  15,   8, 0x1,   \
-    0x4d, 0x643c,  23,  16, 0x1,   \
-    0x4d, 0x643c,  31,  24, 0x1,   \
-    0x4d, 0x6440,   7,   0, 0x1,   \
-    0x4d, 0x6440,  15,   8, 0x1,   \
-    0x4d, 0x6440,  23,  16, 0x0,   \
-    0x4d, 0x6440,  31,  24, 0x0,   \
-    0x4d, 0x6444,   7,   0, 0x1,   \
-    0x4d, 0x6444,  15,   8, 0x1,   \
-    0x4d, 0x6444,  23,  16, 0x1,   \
-    0x4d, 0x6448,   7,   0, 0x8,   \
-    0x4d, 0x6448,  15,   8, 0xff,   \
-    0x4d, 0x6448,  23,  16, 0xff,   \
-    0x4d, 0x6448,  31,  24, 0xff,   \
-    0x4d, 0x644c,   7,   0, 0xff,   \
-    0x4d, 0x644c,  15,   8, 0xff,   \
-    0x4d, 0x644c,  23,  16, 0xff,   \
-    0x4d, 0x644c,  31,  24, 0xff,   \
-    0x4d, 0x6450,   0,   0, 0x0,   \
-    0x4d, 0x6450,   1,   1, 0x0,   \
-    0x4d, 0x6450,   3,   2, 0x2,   \
-    0x4d, 0x6450,  19,   6, 0x9,   \
-    0x4d, 0x6450,  51,  38, 0x36,   \
-    0x4d, 0x6484,   7,   0, 0xff,   \
-    0x4d, 0x6484,  23,  16, 0xff  \
+    {0x4d, 0x6430,   7,   0, 0x1},   \
+    {0x4d, 0x6430,  15,   8, 0x1},   \
+    {0x4d, 0x6430,  23,  16, 0x0},   \
+    {0x4d, 0x6430,  31,  24, 0x1},   \
+    {0x4d, 0x6434,   7,   0, 0x0},   \
+    {0x4d, 0x6434,  15,   8, 0x1},   \
+    {0x4d, 0x6434,  23,  16, 0x1},   \
+    {0x4d, 0x6434,  31,  24, 0x1},   \
+    {0x4d, 0x6438,   7,   0, 0x1},   \
+    {0x4d, 0x6438,  15,   8, 0x1},   \
+    {0x4d, 0x6438,  23,  16, 0x1},   \
+    {0x4d, 0x6438,  31,  24, 0x1},   \
+    {0x4d, 0x643c,   7,   0, 0x1},   \
+    {0x4d, 0x643c,  15,   8, 0x1},   \
+    {0x4d, 0x643c,  23,  16, 0x1},   \
+    {0x4d, 0x643c,  31,  24, 0x1},   \
+    {0x4d, 0x6440,   7,   0, 0x1},   \
+    {0x4d, 0x6440,  15,   8, 0x1},   \
+    {0x4d, 0x6440,  23,  16, 0x0},   \
+    {0x4d, 0x6440,  31,  24, 0x0},   \
+    {0x4d, 0x6444,   7,   0, 0x1},   \
+    {0x4d, 0x6444,  15,   8, 0x1},   \
+    {0x4d, 0x6444,  23,  16, 0x1},   \
+    {0x4d, 0x6448,   7,   0, 0x8},   \
+    {0x4d, 0x6448,  15,   8, 0xff},   \
+    {0x4d, 0x6448,  23,  16, 0xff},   \
+    {0x4d, 0x6448,  31,  24, 0xff},   \
+    {0x4d, 0x644c,   7,   0, 0xff},   \
+    {0x4d, 0x644c,  15,   8, 0xff},   \
+    {0x4d, 0x644c,  23,  16, 0xff},   \
+    {0x4d, 0x644c,  31,  24, 0xff},   \
+    {0x4d, 0x6450,   0,   0, 0x0},   \
+    {0x4d, 0x6450,   1,   1, 0x0},   \
+    {0x4d, 0x6450,   3,   2, 0x2},   \
+    {0x4d, 0x6450,  19,   6, 0x9},   \
+    {0x4d, 0x6450,  51,  38, 0x36},   \
+    {0x4d, 0x6484,   7,   0, 0xff},   \
+    {0x4d, 0x6484,  23,  16, 0xff}  \
 
 
 #define AUNIT_VALUEFORPWRPERF_MSG_VALUES_PLATFORM_DEFAULT \
  \
-    0x4d, 0x6430,   7,   0, 0x1,   \
-    0x4d, 0x6430,  15,   8, 0x1,   \
-    0x4d, 0x6430,  23,  16, 0x0,   \
-    0x4d, 0x6430,  31,  24, 0x1,   \
-    0x4d, 0x6434,   7,   0, 0x0,   \
-    0x4d, 0x6434,  15,   8, 0x1,   \
-    0x4d, 0x6434,  23,  16, 0x1,   \
-    0x4d, 0x6434,  31,  24, 0x1,   \
-    0x4d, 0x6438,   7,   0, 0x1,   \
-    0x4d, 0x6438,  15,   8, 0x1,   \
-    0x4d, 0x6438,  23,  16, 0x1,   \
-    0x4d, 0x6438,  31,  24, 0x1,   \
-    0x4d, 0x643c,   7,   0, 0x1,   \
-    0x4d, 0x643c,  15,   8, 0x1,   \
-    0x4d, 0x643c,  23,  16, 0x1,   \
-    0x4d, 0x643c,  31,  24, 0x1,   \
-    0x4d, 0x6440,   7,   0, 0x1,   \
-    0x4d, 0x6440,  15,   8, 0x1,   \
-    0x4d, 0x6440,  23,  16, 0x0,   \
-    0x4d, 0x6440,  31,  24, 0x0,   \
-    0x4d, 0x6444,   7,   0, 0x1,   \
-    0x4d, 0x6444,  15,   8, 0x1,   \
-    0x4d, 0x6444,  23,  16, 0x1,   \
-    0x4d, 0x6448,   7,   0, 0x8,   \
-    0x4d, 0x6448,  15,   8, 0xff,   \
-    0x4d, 0x6448,  23,  16, 0xff,   \
-    0x4d, 0x6448,  31,  24, 0xff,   \
-    0x4d, 0x644c,   7,   0, 0xff,   \
-    0x4d, 0x644c,  15,   8, 0xff,   \
-    0x4d, 0x644c,  23,  16, 0xff,   \
-    0x4d, 0x644c,  31,  24, 0xff,   \
-    0x4d, 0x6450,   0,   0, 0x0,   \
-    0x4d, 0x6450,   1,   1, 0x0,   \
-    0x4d, 0x6450,   3,   2, 0x2,   \
-    0x4d, 0x6450,  19,   6, 0x9,   \
-    0x4d, 0x6450,  51,  38, 0x36,   \
-    0x4d, 0x6484,   7,   0, 0xff,   \
-    0x4d, 0x6484,  23,  16, 0xff  \
+    {0x4d, 0x6430,   7,   0, 0x1},   \
+    {0x4d, 0x6430,  15,   8, 0x1},   \
+    {0x4d, 0x6430,  23,  16, 0x0},   \
+    {0x4d, 0x6430,  31,  24, 0x1},   \
+    {0x4d, 0x6434,   7,   0, 0x0},   \
+    {0x4d, 0x6434,  15,   8, 0x1},   \
+    {0x4d, 0x6434,  23,  16, 0x1},   \
+    {0x4d, 0x6434,  31,  24, 0x1},   \
+    {0x4d, 0x6438,   7,   0, 0x1},   \
+    {0x4d, 0x6438,  15,   8, 0x1},   \
+    {0x4d, 0x6438,  23,  16, 0x1},   \
+    {0x4d, 0x6438,  31,  24, 0x1},   \
+    {0x4d, 0x643c,   7,   0, 0x1},   \
+    {0x4d, 0x643c,  15,   8, 0x1},   \
+    {0x4d, 0x643c,  23,  16, 0x1},   \
+    {0x4d, 0x643c,  31,  24, 0x1},   \
+    {0x4d, 0x6440,   7,   0, 0x1},   \
+    {0x4d, 0x6440,  15,   8, 0x1},   \
+    {0x4d, 0x6440,  23,  16, 0x0},   \
+    {0x4d, 0x6440,  31,  24, 0x0},   \
+    {0x4d, 0x6444,   7,   0, 0x1},   \
+    {0x4d, 0x6444,  15,   8, 0x1},   \
+    {0x4d, 0x6444,  23,  16, 0x1},   \
+    {0x4d, 0x6448,   7,   0, 0x8},   \
+    {0x4d, 0x6448,  15,   8, 0xff},   \
+    {0x4d, 0x6448,  23,  16, 0xff},   \
+    {0x4d, 0x6448,  31,  24, 0xff},   \
+    {0x4d, 0x644c,   7,   0, 0xff},   \
+    {0x4d, 0x644c,  15,   8, 0xff},   \
+    {0x4d, 0x644c,  23,  16, 0xff},   \
+    {0x4d, 0x644c,  31,  24, 0xff},   \
+    {0x4d, 0x6450,   0,   0, 0x0},   \
+    {0x4d, 0x6450,   1,   1, 0x0},   \
+    {0x4d, 0x6450,   3,   2, 0x2},   \
+    {0x4d, 0x6450,  19,   6, 0x9},   \
+    {0x4d, 0x6450,  51,  38, 0x36},   \
+    {0x4d, 0x6484,   7,   0, 0xff},   \
+    {0x4d, 0x6484,  23,  16, 0xff}  \
 
 
 #endif // AUNIT_BIOS_SETTINGS_HH
diff --git a/Platform/BroxtonPlatformPkg/Common/PnpDxe/BunitBiosSettings.h b/Platform/BroxtonPlatformPkg/Common/PnpDxe/BunitBiosSettings.h
index fa41473a6..a88c5b2bb 100644
--- a/Platform/BroxtonPlatformPkg/Common/PnpDxe/BunitBiosSettings.h
+++ b/Platform/BroxtonPlatformPkg/Common/PnpDxe/BunitBiosSettings.h
@@ -1,5 +1,5 @@
 /** @file
-  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2015 - 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
@@ -16,116 +16,116 @@
 
 #define BUNIT_VALUEFORPERF_MSG_VALUES_PLATFORM_DEFAULT \
                                    \
-    0x4c, 0x6d4c,   5,   0, 0x8,   \
-    0x4c, 0x6d4c,  13,   8, 0x8,   \
-    0x4c, 0x6d4c,  21,  16, 0x8,   \
-    0x4c, 0x6d4c,  29,  24, 0x8,   \
-    0x4c, 0x6d50,   5,   0, 0x8,   \
-    0x4c, 0x6d50,  13,   8, 0x8,   \
-    0x4c, 0x6d50,  21,  16, 0x8,   \
-    0x4c, 0x6d50,  29,  24, 0x8,   \
-    0x4c, 0x6d54,   5,   0, 0x8,   \
-    0x4c, 0x6d54,  13,   8, 0x8,   \
-    0x4c, 0x6d54,  21,  16, 0x8,   \
-    0x4c, 0x6d54,  29,  24, 0x8,   \
-    0x4c, 0x6d58,   5,   0, 0x8,   \
-    0x4c, 0x6d58,  13,   8, 0x8,   \
-    0x4c, 0x6d58,  21,  16, 0x8,   \
-    0x4c, 0x6d58,  29,  24, 0x8,   \
-    0x4c, 0x6d5c,   5,   0, 0x8,   \
-    0x4c, 0x6d5c,  13,   8, 0x8,   \
-    0x4c, 0x6d5c,  21,  16, 0x8,   \
-    0x4c, 0x6d5c,  29,  24, 0x8,   \
-    0x4c, 0x6d60,   5,   0, 0x8,   \
-    0x4c, 0x6d60,  13,   8, 0x8,   \
-    0x4c, 0x6d60,  21,  16, 0x8,   \
-    0x4c, 0x6d60,  29,  24, 0x8,   \
-    0x4c, 0x6d64,   7,   0, 0x1b,   \
-    0x4c, 0x6d64,  15,   8, 0x0,   \
-    0x4c, 0x6d64,  31,  24, 0x27,   \
-    0x4c, 0x6d68,   5,   0, 0x1,   \
-    0x4c, 0x6d68,  13,   8, 0x1,   \
-    0x4c, 0x6d68,  31,  31, 0x0,   \
-    0x4c, 0x6d6c,   5,   0, 0xf,   \
-    0x4c, 0x6d6c,  13,   8, 0x3f,   \
-    0x4c, 0x6d6c,  31,  31, 0x1,   \
-    0x4c, 0x6d70,   0,   0, 0x0  \
+    {0x4c, 0x6d4c,   5,   0, 0x8},   \
+    {0x4c, 0x6d4c,  13,   8, 0x8},   \
+    {0x4c, 0x6d4c,  21,  16, 0x8},   \
+    {0x4c, 0x6d4c,  29,  24, 0x8},   \
+    {0x4c, 0x6d50,   5,   0, 0x8},   \
+    {0x4c, 0x6d50,  13,   8, 0x8},   \
+    {0x4c, 0x6d50,  21,  16, 0x8},   \
+    {0x4c, 0x6d50,  29,  24, 0x8},   \
+    {0x4c, 0x6d54,   5,   0, 0x8},   \
+    {0x4c, 0x6d54,  13,   8, 0x8},   \
+    {0x4c, 0x6d54,  21,  16, 0x8},   \
+    {0x4c, 0x6d54,  29,  24, 0x8},   \
+    {0x4c, 0x6d58,   5,   0, 0x8},   \
+    {0x4c, 0x6d58,  13,   8, 0x8},   \
+    {0x4c, 0x6d58,  21,  16, 0x8},   \
+    {0x4c, 0x6d58,  29,  24, 0x8},   \
+    {0x4c, 0x6d5c,   5,   0, 0x8},   \
+    {0x4c, 0x6d5c,  13,   8, 0x8},   \
+    {0x4c, 0x6d5c,  21,  16, 0x8},   \
+    {0x4c, 0x6d5c,  29,  24, 0x8},   \
+    {0x4c, 0x6d60,   5,   0, 0x8},   \
+    {0x4c, 0x6d60,  13,   8, 0x8},   \
+    {0x4c, 0x6d60,  21,  16, 0x8},   \
+    {0x4c, 0x6d60,  29,  24, 0x8},   \
+    {0x4c, 0x6d64,   7,   0, 0x1b},   \
+    {0x4c, 0x6d64,  15,   8, 0x0},   \
+    {0x4c, 0x6d64,  31,  24, 0x27},   \
+    {0x4c, 0x6d68,   5,   0, 0x1},   \
+    {0x4c, 0x6d68,  13,   8, 0x1},   \
+    {0x4c, 0x6d68,  31,  31, 0x0},   \
+    {0x4c, 0x6d6c,   5,   0, 0xf},   \
+    {0x4c, 0x6d6c,  13,   8, 0x3f},   \
+    {0x4c, 0x6d6c,  31,  31, 0x1},   \
+    {0x4c, 0x6d70,   0,   0, 0x0}  \
 
 
 #define BUNIT_VALUEFORPOWER_MSG_VALUES_PLATFORM_DEFAULT \
                                    \
-    0x4c, 0x6d4c,   5,   0, 0x4,   \
-    0x4c, 0x6d4c,  13,   8, 0x4,   \
-    0x4c, 0x6d4c,  21,  16, 0x4,   \
-    0x4c, 0x6d4c,  29,  24, 0x4,   \
-    0x4c, 0x6d50,   5,   0, 0x4,   \
-    0x4c, 0x6d50,  13,   8, 0x4,   \
-    0x4c, 0x6d50,  21,  16, 0x4,   \
-    0x4c, 0x6d50,  29,  24, 0x4,   \
-    0x4c, 0x6d54,   5,   0, 0x4,   \
-    0x4c, 0x6d54,  13,   8, 0x4,   \
-    0x4c, 0x6d54,  21,  16, 0x4,   \
-    0x4c, 0x6d54,  29,  24, 0x4,   \
-    0x4c, 0x6d58,   5,   0, 0x4,   \
-    0x4c, 0x6d58,  13,   8, 0x4,   \
-    0x4c, 0x6d58,  21,  16, 0x4,   \
-    0x4c, 0x6d58,  29,  24, 0x4,   \
-    0x4c, 0x6d5c,   5,   0, 0x4,   \
-    0x4c, 0x6d5c,  13,   8, 0x4,   \
-    0x4c, 0x6d5c,  21,  16, 0x4,   \
-    0x4c, 0x6d5c,  29,  24, 0x4,   \
-    0x4c, 0x6d60,   5,   0, 0x4,   \
-    0x4c, 0x6d60,  13,   8, 0x4,   \
-    0x4c, 0x6d60,  21,  16, 0x4,   \
-    0x4c, 0x6d60,  29,  24, 0x4,   \
-    0x4c, 0x6d64,   7,   0, 0x0,   \
-    0x4c, 0x6d64,  15,   8, 0x0,   \
-    0x4c, 0x6d64,  31,  24, 0x0,   \
-    0x4c, 0x6d68,   5,   0, 0x0,   \
-    0x4c, 0x6d68,  13,   8, 0x0,   \
-    0x4c, 0x6d68,  31,  31, 0x0,   \
-    0x4c, 0x6d6c,   5,   0, 0x0,   \
-    0x4c, 0x6d6c,  13,   8, 0x0,   \
-    0x4c, 0x6d6c,  31,  31, 0x0,   \
-    0x4c, 0x6d70,   0,   0, 0x0  \
+    {0x4c, 0x6d4c,   5,   0, 0x4},   \
+    {0x4c, 0x6d4c,  13,   8, 0x4},   \
+    {0x4c, 0x6d4c,  21,  16, 0x4},   \
+    {0x4c, 0x6d4c,  29,  24, 0x4},   \
+    {0x4c, 0x6d50,   5,   0, 0x4},   \
+    {0x4c, 0x6d50,  13,   8, 0x4},   \
+    {0x4c, 0x6d50,  21,  16, 0x4},   \
+    {0x4c, 0x6d50,  29,  24, 0x4},   \
+    {0x4c, 0x6d54,   5,   0, 0x4},   \
+    {0x4c, 0x6d54,  13,   8, 0x4},   \
+    {0x4c, 0x6d54,  21,  16, 0x4},   \
+    {0x4c, 0x6d54,  29,  24, 0x4},   \
+    {0x4c, 0x6d58,   5,   0, 0x4},   \
+    {0x4c, 0x6d58,  13,   8, 0x4},   \
+    {0x4c, 0x6d58,  21,  16, 0x4},   \
+    {0x4c, 0x6d58,  29,  24, 0x4},   \
+    {0x4c, 0x6d5c,   5,   0, 0x4},   \
+    {0x4c, 0x6d5c,  13,   8, 0x4},   \
+    {0x4c, 0x6d5c,  21,  16, 0x4},   \
+    {0x4c, 0x6d5c,  29,  24, 0x4},   \
+    {0x4c, 0x6d60,   5,   0, 0x4},   \
+    {0x4c, 0x6d60,  13,   8, 0x4},   \
+    {0x4c, 0x6d60,  21,  16, 0x4},   \
+    {0x4c, 0x6d60,  29,  24, 0x4},   \
+    {0x4c, 0x6d64,   7,   0, 0x0},   \
+    {0x4c, 0x6d64,  15,   8, 0x0},   \
+    {0x4c, 0x6d64,  31,  24, 0x0},   \
+    {0x4c, 0x6d68,   5,   0, 0x0},   \
+    {0x4c, 0x6d68,  13,   8, 0x0},   \
+    {0x4c, 0x6d68,  31,  31, 0x0},   \
+    {0x4c, 0x6d6c,   5,   0, 0x0},   \
+    {0x4c, 0x6d6c,  13,   8, 0x0},   \
+    {0x4c, 0x6d6c,  31,  31, 0x0},   \
+    {0x4c, 0x6d70,   0,   0, 0x0}  \
 
 
 #define BUNIT_VALUEFORPWRPERF_MSG_VALUES_PLATFORM_DEFAULT \
                                    \
-    0x4c, 0x6d4c,   5,   0, 0x4,   \
-    0x4c, 0x6d4c,  13,   8, 0x4,   \
-    0x4c, 0x6d4c,  21,  16, 0x4,   \
-    0x4c, 0x6d4c,  29,  24, 0x4,   \
-    0x4c, 0x6d50,   5,   0, 0x4,   \
-    0x4c, 0x6d50,  13,   8, 0x4,   \
-    0x4c, 0x6d50,  21,  16, 0x4,   \
-    0x4c, 0x6d50,  29,  24, 0x4,   \
-    0x4c, 0x6d54,   5,   0, 0x4,   \
-    0x4c, 0x6d54,  13,   8, 0x4,   \
-    0x4c, 0x6d54,  21,  16, 0x4,   \
-    0x4c, 0x6d54,  29,  24, 0x4,   \
-    0x4c, 0x6d58,   5,   0, 0x4,   \
-    0x4c, 0x6d58,  13,   8, 0x4,   \
-    0x4c, 0x6d58,  21,  16, 0x4,   \
-    0x4c, 0x6d58,  29,  24, 0x4,   \
-    0x4c, 0x6d5c,   5,   0, 0x4,   \
-    0x4c, 0x6d5c,  13,   8, 0x4,   \
-    0x4c, 0x6d5c,  21,  16, 0x4,   \
-    0x4c, 0x6d5c,  29,  24, 0x4,   \
-    0x4c, 0x6d60,   5,   0, 0x4,   \
-    0x4c, 0x6d60,  13,   8, 0x4,   \
-    0x4c, 0x6d60,  21,  16, 0x4,   \
-    0x4c, 0x6d60,  29,  24, 0x4,   \
-    0x4c, 0x6d64,   7,   0, 0x0,   \
-    0x4c, 0x6d64,  15,   8, 0x0,   \
-    0x4c, 0x6d64,  31,  24, 0x0,   \
-    0x4c, 0x6d68,   5,   0, 0x0,   \
-    0x4c, 0x6d68,  13,   8, 0x0,   \
-    0x4c, 0x6d68,  31,  31, 0x0,   \
-    0x4c, 0x6d6c,   5,   0, 0x0,   \
-    0x4c, 0x6d6c,  13,   8, 0x0,   \
-    0x4c, 0x6d6c,  31,  31, 0x0,   \
-    0x4c, 0x6d70,   0,   0, 0x0  \
+    {0x4c, 0x6d4c,   5,   0, 0x4},   \
+    {0x4c, 0x6d4c,  13,   8, 0x4},   \
+    {0x4c, 0x6d4c,  21,  16, 0x4},   \
+    {0x4c, 0x6d4c,  29,  24, 0x4},   \
+    {0x4c, 0x6d50,   5,   0, 0x4},   \
+    {0x4c, 0x6d50,  13,   8, 0x4},   \
+    {0x4c, 0x6d50,  21,  16, 0x4},   \
+    {0x4c, 0x6d50,  29,  24, 0x4},   \
+    {0x4c, 0x6d54,   5,   0, 0x4},   \
+    {0x4c, 0x6d54,  13,   8, 0x4},   \
+    {0x4c, 0x6d54,  21,  16, 0x4},   \
+    {0x4c, 0x6d54,  29,  24, 0x4},   \
+    {0x4c, 0x6d58,   5,   0, 0x4},   \
+    {0x4c, 0x6d58,  13,   8, 0x4},   \
+    {0x4c, 0x6d58,  21,  16, 0x4},   \
+    {0x4c, 0x6d58,  29,  24, 0x4},   \
+    {0x4c, 0x6d5c,   5,   0, 0x4},   \
+    {0x4c, 0x6d5c,  13,   8, 0x4},   \
+    {0x4c, 0x6d5c,  21,  16, 0x4},   \
+    {0x4c, 0x6d5c,  29,  24, 0x4},   \
+    {0x4c, 0x6d60,   5,   0, 0x4},   \
+    {0x4c, 0x6d60,  13,   8, 0x4},   \
+    {0x4c, 0x6d60,  21,  16, 0x4},   \
+    {0x4c, 0x6d60,  29,  24, 0x4},   \
+    {0x4c, 0x6d64,   7,   0, 0x0},   \
+    {0x4c, 0x6d64,  15,   8, 0x0},   \
+    {0x4c, 0x6d64,  31,  24, 0x0},   \
+    {0x4c, 0x6d68,   5,   0, 0x0},   \
+    {0x4c, 0x6d68,  13,   8, 0x0},   \
+    {0x4c, 0x6d68,  31,  31, 0x0},   \
+    {0x4c, 0x6d6c,   5,   0, 0x0},   \
+    {0x4c, 0x6d6c,  13,   8, 0x0},   \
+    {0x4c, 0x6d6c,  31,  31, 0x0},   \
+    {0x4c, 0x6d70,   0,   0, 0x0}  \
 
 
 #endif // BUNIT_BIOS_SETTINGS_HH
diff --git a/Platform/BroxtonPlatformPkg/Common/PnpDxe/TunitBiosSettings.h b/Platform/BroxtonPlatformPkg/Common/PnpDxe/TunitBiosSettings.h
index 1b69f623b..67273e38a 100644
--- a/Platform/BroxtonPlatformPkg/Common/PnpDxe/TunitBiosSettings.h
+++ b/Platform/BroxtonPlatformPkg/Common/PnpDxe/TunitBiosSettings.h
@@ -1,5 +1,5 @@
 /** @file
-  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2015 - 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
@@ -16,152 +16,152 @@
 
 #define TUNIT_VALUEFORPERF_MSG_VALUES_PLATFORM_DEFAULT \
   \
-    0x52, 0x7810,   0,   0, 0x0,   \
-    0x52, 0x7810,   1,   1, 0x0,   \
-    0x52, 0x7810,   2,   2, 0x0,   \
-    0x52, 0x7810,   3,   3, 0x0,   \
-    0x52, 0x7810,   7,   7, 0x0,   \
-    0x52, 0x7810,  18,  18, 0x0,   \
-    0x52, 0x7810,  19,  19, 0x0,   \
-    0x52, 0x7810,  20,  20, 0x0,   \
-    0x52, 0x781c,   0,   0, 0x1,   \
-    0x52, 0x781c,   1,   1, 0x1,   \
-    0x52, 0x781c,   2,   2, 0x0,   \
-    0x52, 0x781c,   3,   3, 0x0,   \
-    0x52, 0x781c,   4,   4, 0x1,   \
-    0x52, 0x781c,   5,   5, 0x1,   \
-    0x52, 0x781c,   6,   6, 0x1,   \
-    0x52, 0x781c,   7,   7, 0x1,   \
-    0x52, 0x7820,   0,   0, 0x1,   \
-    0x52, 0x7820,   1,   1, 0x1,   \
-    0x52, 0x7820,   2,   2, 0x0,   \
-    0x52, 0x7820,   3,   3, 0x0,   \
-    0x52, 0x7820,   4,   4, 0x1,   \
-    0x52, 0x7820,   5,   5, 0x1,   \
-    0x52, 0x7820,   6,   6, 0x1,   \
-    0x52, 0x7820,   7,   7, 0x1,   \
-    0x52, 0x523c,   0,   0, 0x0,   \
-    0x52, 0x523c,   2,   2, 0x0,   \
-    0x52, 0x523c,   3,   3, 0x0,   \
-    0x52, 0x523c,  18,  18, 0x0,   \
-    0x52, 0x523c,  19,  19, 0x0,   \
-    0x52, 0x523c,  20,  20, 0x0,   \
-    0x52, 0x5288,   0,   0, 0x1,   \
-    0x52, 0x5288,   1,   1, 0x1,   \
-    0x52, 0x5288,   2,   2, 0x0,   \
-    0x52, 0x5288,   3,   3, 0x0,   \
-    0x52, 0x5288,   4,   4, 0x1,   \
-    0x52, 0x5288,   5,   5, 0x1,   \
-    0x52, 0x5288,   6,   6, 0x1,   \
-    0x52, 0x5288,   7,   7, 0x1,   \
-    0x52, 0x528c,   0,   0, 0x1,   \
-    0x52, 0x528c,   1,   1, 0x1,   \
-    0x52, 0x528c,   2,   2, 0x0,   \
-    0x52, 0x528c,   3,   3, 0x0,   \
-    0x52, 0x528c,   4,   4, 0x1,   \
-    0x52, 0x528c,   5,   5, 0x1,   \
-    0x52, 0x528c,   6,   6, 0x1,   \
-    0x52, 0x528c,   7,   7, 0x1  \
+    {0x52, 0x7810,   0,   0, 0x0},   \
+    {0x52, 0x7810,   1,   1, 0x0},   \
+    {0x52, 0x7810,   2,   2, 0x0},   \
+    {0x52, 0x7810,   3,   3, 0x0},   \
+    {0x52, 0x7810,   7,   7, 0x0},   \
+    {0x52, 0x7810,  18,  18, 0x0},   \
+    {0x52, 0x7810,  19,  19, 0x0},   \
+    {0x52, 0x7810,  20,  20, 0x0},   \
+    {0x52, 0x781c,   0,   0, 0x1},   \
+    {0x52, 0x781c,   1,   1, 0x1},   \
+    {0x52, 0x781c,   2,   2, 0x0},   \
+    {0x52, 0x781c,   3,   3, 0x0},   \
+    {0x52, 0x781c,   4,   4, 0x1},   \
+    {0x52, 0x781c,   5,   5, 0x1},   \
+    {0x52, 0x781c,   6,   6, 0x1},   \
+    {0x52, 0x781c,   7,   7, 0x1},   \
+    {0x52, 0x7820,   0,   0, 0x1},   \
+    {0x52, 0x7820,   1,   1, 0x1},   \
+    {0x52, 0x7820,   2,   2, 0x0},   \
+    {0x52, 0x7820,   3,   3, 0x0},   \
+    {0x52, 0x7820,   4,   4, 0x1},   \
+    {0x52, 0x7820,   5,   5, 0x1},   \
+    {0x52, 0x7820,   6,   6, 0x1},   \
+    {0x52, 0x7820,   7,   7, 0x1},   \
+    {0x52, 0x523c,   0,   0, 0x0},   \
+    {0x52, 0x523c,   2,   2, 0x0},   \
+    {0x52, 0x523c,   3,   3, 0x0},   \
+    {0x52, 0x523c,  18,  18, 0x0},   \
+    {0x52, 0x523c,  19,  19, 0x0},   \
+    {0x52, 0x523c,  20,  20, 0x0},   \
+    {0x52, 0x5288,   0,   0, 0x1},   \
+    {0x52, 0x5288,   1,   1, 0x1},   \
+    {0x52, 0x5288,   2,   2, 0x0},   \
+    {0x52, 0x5288,   3,   3, 0x0},   \
+    {0x52, 0x5288,   4,   4, 0x1},   \
+    {0x52, 0x5288,   5,   5, 0x1},   \
+    {0x52, 0x5288,   6,   6, 0x1},   \
+    {0x52, 0x5288,   7,   7, 0x1},   \
+    {0x52, 0x528c,   0,   0, 0x1},   \
+    {0x52, 0x528c,   1,   1, 0x1},   \
+    {0x52, 0x528c,   2,   2, 0x0},   \
+    {0x52, 0x528c,   3,   3, 0x0},   \
+    {0x52, 0x528c,   4,   4, 0x1},   \
+    {0x52, 0x528c,   5,   5, 0x1},   \
+    {0x52, 0x528c,   6,   6, 0x1},   \
+    {0x52, 0x528c,   7,   7, 0x1}  \
 
 
 #define TUNIT_VALUEFORPOWER_MSG_VALUES_PLATFORM_DEFAULT \
   \
-    0x52, 0x7810,   0,   0, 0x0,   \
-    0x52, 0x7810,   1,   1, 0x0,   \
-    0x52, 0x7810,   2,   2, 0x0,   \
-    0x52, 0x7810,   3,   3, 0x0,   \
-    0x52, 0x7810,   7,   7, 0x0,   \
-    0x52, 0x7810,  18,  18, 0x0,   \
-    0x52, 0x7810,  19,  19, 0x0,   \
-    0x52, 0x7810,  20,  20, 0x0,   \
-    0x52, 0x781c,   0,   0, 0x1,   \
-    0x52, 0x781c,   1,   1, 0x1,   \
-    0x52, 0x781c,   2,   2, 0x0,   \
-    0x52, 0x781c,   3,   3, 0x0,   \
-    0x52, 0x781c,   4,   4, 0x1,   \
-    0x52, 0x781c,   5,   5, 0x1,   \
-    0x52, 0x781c,   6,   6, 0x1,   \
-    0x52, 0x781c,   7,   7, 0x1,   \
-    0x52, 0x7820,   0,   0, 0x1,   \
-    0x52, 0x7820,   1,   1, 0x1,   \
-    0x52, 0x7820,   2,   2, 0x0,   \
-    0x52, 0x7820,   3,   3, 0x0,   \
-    0x52, 0x7820,   4,   4, 0x1,   \
-    0x52, 0x7820,   5,   5, 0x1,   \
-    0x52, 0x7820,   6,   6, 0x1,   \
-    0x52, 0x7820,   7,   7, 0x1,   \
-    0x52, 0x523c,   0,   0, 0x0,   \
-    0x52, 0x523c,   2,   2, 0x0,   \
-    0x52, 0x523c,   3,   3, 0x0,   \
-    0x52, 0x523c,  18,  18, 0x0,   \
-    0x52, 0x523c,  19,  19, 0x0,   \
-    0x52, 0x523c,  20,  20, 0x0,   \
-    0x52, 0x5288,   0,   0, 0x1,   \
-    0x52, 0x5288,   1,   1, 0x1,   \
-    0x52, 0x5288,   2,   2, 0x0,   \
-    0x52, 0x5288,   3,   3, 0x0,   \
-    0x52, 0x5288,   4,   4, 0x1,   \
-    0x52, 0x5288,   5,   5, 0x1,   \
-    0x52, 0x5288,   6,   6, 0x1,   \
-    0x52, 0x5288,   7,   7, 0x1,   \
-    0x52, 0x528c,   0,   0, 0x1,   \
-    0x52, 0x528c,   1,   1, 0x1,   \
-    0x52, 0x528c,   2,   2, 0x0,   \
-    0x52, 0x528c,   3,   3, 0x0,   \
-    0x52, 0x528c,   4,   4, 0x1,   \
-    0x52, 0x528c,   5,   5, 0x1,   \
-    0x52, 0x528c,   6,   6, 0x1,   \
-    0x52, 0x528c,   7,   7, 0x1  \
+    {0x52, 0x7810,   0,   0, 0x0},   \
+    {0x52, 0x7810,   1,   1, 0x0},   \
+    {0x52, 0x7810,   2,   2, 0x0},   \
+    {0x52, 0x7810,   3,   3, 0x0},   \
+    {0x52, 0x7810,   7,   7, 0x0},   \
+    {0x52, 0x7810,  18,  18, 0x0},   \
+    {0x52, 0x7810,  19,  19, 0x0},   \
+    {0x52, 0x7810,  20,  20, 0x0},   \
+    {0x52, 0x781c,   0,   0, 0x1},   \
+    {0x52, 0x781c,   1,   1, 0x1},   \
+    {0x52, 0x781c,   2,   2, 0x0},   \
+    {0x52, 0x781c,   3,   3, 0x0},   \
+    {0x52, 0x781c,   4,   4, 0x1},   \
+    {0x52, 0x781c,   5,   5, 0x1},   \
+    {0x52, 0x781c,   6,   6, 0x1},   \
+    {0x52, 0x781c,   7,   7, 0x1},   \
+    {0x52, 0x7820,   0,   0, 0x1},   \
+    {0x52, 0x7820,   1,   1, 0x1},   \
+    {0x52, 0x7820,   2,   2, 0x0},   \
+    {0x52, 0x7820,   3,   3, 0x0},   \
+    {0x52, 0x7820,   4,   4, 0x1},   \
+    {0x52, 0x7820,   5,   5, 0x1},   \
+    {0x52, 0x7820,   6,   6, 0x1},   \
+    {0x52, 0x7820,   7,   7, 0x1},   \
+    {0x52, 0x523c,   0,   0, 0x0},   \
+    {0x52, 0x523c,   2,   2, 0x0},   \
+    {0x52, 0x523c,   3,   3, 0x0},   \
+    {0x52, 0x523c,  18,  18, 0x0},   \
+    {0x52, 0x523c,  19,  19, 0x0},   \
+    {0x52, 0x523c,  20,  20, 0x0},   \
+    {0x52, 0x5288,   0,   0, 0x1},   \
+    {0x52, 0x5288,   1,   1, 0x1},   \
+    {0x52, 0x5288,   2,   2, 0x0},   \
+    {0x52, 0x5288,   3,   3, 0x0},   \
+    {0x52, 0x5288,   4,   4, 0x1},   \
+    {0x52, 0x5288,   5,   5, 0x1},   \
+    {0x52, 0x5288,   6,   6, 0x1},   \
+    {0x52, 0x5288,   7,   7, 0x1},   \
+    {0x52, 0x528c,   0,   0, 0x1},   \
+    {0x52, 0x528c,   1,   1, 0x1},   \
+    {0x52, 0x528c,   2,   2, 0x0},   \
+    {0x52, 0x528c,   3,   3, 0x0},   \
+    {0x52, 0x528c,   4,   4, 0x1},   \
+    {0x52, 0x528c,   5,   5, 0x1},   \
+    {0x52, 0x528c,   6,   6, 0x1},   \
+    {0x52, 0x528c,   7,   7, 0x1}  \
 
 
 #define TUNIT_VALUEFORPWRPERF_MSG_VALUES_PLATFORM_DEFAULT \
   \
-    0x52, 0x7810,   0,   0, 0x0,   \
-    0x52, 0x7810,   1,   1, 0x0,   \
-    0x52, 0x7810,   2,   2, 0x0,   \
-    0x52, 0x7810,   3,   3, 0x0,   \
-    0x52, 0x7810,   7,   7, 0x0,   \
-    0x52, 0x7810,  18,  18, 0x0,   \
-    0x52, 0x7810,  19,  19, 0x0,   \
-    0x52, 0x7810,  20,  20, 0x0,   \
-    0x52, 0x781c,   0,   0, 0x1,   \
-    0x52, 0x781c,   1,   1, 0x1,   \
-    0x52, 0x781c,   2,   2, 0x0,   \
-    0x52, 0x781c,   3,   3, 0x0,   \
-    0x52, 0x781c,   4,   4, 0x1,   \
-    0x52, 0x781c,   5,   5, 0x1,   \
-    0x52, 0x781c,   6,   6, 0x1,   \
-    0x52, 0x781c,   7,   7, 0x1,   \
-    0x52, 0x7820,   0,   0, 0x1,   \
-    0x52, 0x7820,   1,   1, 0x1,   \
-    0x52, 0x7820,   2,   2, 0x0,   \
-    0x52, 0x7820,   3,   3, 0x0,   \
-    0x52, 0x7820,   4,   4, 0x1,   \
-    0x52, 0x7820,   5,   5, 0x1,   \
-    0x52, 0x7820,   6,   6, 0x1,   \
-    0x52, 0x7820,   7,   7, 0x1,   \
-    0x52, 0x523c,   0,   0, 0x0,   \
-    0x52, 0x523c,   2,   2, 0x0,   \
-    0x52, 0x523c,   3,   3, 0x0,   \
-    0x52, 0x523c,  18,  18, 0x0,   \
-    0x52, 0x523c,  19,  19, 0x0,   \
-    0x52, 0x523c,  20,  20, 0x0,   \
-    0x52, 0x5288,   0,   0, 0x1,   \
-    0x52, 0x5288,   1,   1, 0x1,   \
-    0x52, 0x5288,   2,   2, 0x0,   \
-    0x52, 0x5288,   3,   3, 0x0,   \
-    0x52, 0x5288,   4,   4, 0x1,   \
-    0x52, 0x5288,   5,   5, 0x1,   \
-    0x52, 0x5288,   6,   6, 0x1,   \
-    0x52, 0x5288,   7,   7, 0x1,   \
-    0x52, 0x528c,   0,   0, 0x1,   \
-    0x52, 0x528c,   1,   1, 0x1,   \
-    0x52, 0x528c,   2,   2, 0x0,   \
-    0x52, 0x528c,   3,   3, 0x0,   \
-    0x52, 0x528c,   4,   4, 0x1,   \
-    0x52, 0x528c,   5,   5, 0x1,   \
-    0x52, 0x528c,   6,   6, 0x1,   \
-    0x52, 0x528c,   7,   7, 0x1  \
+    {0x52, 0x7810,   0,   0, 0x0},   \
+    {0x52, 0x7810,   1,   1, 0x0},   \
+    {0x52, 0x7810,   2,   2, 0x0},   \
+    {0x52, 0x7810,   3,   3, 0x0},   \
+    {0x52, 0x7810,   7,   7, 0x0},   \
+    {0x52, 0x7810,  18,  18, 0x0},   \
+    {0x52, 0x7810,  19,  19, 0x0},   \
+    {0x52, 0x7810,  20,  20, 0x0},   \
+    {0x52, 0x781c,   0,   0, 0x1},   \
+    {0x52, 0x781c,   1,   1, 0x1},   \
+    {0x52, 0x781c,   2,   2, 0x0},   \
+    {0x52, 0x781c,   3,   3, 0x0},   \
+    {0x52, 0x781c,   4,   4, 0x1},   \
+    {0x52, 0x781c,   5,   5, 0x1},   \
+    {0x52, 0x781c,   6,   6, 0x1},   \
+    {0x52, 0x781c,   7,   7, 0x1},   \
+    {0x52, 0x7820,   0,   0, 0x1},   \
+    {0x52, 0x7820,   1,   1, 0x1},   \
+    {0x52, 0x7820,   2,   2, 0x0},   \
+    {0x52, 0x7820,   3,   3, 0x0},   \
+    {0x52, 0x7820,   4,   4, 0x1},   \
+    {0x52, 0x7820,   5,   5, 0x1},   \
+    {0x52, 0x7820,   6,   6, 0x1},   \
+    {0x52, 0x7820,   7,   7, 0x1},   \
+    {0x52, 0x523c,   0,   0, 0x0},   \
+    {0x52, 0x523c,   2,   2, 0x0},   \
+    {0x52, 0x523c,   3,   3, 0x0},   \
+    {0x52, 0x523c,  18,  18, 0x0},   \
+    {0x52, 0x523c,  19,  19, 0x0},   \
+    {0x52, 0x523c,  20,  20, 0x0},   \
+    {0x52, 0x5288,   0,   0, 0x1},   \
+    {0x52, 0x5288,   1,   1, 0x1},   \
+    {0x52, 0x5288,   2,   2, 0x0},   \
+    {0x52, 0x5288,   3,   3, 0x0},   \
+    {0x52, 0x5288,   4,   4, 0x1},   \
+    {0x52, 0x5288,   5,   5, 0x1},   \
+    {0x52, 0x5288,   6,   6, 0x1},   \
+    {0x52, 0x5288,   7,   7, 0x1},   \
+    {0x52, 0x528c,   0,   0, 0x1},   \
+    {0x52, 0x528c,   1,   1, 0x1},   \
+    {0x52, 0x528c,   2,   2, 0x0},   \
+    {0x52, 0x528c,   3,   3, 0x0},   \
+    {0x52, 0x528c,   4,   4, 0x1},   \
+    {0x52, 0x528c,   5,   5, 0x1},   \
+    {0x52, 0x528c,   6,   6, 0x1},   \
+    {0x52, 0x528c,   7,   7, 0x1}  \
 
 
 #endif // TUNIT_BIOS_SETTINGS_HH
diff --git a/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf b/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
index 9e5fa965c..334c8b02e 100644
--- a/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
+++ b/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
@@ -6,7 +6,7 @@
 #  register TemporaryRamDonePpi to call TempRamExit API, and register MemoryDiscoveredPpi
 #  notify to call FspSiliconInit API.
 #
-#  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2014 - 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
@@ -79,9 +79,9 @@
 
 [Sources]
   FspmWrapperPeim.c
-  ..\FspInitPei\SecMain.c
-  ..\FspInitPei\SecMain.h
-  ..\FspInitPei\FindPeiCore.c
+  ./../FspInitPei/SecMain.c
+  ./../FspInitPei/SecMain.h
+  ./../FspInitPei/FindPeiCore.c
 
 [Ppis]
   gTopOfTemporaryRamPpiGuid             ## PRODUCES
diff --git a/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf b/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
index cdb666d9d..6400f55c4 100644
--- a/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
+++ b/Platform/BroxtonPlatformPkg/Common/SampleCode/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
@@ -6,7 +6,7 @@
 #  register TemporaryRamDonePpi to call TempRamExit API, and register MemoryDiscoveredPpi
 #  notify to call FspSiliconInit API.
 #
-#  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2014 - 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
@@ -96,9 +96,9 @@
 
 [Sources]
   FspsWrapperPeim.c
-  ..\FspInitPei\SecMain.c
-  ..\FspInitPei\SecMain.h
-  ..\FspInitPei\FindPeiCore.c
+  ../FspInitPei/SecMain.c
+  ../FspInitPei/SecMain.h
+  ../FspInitPei/FindPeiCore.c
 
 [Depex]
   TRUE
diff --git a/Platform/BroxtonPlatformPkg/Common/SampleCode/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.c b/Platform/BroxtonPlatformPkg/Common/SampleCode/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.c
index b506f1347..00fe52cab 100644
--- a/Platform/BroxtonPlatformPkg/Common/SampleCode/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.c
+++ b/Platform/BroxtonPlatformPkg/Common/SampleCode/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.c
@@ -70,7 +70,7 @@ GetMemoryMap (
   Status = gBS->AllocatePool (
                   EfiBootServicesData,
                   *EfiMemoryMapSize,
-                  EfiMemoryMap
+                  (VOID **)EfiMemoryMap
                   );
   if (EFI_ERROR(Status)) {
     DEBUG ((EFI_D_ERROR, "Can not Allocate Memory\n"));
-- 
2.11.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel