BraswellPlatformPkg: Modified build script and dsc, fdf files

Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Guo Mang <mang.guo@intel.com> Reviewed-by: David Wei <david.wei@intel.com>
author: Guo Mang <mang.guo@intel.com> 2016-08-03 14:08:25 +0800
committer: Guo Mang <mang.guo@intel.com> 2016-08-04 10:33:52 +0800
commit: 603b6cea5e6b4a97f11dd342b10c9e6704605158 (patch)
tree: ac72faa0228ee453ee59b335dbd9387352388fd0
parent: 469318c61f7603dcea7d7f77d1c0d4862a8ec290 (diff)
download: edk2-platforms-603b6cea5e6b4a97f11dd342b10c9e6704605158.tar.xz
8 files changed, 526 insertions, 3106 deletions
diff --git a/BraswellPlatformPkg/BraswellPlatformPkg.dec b/BraswellPlatformPkg/BraswellPlatformPkg.dec
index aa01f4ffe9..0a16b909c6 100644
--- a/BraswellPlatformPkg/BraswellPlatformPkg.dec
+++ b/BraswellPlatformPkg/BraswellPlatformPkg.dec
@@ -23,11 +23,9 @@
 
 [Includes]
   .
-  Include
-  Include/Library
-  IntelSiliconBasic\Include
-  IntelSiliconBasic\Include\Library
-  IntelSiliconBasic\Library
+  Common\
+  Common\Include
+  Common\Include\Library
 
 [Ppis]
   gBoardDetectionStartPpiGuid  = { 0xa09b1a0c, 0x690c, 0x4d48, { 0xa8, 0x98, 0xa1, 0x2c, 0x94, 0x26, 0xd7, 0x6 }}
@@ -51,7 +49,6 @@
   gEfiEdkIIPlatformTokenSpaceGuid         = {0x27bed9ba, 0x661f, 0x4cad, {0xa4, 0x44, 0x59, 0x7f, 0x30, 0xa8, 0xf3, 0x68}}
   gEfiPlatformInfoGuid                    = { 0x1e2acc41, 0xe26a, 0x483d, { 0xaf, 0xc7, 0xa0, 0x56, 0xc3, 0x4e, 0x08, 0x7b }}
   gEfiIfrFrontPageGuid                    = { 0xe58809f8, 0xfbc1, 0x48e2, { 0x88, 0x3a, 0xa3, 0xf, 0xdc, 0x4b, 0x44, 0x1e }}
-  gIntelSiBasicPkgTokenSpaceGuid          = { 0x6de9e48c, 0x622, 0x4a33, { 0xab, 0x29, 0xdd, 0xc8, 0xd4, 0xf9, 0xc7, 0x6d}}
 
 ## Include/MultiPlatSupport.h
   gDefaultDataFileGuid                        = { 0x1ae42876, 0x008f, 0x4161, { 0xb2, 0xb7, 0x1c, 0x0d, 0x15, 0xc5, 0xef, 0x43 }}
@@ -59,15 +56,11 @@
 
   gEfiHtBistHobGuid  =  {0xbe644001, 0xe7d4, 0x48b1, {0xb0, 0x96, 0x8b, 0xa0, 0x47, 0xbc, 0x7a, 0xe7}}
 
-## Include/Guid/IA32FamilyCpuPkgTokenSpace.h
-  gEfiCpuTokenSpaceGuid          = { 0x2ADA836D, 0x0A3D, 0x43D6, { 0xA2, 0x5A, 0x38, 0x45, 0xCA, 0xD2, 0xD4, 0x00 }}
+
 
 [Protocols]
   gEfiLpcWpce791PolicyProtocolGuid        = { 0xab2bee2f, 0xc1a6, 0x4399, { 0x85, 0x3d, 0xc0, 0x7c, 0x77, 0x4f, 0xfd, 0x0d } }
 
-  gSmmCpuSyncProtocolGuid        = { 0xd5950985, 0x8be3, 0x4b1c, { 0xb6, 0x3f, 0x95, 0xd1, 0x5a, 0xb3, 0xb6, 0x5f }}
-  gSmmCpuSync2ProtocolGuid       = { 0x9db72e22, 0x9262, 0x4a18, { 0x8f, 0xe0, 0x85, 0xe0, 0x3d, 0xfa, 0x96, 0x73 }}
-  gEfiSmmCpuServiceProtocolGuid  = { 0x1d202cab, 0xc8ab, 0x4d5c, { 0x94, 0xf7, 0x3c, 0xfc, 0xc0, 0xd3, 0xd3, 0x35 }}
   gEfiMmioDeviceProtocolGuid                = { 0x24486226, 0xf8c2, 0x41f5, {0xb9, 0xdd, 0x78, 0x3e, 0x9e, 0x56, 0xde, 0xa0}}
   ## SPI flash part protocol GUID
   #
@@ -120,7 +113,23 @@
   #
   gPlatformModuleTokenSpaceGuid.PcdSMBIOSBiosStartAddress|0xF000|UINT16|0xB0000010
 
+  ## Provides the BIOS Characteristics to be used when generating the SMBIOS
+  #  Type 0 structure.  The definition of each bit in this field can be found
+  #  in the SMBIOS specification.
+  #
+  gPlatformModuleTokenSpaceGuid.PcdSMBIOSBiosChar|0x03037C099880|UINT64|0xB0000011
+
+  ## Provides the BIOS Extension Characteristics Byte 1 to be used when
+  #  generating the SMBIOS Type 0 structure.  The definition of each bit in this
+  #  field can be found in the SMBIOS specification.
+  #
+  gPlatformModuleTokenSpaceGuid.PcdSMBIOSBiosCharEx1|0x03|UINT8|0xB0000012
 
+  ## Provides the BIOS Extension Characteristics Byte 2 to be used when
+  #  generating the SMBIOS Type 0 structure.  The definition of each bit in this
+  #  field can be found in the SMBIOS specification.
+  #
+  gPlatformModuleTokenSpaceGuid.PcdSMBIOSBiosCharEx2|0x03|UINT8|0xB0000013
 
   # Identifies the state of the enclosure when it was last booted. See 3.3.4.2 for definitions.
   gPlatformModuleTokenSpaceGuid.PcdSMBIOSChassisBootupState|0x03|UINT8|0xB0000049
@@ -143,7 +152,9 @@
   # If no Contained Elements are included, this field is set to 0. For v2.3.2 and later of this specification,
   # this field is set to at least 03h when Contained Elements are specified.
   gPlatformModuleTokenSpaceGuid.PcdSMBIOSChassisElementRecordLength|0x0|UINT8|0xB0000050
-
+  ## Provides the BIOS Release Date string to be used when generating the SMBIOS
+  #  Type 0 structure.
+  gPlatformModuleTokenSpaceGuid.PcdSMBIOSBiosReleaseDate|"01/19/2015"|VOID*|0xB0000035
   # SystemSKUNumber String
   gPlatformModuleTokenSpaceGuid.PcdSMBIOSSystemSKUNumber|"System SKUNumber"|VOID*|0xB000003F
   # System Family String
@@ -192,6 +203,167 @@
   #
   gPlatformModuleTokenSpaceGuid.PcdWpce791UartSerialIoEnable|TRUE|BOOLEAN|0x50000060
 
+  ## Determines each attribute on this GPIO <BR><BR>
+  #  BIT0         - Reserved. Should be 0. <BR>
+  #  BIT1         - GPIO TX State. 0 = Low.  1 = High.<BR>
+  #  BIT2..BIT6   - Reserved. Should be 0. <BR>
+  #  BIT7         - GPIO Light Mode. 0 = Disable.  1 = Enable.<BR>
+  #  BIT8..BIT10  - GPIO Config. <BR>
+  #                 0 = GPIO (TX Enabled and RX Enabled).  <BR>
+  #                 1 = GPO (TX Enabled and RX Disabled).  <BR>
+  #                 2 = GPI (TX Disabled and RX Enabled).  <BR>
+  #                 3 = Hi-Z (TX Disabled and RX Disabled).  <BR>
+  #                 Others = Reserved.  <BR>
+  #  BIT11..BIT14 - Reserved. Should be 0. <BR>
+  #  BIT15        - GPIO Enable.  <BR>
+  #                 0 = GPIO disabled and function defined in Pad Mode controls the pad. <BR>
+  #                 1 = GPIO enabled and Pad Register controls the pad. <BR>
+  #  BIT16..BIT19 - PAD Mode.This controls which function controls this particular Pad when GPIO Enable = 0.<BR>
+  #  BIT20..BIT23 - Termination. <BR>
+  #                 BIT20: 20K. 0 = Disable.  1 = Enable. <BR>
+  #                 BIT21: 5K.  0 = Disable.  1 = Enable. <BR>
+  #                 BIT22: 1K.  0 = Disable.  1 = Enable. <BR>
+  #                 BIT23: Pull-up or Pull-down. 0 = Pull-down.  1 = Pull-up. <BR>
+  #  BIT24..BIT25 - Reserved. Should be 0. <BR>
+  #  BIT26..BIT27 - Glitch Filter Config. Enable the Glitch Filter on the RX path to deglitch the incoming signal.<BR>
+  #                 0 = Disable (Bypass the glitch filter). <BR>
+  #                 1 = Enable for Edge Detect Only. <BR>
+  #                 2 = Enable for RX Data Only. <BR>
+  #                 3 = Enable for Edge Detect and RX Data. <BR>
+  #  BIT28..BIT31 - Interrupt Select. It defines which interrupt line driven from the GPIO Controller toggles when <BR>
+  #                 an interrupt is detected on this pad. <BR>
+  #                 0 = Interrupt Line 0.  <BR>
+  #                 1 = Interrupt Line 1.  <BR>
+  #                 ...  <BR>
+  #                 15 = Interrupt Line 15.  <BR>
+  #  BIT32..BIT34 - Interrupt and Wake Configuration.Configure the edge detection logic that is used to trigger interrupts and wakes. <BR>
+  #                 1 = Falling Edge Detect Interrupt/Wake.  <BR>
+  #                 2 = Rising Edge Detect Interrupt/Wake.  <BR>
+  #                 3 = Falling or Rising EdgeDetect Interrupt/Wake.  <BR>
+  #                 4 = Level Interrupt/Wake.  <BR>
+  #                 Others = Reserved.  <BR>
+  #  BIT35        - Open Drain Enable.  0 = Disable.  1 = Enable. <BR>
+  #  BIT36..BIT39 - Invert Rx Tx. These bits invert the RX/TX Data and RX/TX Enables to the CFIO buffer.  <BR>
+  #                 BIT36: Rx Enable.  0 = No Inversion.  1 = Inversion Enabled. <BR>
+  #                 BIT37: Tx Enable.  0 = No Inversion.  1 = Inversion Enabled. <BR>
+  #                 BIT38: Rx Data.    0 = No Inversion.  1 = Inversion Enabled. <BR>
+  #                 BIT39: Tx Data.    0 = No Inversion.  1 = Inversion Enabled. <BR>
+  #  BIT40..BIT41 - GPE Enable. 0 = Disable. 1 = SMI. 2 = SCI. Others = Reserved.  <BR>
+  #  BIT42        - GPIO Wake capable.  0 = Disable.  1 = Enable. <BR>
+  #  BIT43        - GPIO Interrupt Mask. 0 = Masked.  1 = Unmasked. <BR>
+  #  BIT44..BIT51 - GPIO Wake Mask Bit Position.
+  #
+  # @Prompt GPIO Pin Configuration of GPIOSUS6
+  #
+  gPlatformModuleTokenSpaceGuid.PcdGPIOSUS6Configuration|0x00013A019C918200|UINT64|0x50000080
+
+  ## Determines each attribute on this GPIO <BR><BR>
+  #  BIT0         - Reserved. Should be 0. <BR>
+  #  BIT1         - GPIO TX State. 0 = Low.  1 = High.<BR>
+  #  BIT2..BIT6   - Reserved. Should be 0. <BR>
+  #  BIT7         - GPIO Light Mode. 0 = Disable.  1 = Enable.<BR>
+  #  BIT8..BIT10  - GPIO Config. <BR>
+  #                 0 = GPIO (TX Enabled and RX Enabled).  <BR>
+  #                 1 = GPO (TX Enabled and RX Disabled).  <BR>
+  #                 2 = GPI (TX Disabled and RX Enabled).  <BR>
+  #                 3 = Hi-Z (TX Disabled and RX Disabled).  <BR>
+  #                 Others = Reserved.  <BR>
+  #  BIT11..BIT14 - Reserved. Should be 0. <BR>
+  #  BIT15        - GPIO Enable.  <BR>
+  #                 0 = GPIO disabled and function defined in Pad Mode controls the pad. <BR>
+  #                 1 = GPIO enabled and Pad Register controls the pad. <BR>
+  #  BIT16..BIT19 - PAD Mode.This controls which function controls this particular Pad when GPIO Enable = 0.<BR>
+  #  BIT20..BIT23 - Termination. <BR>
+  #                 BIT20: 20K. 0 = Disable.  1 = Enable. <BR>
+  #                 BIT21: 5K.  0 = Disable.  1 = Enable. <BR>
+  #                 BIT22: 1K.  0 = Disable.  1 = Enable. <BR>
+  #                 BIT23: Pull-up or Pull-down. 0 = Pull-down.  1 = Pull-up. <BR>
+  #  BIT24..BIT25 - Reserved. Should be 0. <BR>
+  #  BIT26..BIT27 - Glitch Filter Config. Enable the Glitch Filter on the RX path to deglitch the incoming signal.<BR>
+  #                 0 = Disable (Bypass the glitch filter). <BR>
+  #                 1 = Enable for Edge Detect Only. <BR>
+  #                 2 = Enable for RX Data Only. <BR>
+  #                 3 = Enable for Edge Detect and RX Data. <BR>
+  #  BIT28..BIT31 - Interrupt Select. It defines which interrupt line driven from the GPIO Controller toggles when <BR>
+  #                 an interrupt is detected on this pad. <BR>
+  #                 0 = Interrupt Line 0.  <BR>
+  #                 1 = Interrupt Line 1.  <BR>
+  #                 ...  <BR>
+  #                 15 = Interrupt Line 15.  <BR>
+  #  BIT32..BIT34 - Interrupt and Wake Configuration.Configure the edge detection logic that is used to trigger interrupts and wakes. <BR>
+  #                 1 = Falling Edge Detect Interrupt/Wake.  <BR>
+  #                 2 = Rising Edge Detect Interrupt/Wake.  <BR>
+  #                 3 = Falling or Rising EdgeDetect Interrupt/Wake.  <BR>
+  #                 4 = Level Interrupt/Wake.  <BR>
+  #                 Others = Reserved.  <BR>
+  #  BIT35        - Open Drain Enable.  0 = Disable.  1 = Enable. <BR>
+  #  BIT36..BIT39 - Invert Rx Tx. These bits invert the RX/TX Data and RX/TX Enables to the CFIO buffer.  <BR>
+  #                 BIT36: Rx Enable.  0 = No Inversion.  1 = Inversion Enabled. <BR>
+  #                 BIT37: Tx Enable.  0 = No Inversion.  1 = Inversion Enabled. <BR>
+  #                 BIT38: Rx Data.    0 = No Inversion.  1 = Inversion Enabled. <BR>
+  #                 BIT39: Tx Data.    0 = No Inversion.  1 = Inversion Enabled. <BR>
+  #  BIT40..BIT41 - GPE Enable. 0 = Disable. 1 = SMI. 2 = SCI. Others = Reserved.  <BR>
+  #  BIT42        - GPIO Wake capable.  0 = Disable.  1 = Enable. <BR>
+  #  BIT43        - GPIO Interrupt Mask. 0 = Masked.  1 = Unmasked. <BR>
+  #  BIT44..BIT51 - GPIO Wake Mask Bit Position.
+  #
+  # @Prompt GPIO Pin Configuration of GPIOSUS7
+  #
+  gPlatformModuleTokenSpaceGuid.PcdGPIOSUS7Configuration|0x0000C10000918200|UINT64|0x50000081
+
+  ## Determines each attribute on this GPIO <BR><BR>
+  #  BIT0         - Reserved. Should be 0. <BR>
+  #  BIT1         - GPIO TX State. 0 = Low.  1 = High.<BR>
+  #  BIT2..BIT6   - Reserved. Should be 0. <BR>
+  #  BIT7         - GPIO Light Mode. 0 = Disable.  1 = Enable.<BR>
+  #  BIT8..BIT10  - GPIO Config. <BR>
+  #                 0 = GPIO (TX Enabled and RX Enabled).  <BR>
+  #                 1 = GPO (TX Enabled and RX Disabled).  <BR>
+  #                 2 = GPI (TX Disabled and RX Enabled).  <BR>
+  #                 3 = Hi-Z (TX Disabled and RX Disabled).  <BR>
+  #                 Others = Reserved.  <BR>
+  #  BIT11..BIT14 - Reserved. Should be 0. <BR>
+  #  BIT15        - GPIO Enable.  <BR>
+  #                 0 = GPIO disabled and function defined in Pad Mode controls the pad. <BR>
+  #                 1 = GPIO enabled and Pad Register controls the pad. <BR>
+  #  BIT16..BIT19 - PAD Mode.This controls which function controls this particular Pad when GPIO Enable = 0.<BR>
+  #  BIT20..BIT23 - Termination. <BR>
+  #                 BIT20: 20K. 0 = Disable.  1 = Enable. <BR>
+  #                 BIT21: 5K.  0 = Disable.  1 = Enable. <BR>
+  #                 BIT22: 1K.  0 = Disable.  1 = Enable. <BR>
+  #                 BIT23: Pull-up or Pull-down. 0 = Pull-down.  1 = Pull-up. <BR>
+  #  BIT24..BIT25 - Reserved. Should be 0. <BR>
+  #  BIT26..BIT27 - Glitch Filter Config. Enable the Glitch Filter on the RX path to deglitch the incoming signal.<BR>
+  #                 0 = Disable (Bypass the glitch filter). <BR>
+  #                 1 = Enable for Edge Detect Only. <BR>
+  #                 2 = Enable for RX Data Only. <BR>
+  #                 3 = Enable for Edge Detect and RX Data. <BR>
+  #  BIT28..BIT31 - Interrupt Select. It defines which interrupt line driven from the GPIO Controller toggles when <BR>
+  #                 an interrupt is detected on this pad. <BR>
+  #                 0 = Interrupt Line 0.  <BR>
+  #                 1 = Interrupt Line 1.  <BR>
+  #                 ...  <BR>
+  #                 15 = Interrupt Line 15.  <BR>
+  #  BIT32..BIT34 - Interrupt and Wake Configuration.Configure the edge detection logic that is used to trigger interrupts and wakes. <BR>
+  #                 1 = Falling Edge Detect Interrupt/Wake.  <BR>
+  #                 2 = Rising Edge Detect Interrupt/Wake.  <BR>
+  #                 3 = Falling or Rising EdgeDetect Interrupt/Wake.  <BR>
+  #                 4 = Level Interrupt/Wake.  <BR>
+  #                 Others = Reserved.  <BR>
+  #  BIT35        - Open Drain Enable.  0 = Disable.  1 = Enable. <BR>
+  #  BIT36..BIT39 - Invert Rx Tx. These bits invert the RX/TX Data and RX/TX Enables to the CFIO buffer.  <BR>
+  #                 BIT36: Rx Enable.  0 = No Inversion.  1 = Inversion Enabled. <BR>
+  #                 BIT37: Tx Enable.  0 = No Inversion.  1 = Inversion Enabled. <BR>
+  #                 BIT38: Rx Data.    0 = No Inversion.  1 = Inversion Enabled. <BR>
+  #                 BIT39: Tx Data.    0 = No Inversion.  1 = Inversion Enabled. <BR>
+  #  BIT40..BIT41 - GPE Enable. 0 = Disable. 1 = SMI. 2 = SCI. Others = Reserved.  <BR>
+  #  BIT42        - GPIO Wake capable.  0 = Disable.  1 = Enable. <BR>
+  #  BIT43        - GPIO Interrupt Mask. 0 = Masked.  1 = Unmasked. <BR>
+  #  BIT44..BIT51 - GPIO Wake Mask Bit Position.
+  #
+  # @Prompt GPIO Pin Configuration of GPIOSUS8
+  #
+  gPlatformModuleTokenSpaceGuid.PcdGPIOSUS8Configuration|0x0001100000918200|UINT64|0x50000082
 
   ## Provides the ability to enable the Fast Boot feature of the BIOS.  This
   #  enables the system to boot faster but may only enumerate the hardware
@@ -207,131 +379,8 @@
   gPlatformModuleTokenSpaceGuid.PcdUseHeciInCapsuleUpdate|TRUE|BOOLEAN|0x00000027
   gPlatformModuleTokenSpaceGuid.PcdDiagBootPhasesSerial|FALSE|BOOLEAN|0x00000030
 
-  ## Indicates if BSP election in SMM will be enabled.
-  #  If enabled, a BSP will be dynamically elected among all processors in each SMI.
-  #  Otherwise, processor 0 is always as BSP in each SMI.<BR><BR>
-  #   TRUE  - BSP election in SMM will be enabled.<BR>
-  #   FALSE - BSP election in SMM will be disabled.<BR>
-  # @Prompt Enable BSP election in SMM.
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmEnableBspElection|TRUE|BOOLEAN|0x32132106
-  ## Indicates if SMM Debug will be enabled.
-  #  If enabled, hardware breakpoints in SMRAM can be set outside of SMM mode and take effect in SMM.<BR><BR>
-  #   TRUE  - SMM Debug will be enabled.<BR>
-  #   FALSE - SMM Debug will be disabled.<BR>
-  # @Prompt Enable SMM Debug.
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmDebug|FALSE|BOOLEAN|0x1000001B
-  ## Indicates if SMM Stack Guard will be enabled.
-  #  If enabled, stack overflow in SMM can be caught which eases debugging.<BR><BR>
-  #   TRUE  - SMM Stack Guard will be enabled.<BR>
-  #   FALSE - SMM Stack Guard will be disabled.<BR>
-  # @Prompt Enable SMM Stack Guard.
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmStackGuard|FALSE|BOOLEAN|0x1000001C
-  ## Indicates if SMM Startup AP in a blocking fashion.
-  #   TRUE  - SMM Startup AP in a blocking fashion.<BR>
-  #   FALSE - SMM Startup AP in a non-blocking fashion.<BR>
-  # @Prompt SMM Startup AP in a blocking fashion.
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|FALSE|BOOLEAN|0x32132108
-  ## Indicates if SMM Profile will be enabled.
-  #  If enabled, instruction executions in and data accesses to memory outside of SMRAM will be logged.
-  #  This PCD is only for validation purpose. It should be set to false in production.<BR><BR>
-  #   TRUE  - SMM Profile will be enabled.<BR>
-  #   FALSE - SMM Profile will be disabled.<BR>
-  # @Prompt Enable SMM Profile.
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmProfileEnable|FALSE|BOOLEAN|0x32132109
-  ## Indicates if the SMM profile log buffer is a ring buffer.
-  #  If disabled, no additional log can be done when the buffer is full.<BR><BR>
-  #   TRUE  - the SMM profile log buffer is a ring buffer.<BR>
-  #   FALSE - the SMM profile log buffer is a normal buffer.<BR>
-  # @Prompt The SMM profile log buffer is a ring buffer.
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmProfileRingBuffer|FALSE|BOOLEAN|0x3213210a
-  ## Indicates if SMM MP sync data resides in un-cached RAM.<BR><BR>
-  #   TRUE  - SMM MP sync data will be resided in un-cached RAM.<BR>
-  #   FALSE - SMM MP sync data will be resided in cached RAM.<BR>
-  # @Prompt SMM MP sync data resides in un-cached RAM.
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmUncacheCpuSyncData|FALSE|BOOLEAN|0x3213210D
-  ## Indidates if CPU SMM hot-plug will be enabled.<BR><BR>
-  #   TRUE  - SMM CPU hot-plug will be enabled.<BR>
-  #   FALSE - SMM CPU hot-plug will be disabled.<BR>
-  # @Prompt SMM CPU hot-plug.
-  gEfiCpuTokenSpaceGuid.PcdCpuHotPlugSupport|FALSE|BOOLEAN|0x3213210C
-  ## Indidates if lock SMM Feature Control MSR.<BR><BR>
-  #   TRUE  - SMM Feature Control MSR will be locked.<BR>
-  #   FALSE - SMM Feature Control MSR will not be locked.<BR>
-  # @Prompt Lock SMM Feature Control MSR.
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmFeatureControlMsrLock|TRUE|BOOLEAN|0x3213210B
-
-[PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic]
-#
-# ACPI timer
-#
-gIntelSiBasicPkgTokenSpaceGuid.PcdAcpiIoBaseAddress|0x1800|UINT16|0x10000021
-gIntelSiBasicPkgTokenSpaceGuid.AcpiTimerLength|24|UINT8|0x10000022
-
-#
-# SATA controller
-#
-gIntelSiBasicPkgTokenSpaceGuid.SataMaxSataPort|8|UINT8|0x10000023
-gIntelSiBasicPkgTokenSpaceGuid.SataMaxDevicesPerPort|1|UINT8|0x10000024
-
-#
-# CPU
-#
-gIntelSiBasicPkgTokenSpaceGuid.CpuNumberOfThreadsPerCore|2|UINT32|0x10000025
-gIntelSiBasicPkgTokenSpaceGuid.CpuNumberOfCoresPerDie|2|UINT32|0x10000026
-gIntelSiBasicPkgTokenSpaceGuid.CpuNumberOfDiesPerPackage|1|UINT32|0x10000027
-gIntelSiBasicPkgTokenSpaceGuid.CpuNumberOfPackages|1|UINT32|0x10000028
-
-gIntelSiBasicPkgTokenSpaceGuid.PcdFlashMicroCodeRegionBase|0xFFD60000|UINT32|0x20000015
-gIntelSiBasicPkgTokenSpaceGuid.PcdFlashMicroCodeRegionSize|0x00023000|UINT32|0x20000016
-gIntelSiBasicPkgTokenSpaceGuid.PcdFlashMicroCodeOffset|0x00|UINT32|0x20000017
 
-#
-# PCI Host bridge
-#
-##
-## PcdEfiGcdAllocateType is using for EFI_GCD_ALLOCATE_TYPE selection
-## value of the struct
-##  0x00 EfiGcdAllocateAnySearchBottomUp
-##  0x01 EfiGcdAllocateMaxAddressSearchBottomUp
-##  0x03 EfiGcdAllocateAnySearchTopDown
-##  0x04 EfiGcdAllocateMaxAddressSearchTopDown
-##
-##  below value should not using in this situation
-##  0x05 EfiGcdMaxAllocateType : design for max value of struct
-##  0x02 EfiGcdAllocateAddress : design for speccification address allocate
-##
-gIntelSiBasicPkgTokenSpaceGuid.PcdEfiGcdAllocateType|0x01|UINT8|0x40000000
 
-##
-## Allocate 56 KB [0x2000..0xFFFF] of I/O space for Pci Devices
-## If PcdPciReservedMemLimit =0  Pci Reserved default  MMIO Limit is PciExpressBase else use PcdPciReservedMemLimit .
-##
-gIntelSiBasicPkgTokenSpaceGuid.PcdPciReservedIobase   |0x1000     |UINT16|0x00010041
-gIntelSiBasicPkgTokenSpaceGuid.PcdPciReservedIoLimit  |0xFFFF     |UINT16|0x00010042
-gIntelSiBasicPkgTokenSpaceGuid.PcdMmioBase  |0x80000000 |UINT32|0x00010043
-gIntelSiBasicPkgTokenSpaceGuid.PcdPciReservedMemLimit |0x00000000 |UINT32|0x00010044
-gIntelSiBasicPkgTokenSpaceGuid.PcdPciReservedMemAbove4GBBase  |0x0000000000000000 |UINT64|0x00010045
-gIntelSiBasicPkgTokenSpaceGuid.PcdPciReservedMemAbove4GBLimit |0x0000000000000000 |UINT64|0x00010046
-
-  ## Specifies maximum number of processors supported by the platform.
-  # @Prompt Maximum number of processors supported by the platform.
-  gEfiCpuTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber|64|UINT32|0x30000002
-  ## Specifies timeout value in microseconds for the BSP in SMM to wait for all APs to come into SMM.
-  # @Prompt AP synchronization timeout value in SMM.
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmApSyncTimeout|1000000|UINT64|0x32132104
-  ## Specifies stack size in bytes for each processor in SMM.
-  # @Prompt Processor stack size in SMM.
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmStackSize|0x2000|UINT32|0x32132105
-  ## Specifies buffer size in bytes to save SMM profile data. The value should be a multiple of 4KB.
-  # @Prompt SMM profile data buffer size.
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmProfileSize|0x200000|UINT32|0x32132107
-  ## Indidates if SMM Code Access Check is enabled.
-  #  If enabled, the SMM handler cannot execut the code outside ranges defined by SMRR.
-  #  This PCD is suggested to TRUE in production image.<BR><BR>
-  #   TRUE  - SMM Code Access Check will be enabled.<BR>
-  #   FALSE - SMM Code Access Check will be disabled.<BR>
-  # @Prompt SMM Code Access Check.
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmCodeAccessCheckEnable|TRUE|BOOLEAN|0x60000013
 
 [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]
   ## Provides the boot devices and boot orders that will be used by the BIOS
@@ -372,7 +421,7 @@ gIntelSiBasicPkgTokenSpaceGuid.PcdPciReservedMemAbove4GBLimit |0x000000000000000
   #  UUID valid format like {0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF, 0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF}
   #
   # @Prompt System UUID
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSSystemUuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}|VOID*|0xB000003E
+  gPlatformModuleTokenSpaceGuid.PcdSMBIOSSystemUuid|{0xa5, 0x00, 0x02, 0x88, 0x64, 0x62, 0x45, 0x24, 0x98, 0x6a, 0x9b, 0x77, 0x37, 0xe3, 0x15, 0xcf}|VOID*|0xB000003E
 
   ## Provides the System manufacture information
   #
@@ -384,80 +433,53 @@ gIntelSiBasicPkgTokenSpaceGuid.PcdPciReservedMemAbove4GBLimit |0x000000000000000
   #
   # @Prompt System version Strings
   #
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSSystemVersion|"r1.0"|VOID*|0xB000003C
+  gPlatformModuleTokenSpaceGuid.PcdSMBIOSSystemVersion|"0.1"|VOID*|0xB000003C
 
   ## Provides the System Serial Number
   #
   # @Prompt System SerialNumber Strings
   #
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSSystemSerialNumber|"UNKNOWN"|VOID*|0xB000003D
+  gPlatformModuleTokenSpaceGuid.PcdSMBIOSSystemSerialNumber|"112233445566"|VOID*|0xB000003D
 
   ## Provides the Board Manufacturer description
   #
   # @Prompt Board Manufacturer String
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSBoardManufacturer|"Intel Corporation."|VOID*|0xB0000041
+  gPlatformModuleTokenSpaceGuid.PcdSMBIOSBoardManufacturer|"Intel Corp."|VOID*|0xB0000041
 
   ## Provides the Board Version description
   #
   # @Prompt Board Product Version String
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSBoardVersion|"r1.0"|VOID*|0xB0000043
+  gPlatformModuleTokenSpaceGuid.PcdSMBIOSBoardVersion|"FAB"|VOID*|0xB0000043
 
   ## Provides the Board Serial Number description
   #
   # @Prompt Board Serial Number String
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSBoardSerialNumber|"UNKNOWN"|VOID*|0xB0000044
+  gPlatformModuleTokenSpaceGuid.PcdSMBIOSBoardSerialNumber|"1"|VOID*|0xB0000044
 
-  ## Provides the information about system's enclosure.
+  ## Provides the inforation about system's enclosure.
   #  Manufacture to describe the Chassis Manufacture Name.<BR><BR>
   #
   # @Prompt Chassis Manufacturer String
   gPlatformModuleTokenSpaceGuid.PcdSMBIOSChassisManufacturer|"Intel Corporation"|VOID*|0xB0000045
 
-  ## Provides the information about system's enclosure.
+  ## Provides the inforation about system's enclosure.
   #  This will be used to describe the Chassis Version.<BR><BR>
   #
   # @Prompt Chassis Version String
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSChassisVersion|"r1.0"|VOID*|0xB0000046
+  gPlatformModuleTokenSpaceGuid.PcdSMBIOSChassisVersion|"0.1"|VOID*|0xB0000046
 
-  ## Provides the information about system's enclosure.
+  ## Provides the inforation about system's enclosure.
   #  This will be used to describe  the Chassis Serial Number.<BR><BR>
   #
   # @Prompt Chassis SerialNumber String
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSChassisSerialNumber|"UNKNOWN"|VOID*|0xA0000047
+  gPlatformModuleTokenSpaceGuid.PcdSMBIOSChassisSerialNumber|"serial"|VOID*|0xA0000047
 
-  ## Provides the information about system's enclosure.
+  ## Provides the inforation about system's enclosure.
   #  This will be used to describe the Chassis Asset Tag.<BR><BR>
   #
   # @Prompt Chassis Asset Tag String
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSChassisAssetTag|"UNKNOWN"|VOID*|0xB0000300
-  ## Provides the BIOS Characteristics to be used when generating the SMBIOS
-  #  Type 0 structure. The definition of each bit in this field can be found
-  #  in the SMBIOS specification.
-  #
-  # @Prompt BIOS Characteristics
-  #
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSBiosChar|0x0000000000019880|UINT64|0xB1000011
-  ## Provides the BIOS Extension Characteristics Byte 1 to be used when
-  #  generating the SMBIOS Type 0 structure.  The definition of each bit in this
-  #  field can be found in the SMBIOS specification.
-  #
-  # @Prompt BIOS Characteristics Extension Byte1
-  #
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSBiosCharEx1|0x01|UINT8|0xB1000012
+  gPlatformModuleTokenSpaceGuid.PcdSMBIOSChassisAssetTag|"Asset Tag"|VOID*|0xB0000300
 
-  ## Provides the BIOS Extension Characteristics Byte 2 to be used when
-  #  generating the SMBIOS Type 0 structure.  The definition of each bit in this
-  #  field can be found in the SMBIOS specification.
-  #
-  # @Prompt BIOS Characteristics Extension Byte2
-  #
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSBiosCharEx2|0x00|UINT8|0xB1000013
-  ## Provides the BIOS Release Date string to be used when generating the SMBIOS
-  #  Type 0 structure.
-  #
-  # @Prompt System BIOS Release Date
-  #
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSBiosReleaseDate|"04/18/2016"|VOID*|0xB1000035
   ## Provides the ability to configure the terminal type to be used.<BR><BR>
   #  0 - PcAnsi<BR>
   #  1 - VT100<BR>
@@ -471,9 +493,6 @@ gIntelSiBasicPkgTokenSpaceGuid.PcdPciReservedMemAbove4GBLimit |0x000000000000000
   gPlatformModuleTokenSpaceGuid.PcdTerminalType|0|UINT8|0x6000001D
 
 
-  ## Indicates the receive FIFO depth of UART controller.<BR><BR>
-  # @Prompt Default UART Receive FIFO Depth.
-  gPlatformModuleTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|1|UINT16|0x00000031
 
 
   ## If the firmware has a User Interface this feature provides the ability to interrupt
@@ -486,16 +505,7 @@ gIntelSiBasicPkgTokenSpaceGuid.PcdPciReservedMemAbove4GBLimit |0x000000000000000
 
   gPlatformModuleTokenSpaceGuid.PcdFspAuthenticatedVariable|TRUE|BOOLEAN|0x6000001F
 
-  ## Indidates if SMM Delay feature is supported.<BR><BR>
-  #   TRUE  - SMM Delay feature is supported.<BR>
-  #   FALSE - SMM Delay feature is not supported.<BR>
-  # @Prompt SMM Delay feature.
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmUseDelayIndication|TRUE|BOOLEAN|0x60000018
-  ## Indidates if SMM Block feature is supported.<BR><BR>
-  #   TRUE  - SMM Block feature is supported.<BR>
-  #   FALSE - SMM Block feature is not supported.<BR>
-  # @Prompt SMM Block feature.
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmUseBlockIndication|TRUE|BOOLEAN|0x60000019
+
 
 [PcdsDynamic,PcdsDynamicEx]
   gPlatformModuleTokenSpaceGuid.PcdInConfigMode|FALSE|BOOLEAN|0x80000001
@@ -530,20 +540,5 @@ gIntelSiBasicPkgTokenSpaceGuid.PcdPciReservedMemAbove4GBLimit |0x000000000000000
   # @Prompt Platform Specific configuration.
   gEfiEdkIIPlatformTokenSpaceGuid.PcdOemMemeoryDimmType|0|UINT8|0x40000013
 
-  ## Contains the pointer to CPU Configuration Context Buffer defined in the CpuConfigLib.
-  # @Prompt The pointer to CPU Configuration Context Buffer.
-  gEfiCpuTokenSpaceGuid.PcdCpuConfigContextBuffer|0x0|UINT64|0x50000001
-  ## Used for a callback mechanism for the CPU MP driver.
-  #  The CPU MP driver will set this PCD at pre-defined points. If there is callback function registered on it,
-  #  the callback function will be triggered, and it may change the value of PcdCpuCallbackSignal.
-  # @Prompt PCD for CPU callback signal.
-  gEfiCpuTokenSpaceGuid.PcdCpuCallbackSignal|0x0|UINT8|0x50000002
-  ## Contains the pointer to a CPU S3 data buffer of structure ACPI_CPU_DATA.
-  # @Prompt The pointer to a CPU S3 data buffer.
-  gEfiCpuTokenSpaceGuid.PcdCpuS3DataAddress|0x0|UINT64|0x60000010
-  ## Contains the pointer to a CPU Hot Plug Data structure if CPU hot-plug is supported.
-  # @Prompt The pointer to CPU Hot Plug Data.
-  gEfiCpuTokenSpaceGuid.PcdCpuHotPlugDataAddress|0x0|UINT64|0x60000011
-
-[PcdsDynamicEx]
-  gPlatformModuleTokenSpaceGuid.PcdPlatformGpioTable|{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}|VOID*|0x60000100
+
+
diff --git a/BraswellPlatformPkg/BuildBsw.bat b/BraswellPlatformPkg/BuildBsw.bat
index aea21fafd6..2d0f1b59d7 100644
--- a/BraswellPlatformPkg/BuildBsw.bat
+++ b/BraswellPlatformPkg/BuildBsw.bat
@@ -9,14 +9,17 @@ REM ---- Do NOT use :: for comments Inside of code blocks() ----
 ::**********************************************************************
 :: Initial Setup
 ::**********************************************************************
+echo Initial variable setting...
 set WORKSPACE=%CD%
 if %WORKSPACE:~-1%==\ set WORKSPACE=%WORKSPACE:~0,-1%
+set PLATFORM_PATH=BraswellPlatformPkg
 set /a build_threads=1
 set "Build_Flags= "
 set "SV_String=_"
 set exitCode=0
 set Arch=X64
 set Compiler=VS2008
+set "SpiLock= "
 
 set VS2008_SP_REGKEY_PATH=HKLM\Software\Microsoft\DevDiv\VS\Servicing\9.0\
 set VS2008_SP_REGKEY=SP
@@ -35,13 +38,8 @@ if exist conf\.cache rmdir /q/s conf\.cache
 set "VCINSTALLDIR="
 set "EDK_TOOLS_PATH="
 cd..
-if /I "%1" == "DEBUG" (
-  copy BaseTools\Conf\tools_def.template Conf\tools_def.txt /Y
-) else (
-  copy BaseTools\Conf\tools_def.template Conf\tools_def.txt /Y
-)
 
-call edksetup.bat > nul
+call edksetup.bat
 cd %WORKSPACE%
 
 @rem InternalOnlyBegin
@@ -84,7 +82,6 @@ set PLATFORM_NAME=BraswellPlatformPkg
 set PLATFORM_PACKAGE=BraswellPlatformPkg
 set PLATFORM2_PACKAGE=BraswellPlatformPkg
 set PLATFORM_RC_PACKAGE=ChvRefCodePkg
-set "UniTool_Excludes=ChtSvPkg R8ChtDeviceSvRestrictedPkg"
 
 ::**********************************************************************
 :: Parse command line arguments
@@ -105,6 +102,11 @@ if /i "%~1"=="fspw" (
     shift
     goto OptLoop
 )
+if /i "%~1"=="fvbin" (
+    set Build_Flags=%Build_Flags% -D ENABLE_FV_BIN=TRUE
+    shift
+    goto OptLoop
+)
 if /i "%~1"=="/q" (
     set Build_Flags=%Build_Flags% --quiet
     shift
@@ -181,6 +183,13 @@ if /i "%~1"=="/vs13" (
     shift
     goto OptLoop
 )
+if /i "%~1"=="/yL" (
+    set SpiLock=/yL
+    shift
+    goto OptLoop
+)
+
+
 :: Required argument(s)
 if "%~1"=="" (
    echo. & echo Not Enough Arguments Provided, default is Braswell build.
@@ -229,7 +238,7 @@ if "%FSP_WRAPPER_ENABLE%"=="TRUE" (
 ::**********************************************************************
 
 ::Setup DefineAtBuildMacros config file
-set Build_Macros=.\%PLATFORM_NAME%\AutoPlatformCFG.txt
+set Build_Macros=.\%PLATFORM_PATH%\AutoPlatformCFG.txt
 copy /y nul %Build_Macros% >nul
 
 ::output platform specific build macros to DefineAtBuildMacros.dsc
@@ -250,7 +259,7 @@ if "%Arch%"=="IA32" (
 )
 
 ::Stage of copy of BiosId.env in Conf/ with Platform_Type and Build_Target values removed
-findstr /b /v "BOARD_ID  BUILD_TYPE OEM_ID" %PLATFORM_NAME%\BiosId.env > Conf\BiosId.env
+findstr /b /v "BOARD_ID  BUILD_TYPE OEM_ID" %PLATFORM_PATH%\Common\BiosId.env > Conf\BiosId.env
 
 
 if "%target%" == "RELEASE" (
@@ -328,7 +337,7 @@ if "%TOOL_CHAIN_TAG%"=="VS2008x86" (
     echo DEFINE TOOL_CHAIN_VS2010 = FALSE  >> %Build_Macros%
     echo DEFINE TOOL_CHAIN_VS2013 = FALSE  >> %Build_Macros%
 
-    reg query %VS2008_SP_REGKEY_PATH% /v %VS2008_SP_REGKEY% 2>null
+    reg query %VS2008_SP_REGKEY_PATH% /v %VS2008_SP_REGKEY% 2
 
         for /f "tokens=2,*" %%a in ('reg query %VS2008_SP_REGKEY_PATH% /v %VS2008_SP_REGKEY% ^| findstr %VS2008_SP_REGKEY%') do (
         if 0x1==%%b (
@@ -357,7 +366,7 @@ if "%Arch%"=="IA32" (        echo TARGET_ARCH = IA32        >> Conf\target.txt.t
 )
 echo TARGET          = %TARGET%                                >> Conf\target.txt.tmp
 echo TOOL_CHAIN_TAG  = %TOOL_CHAIN_TAG%                        >> Conf\target.txt.tmp
-echo ACTIVE_PLATFORM = %PLATFORM_NAME%/PlatformPkg%Arch%.dsc  >> Conf\target.txt.tmp
+echo ACTIVE_PLATFORM = %PLATFORM_PATH%/PlatformPkg%Arch%.dsc  >> Conf\target.txt.tmp
 echo MAX_CONCURRENT_THREAD_NUMBER = %build_threads%        >> Conf\target.txt.tmp
 
 move /Y Conf\target.txt.tmp Conf\target.txt >nul
@@ -391,7 +400,7 @@ echo Creating BiosId...
 @REM
 @REM Reenable the GenBiosId if it is for external release
 @REM
-%PLATFORM2_PACKAGE%\Tools\GenBiosId\GenBiosId.exe -i Conf\BiosId.env -o %BIOS_ID_OUTPUT_DIR%\BiosId.bin -ob Conf\BiosId.bat
+%PLATFORM_PATH%\Common\Tools\GenBiosId\GenBiosId.exe -i Conf\BiosId.env -o %BIOS_ID_OUTPUT_DIR%\BiosId.bin -ob Conf\BiosId.bat
 if %ERRORLEVEL% NEQ 0 goto BldFail
 call Conf\BiosId.bat
 echo BIOS_ID=%BIOS_ID%
@@ -431,7 +440,7 @@ set BIOS_ID_LOCATION=Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\IA32\%PL
 @echo  Prebuild:  Generate SetupStrDefs.h, as required by SV Knob data.
 @echo.
 echo %WROKSPACE%
-build -n %NUMBER_OF_PROCESSORS% -m .\%PLATFORM_NAME%\PlatformSetupDxe\PlatformSetupDxe.inf -e %TEST_MENU_BUILD_OPTION%
+build -n %NUMBER_OF_PROCESSORS% -m .\%PLATFORM_PATH%\PlatformSetupDxe\PlatformSetupDxe.inf -e %TEST_MENU_BUILD_OPTION%
 
 @if %ERRORLEVEL% NEQ 0 (
   set SCRIPT_ERROR=1
@@ -515,7 +524,7 @@ if "%FSP_BUILD%"=="TRUE" (
     @echo off
 )
 echo Invoking EDK2 BSW Normal build...
-build %Build_Flags%
+build %Build_Flags% -y BraswellReport.txt
 if %ERRORLEVEL% NEQ 0 goto BldFail
 
 ::**********************************************************************
@@ -523,7 +532,7 @@ if %ERRORLEVEL% NEQ 0 goto BldFail
 ::**********************************************************************
 
 echo Running fce...
-pushd %PLATFORM2_PACKAGE%\Tools\FCE
+pushd %PLATFORM_PATH%\Common\Tools\FCE
 :: Extract Hii data from build and store in HiiDefaultData.txt
 fce.exe read -i %WORKSPACE%\%BUILD_PATH%\FV\Cht.fd > %WORKSPACE%\%BUILD_PATH%\FV\HiiDefaultData.txt
 :: copy the Setup variable to the SetupDefault variable and save changes to ChtXXX.fd
@@ -540,38 +549,38 @@ echo  FD successfully updated with default Hii values.
 set BIOS_Name=%BOARD_ID%%SV_String%%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM
 if "%PSS-Rename%"=="TRUE"  set BIOS_Name=%BIOS_Name:~0,-3%PSS
 if not exist %BUILD_PATH%\ROM  mkdir %BUILD_PATH%\ROM
-copy /y/b %BUILD_PATH%\FV\Cht%Arch%.fd  %WORKSPACE%\BraswellPlatformPkg\Stitch\%BIOS_Name% >nul
+copy /y/b %BUILD_PATH%\FV\Cht%Arch%.fd  %WORKSPACE%\%PLATFORM_PATH%\Common\Tools\Stitch\%BIOS_Name% >nul
 copy /y/b %BUILD_PATH%\FV\Cht%Arch%.fd  %BUILD_PATH%\ROM\%BIOS_Name% >nul
 
 echo
 echo Make backup on ROM file (unsigned release)
 echo ================================
-copy /y/b %WORKSPACE%\BraswellPlatformPkg\Stitch\%BIOS_Name% %BUILD_PATH%\ROM\%BIOS_Name%.rel
+copy /y/b %WORKSPACE%\%PLATFORM_PATH%\Common\Tools\Stitch\%BIOS_Name% %BUILD_PATH%\ROM\%BIOS_Name%.rel
 
 echo.
 echo Calling IFWIStitch...
-pushd %PLATFORM2_PACKAGE%\Stitch
+pushd %WORKSPACE%\%PLATFORM_PATH%\Common\Tools\Stitch\
 if  /i "%Platform_Type%" == "%Tblt_RVP%" (
    if "%SV_BIOS_ENABLE%" == "TRUE" (
-     call IFWIStitch.bat %BIOS_Name% /C CHTT_SV_Stitch_Config.txt /S %VERSION_MAJOR%_%VERSION_MINOR%
+     call %WORKSPACE%\%PLATFORM_PATH%\Common\Tools\Stitch\IFWIStitch.bat %BIOS_Name% /C CHTT_SV_Stitch_Config.txt /S %VERSION_MAJOR%_%VERSION_MINOR%
    ) else (
-     call IFWIStitch.bat %BIOS_Name% /C CHTT_Stitch_Config.txt /S %VERSION_MAJOR%_%VERSION_MINOR%
+     call %WORKSPACE%\%PLATFORM_PATH%\Common\Tools\Stitch\IFWIStitch.bat %BIOS_Name% /C CHTT_Stitch_Config.txt /S %VERSION_MAJOR%_%VERSION_MINOR%
    )
 ) else if /i "%Platform_Type%" == "%eNB_RVP%" (
    if "%SV_BIOS_ENABLE%" == "TRUE" (
-     call IFWIStitch.bat /nG /nM /nI %BIOS_Name% /C BSW_SV_Stitch_Config.txt /S %VERSION_MAJOR%_%VERSION_MINOR%
+     call %WORKSPACE%\%PLATFORM_PATH%\Common\Tools\Stitch\IFWIStitch.bat /nG /nM /nI %SpiLock% %BIOS_Name% /C BSW_SV_Stitch_Config.txt /S %VERSION_MAJOR%_%VERSION_MINOR%
    ) else if "%PPV_ENABLE%" == "TRUE" (
-     call IFWIStitch.bat /nG /nM /nI %BIOS_Name% /C BSW_PPV_Stitch_Config.txt /S %VERSION_MAJOR%_%VERSION_MINOR%
+     call %WORKSPACE%\%PLATFORM_PATH%\Common\Tools\Stitch\IFWIStitch.bat /nG /nM /nI %SpiLock% %BIOS_Name% /C BSW_PPV_Stitch_Config.txt /S %VERSION_MAJOR%_%VERSION_MINOR%
    ) else (
-     call IFWIStitch.bat /nG /nM /nI %BIOS_Name% /C BSW_Stitch_Config.txt /S %VERSION_MAJOR%_%VERSION_MINOR%
+     call %WORKSPACE%\%PLATFORM_PATH%\Common\Tools\Stitch\IFWIStitch.bat /nG /nM /nI %SpiLock% %BIOS_Name% /C BSW_Stitch_Config.txt /S %VERSION_MAJOR%_%VERSION_MINOR%
    )
 )
 @echo off
 popd
 
 echo BIOS_ID=%BIOS_ID%
-copy /y/b %PLATFORM2_PACKAGE%\Stitch\%BIOS_ID%.bin %BUILD_PATH%\ROM\
-copy /y/b %PLATFORM2_PACKAGE%\Stitch\%BIOS_Name% %BUILD_PATH%\ROM\
+copy /y/b %PLATFORM_PATH%\Common\Tools\Stitch\%BIOS_ID%.bin %BUILD_PATH%\ROM\
+copy /y/b %PLATFORM_PATH%\Common\Tools\Stitch\%BIOS_Name% %BUILD_PATH%\ROM\
 ::if "%Arch%"=="X64" (
 ::  @call BraswellPlatformPkg\BuildCapsulePkg.bat %TARGET% %Arch%
 ::
@@ -613,6 +622,7 @@ echo    /ia32  Set Arch to IA32  (default: X64)
 echo    /vs13  Set compiler to VisualStudio 2013  (default: 2012)
 echo    /vs10  Set compiler to VisualStudio 2010
 echo    /vs08  Set compiler to VisualStudio 2008
+echo    /yL    Enable SPI lock
 echo.
 echo    Platform Types:  %eNB_RVP% %Tblt_RVP% %Embd_RVP%
 echo    Build Targets:   Debug, Release
@@ -637,3 +647,4 @@ echo %date%  %time%
 exit /b %exitCode%
 
 EndLocal
+
diff --git a/BraswellPlatformPkg/GenBIOS.bat b/BraswellPlatformPkg/GenBIOS.bat
deleted file mode 100644
index d64c1a73c7..0000000000
--- a/BraswellPlatformPkg/GenBIOS.bat
+++ /dev/null
@@ -1,11 +0,0 @@
-rem @echo off
-echo GenBIOS.bat
-echo %WROKSPACE%
-find /v "#" BraswellPlatformPkg\%BIOS_ID_FILE% > string
-for /f "tokens=1,2,3" %%i in (string) do set %%i=%%k
-set SPIROM=Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\ROM
-copy /b /y %SPIROM%\bios.rom %SPIROM%\%BOARD_ID%_%1_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM
-copy /b /y %SPIROM%\%BOARD_ID%_%1_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM Stitch
-if exist %SPIROM%\bios.rom del %SPIROM%\bios.rom
-if exist %WORKSPACE%\string del string
-
diff --git a/BraswellPlatformPkg/PlatformPkg.fdf b/BraswellPlatformPkg/PlatformPkg.fdf
index 1aa68abc0d..6c40448e3e 100644
--- a/BraswellPlatformPkg/PlatformPkg.fdf
+++ b/BraswellPlatformPkg/PlatformPkg.fdf
@@ -200,7 +200,7 @@ FV = FVSHELL
   #
 $(FLASH_REGION_FSP_OFFSET) | $(FLASH_REGION_FSP_SIZE)
 gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase | gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize
-FILE = ChvFspBinPkg/FspBinary/BSWFSP.fd
+FILE = ChvFspBinPkg/FspBinary/BswFsp$(TARGET).fd
 
   #
   # VBT FV for FSP
@@ -271,7 +271,7 @@ FvNameGuid         = e17429bd-2b57-40a7-bce8-bd219884a770
 
 !if $(GOP_DRIVER_ENABLE) == TRUE
 FILE FREEFORM = EE62C785-3CF3-4027-8672-6DE4E7FF4317 {
-  SECTION RAW = $(PLATFORM_PACKAGE)/Board/BraswellCR/Vbt/Vbt_BSW_CR.bin
+  SECTION RAW = $(WORKSPACE)/$(PLATFORM_PACKAGE)/Board/BraswellCR/Vbt/Vbt_BSW_CR.bin
   SECTION UI = "IntelGopVbtCR"
 }
 
@@ -279,7 +279,7 @@ FILE FREEFORM = EE62C785-3CF3-4027-8672-6DE4E7FF4317 {
 # HDMI on Port B, DP and HDMI compatible on Port C, DP and HDMI compatible on Port D.
 #
 FILE FREEFORM = CFF9CF38-AE87-440d-80A9-004701FE8D01 {
-  SECTION RAW = $(PLATFORM_PACKAGE)/Board/BraswellCherryHill/Vbt/Vbt_HDMIPB_DPHDMIPC_DPHDMIPD.bin
+  SECTION RAW = $(WORKSPACE)/$(PLATFORM_PACKAGE)/Board/BraswellCherryHill/Vbt/Vbt_HDMIPB_DPHDMIPC_DPHDMIPD.bin
   SECTION UI = "IntelGopVbtHdmiDp"
 }
 !endif
@@ -294,29 +294,6 @@ FILE FREEFORM = CFF9CF38-AE87-440d-80A9-004701FE8D01 {
 # module statements.
 #
 ################################################################################
-[FV.FVRECOVERY_COMPONENTS]
-FvAlignment        = 16         #FV alignment and FV attributes setting.
-ERASE_POLARITY     = 1
-MEMORY_MAPPED      = TRUE
-STICKY_WRITE       = TRUE
-LOCK_CAP           = TRUE
-LOCK_STATUS        = TRUE
-WRITE_DISABLED_CAP = TRUE
-WRITE_ENABLED_CAP  = TRUE
-WRITE_STATUS       = TRUE
-WRITE_LOCK_CAP     = TRUE
-WRITE_LOCK_STATUS  = TRUE
-READ_DISABLED_CAP  = TRUE
-READ_ENABLED_CAP   = TRUE
-READ_STATUS        = TRUE
-READ_LOCK_CAP      = TRUE
-READ_LOCK_STATUS   = TRUE
-
-INF  ChvRefCodePkg/CherryViewSoc/SouthCluster/Usb/Pei/PchUsb.inf
-INF  MdeModulePkg/Bus/Pci/XhciPei/XhciPei.inf
-INF  MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf
-INF  MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf
-
 [FV.FVRECOVERY2]
 BlockSize          = $(FLASH_BLOCK_SIZE)
 FvAlignment        = 16         #FV alignment and FV attributes setting.
@@ -337,11 +314,11 @@ READ_LOCK_CAP      = TRUE
 READ_LOCK_STATUS   = TRUE
 FvNameGuid         = B73FE497-B92E-416e-8326-45AD0D270092
 
-INF $(PLATFORM_PACKAGE)/PlatformInitPei/PlatformEarlyInit.inf
-
+INF $(PLATFORM_PACKAGE)/Common/PlatformPei/PostSilicon/PostSiliconInit.inf
+INF  ChvRefCodePkg/CherryViewSoc/SouthCluster/Usb/Pei/PchUsb.inf
 INF $(PLATFORM_RC_PACKAGE)/CherryViewSoc/SouthCluster/SmmControl/Pei/SmmControl.inf
 INF $(PLATFORM_RC_PACKAGE)/CherryViewSoc/NorthCluster/SmmAccess/Pei/SmmAccess.inf
-INF BraswellPlatformPkg/IntelSiliconBasic/PiSmmCommunication/PiSmmCommunicationPei.inf
+INF BraswellPlatformPkg/Common/Silicon/IntelSiliconBasic/PiSmmCommunication/PiSmmCommunicationPei.inf
 INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
 INF $(PLATFORM_RC_PACKAGE)/CherryViewSoc/CPU/CpuS3/MpS3.inf
 
@@ -384,14 +361,12 @@ READ_LOCK_CAP      = TRUE
 READ_LOCK_STATUS   = TRUE
 FvNameGuid         = B73FE497-B92E-416e-8326-45AD0D270091
 
-INF FILE_GUID=1BA0062E-C779-4582-8566-336AE8F78F09 USE=IA32 IntelFspWrapperPkg/FspWrapperSecCore/FspWrapperSecCore.inf
+INF IntelFspWrapperPkg/FspWrapperSecCore/FspWrapperSecCore.inf
 INF MdeModulePkg/Core/Pei/PeiMain.inf
 INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
 INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
 INF MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf
 INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
-
-
 INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
 
 !if $(CAPSULE_ENABLE) == TRUE
@@ -404,7 +379,7 @@ INF  MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf
 !endif
 !endif
 
-INF $(PLATFORM_PACKAGE)/PlatformPei/PlatformPei.inf
+INF $(PLATFORM_PACKAGE)/Common/PlatformPei/PlatformPei.inf
 INF IntelFspWrapperPkg/FspInitPei/FspInitPei.inf
 
 [FV.FVMAIN]
@@ -427,53 +402,23 @@ READ_LOCK_CAP      = TRUE
 READ_LOCK_STATUS   = TRUE
 FvNameGuid         = A881D567-6CB0-4eee-8435-2E72D33E45B5
 
-APRIORI DXE {
-  INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
-  INF  MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf
-  INF  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
-  }
+!include Include/Build/Edk2CoreDxe.fdf
 
-  #
-  # EDK II Related Platform codes
-  #
-INF MdeModulePkg/Core/Dxe/DxeMain.inf
-INF $(PLATFORM_PACKAGE)/PlatformDxe/PlatformDxe.inf
-INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
-INF MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf
-INF BraswellPlatformPkg/PcdConfigHook/DxePcdConfigHook.inf
-!if $(ACPI50_ENABLE) == TRUE
-INF  MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
-INF  MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
-INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
-!endif
+#
+# EDK II Related Platform codes
+#
+
+INF $(PLATFORM_PACKAGE)/Common/PlatformDxe/PlatformDxe.inf
+INF BraswellPlatformPkg/Common/PcdConfigHook/DxePcdConfigHook.inf
 
-INF IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxe.inf
-INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
-INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
-INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
-INF MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
-INF MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
-INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
-
-INF IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
-INF MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
-
-INF BraswellPlatformPkg/IntelSiliconBasic/CpuInit/MpCpu.inf
-INF MdeModulePkg/Universal/Metronome/Metronome.inf
-INF IntelFspWrapperPkg/FspNotifyDxe/FspNotifyDxe.inf
-INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
-INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
-INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
-
-INF  BraswellPlatformPkg/Flash/SpiFlashParts/MX25/MX25.inf
-INF  BraswellPlatformPkg/Flash/SpiFlashParts/W25/W25.inf
+INF  BraswellPlatformPkg/Common/Flash/SpiFlashParts/MX25/MX25.inf
 !if $(SMM_VARIABLE_ENABLE) == TRUE
   # Smm solution for variable
   INF $(PLATFORM_RC_PACKAGE)/CherryViewSoc/SouthCluster/Spi/Smm/PchSpiSmm.inf
-  INF BraswellPlatformPkg/Flash/SpiDeviceDxe/SpiDeviceSmm.inf
-  INF BraswellPlatformPkg/Flash/SpiDeviceDxe/SpiDeviceSmmDxe.inf
-  INF BraswellPlatformPkg/Flash/FvbRuntimeDxe/FvbSmm.inf
-  INF BraswellPlatformPkg/Flash/FvbRuntimeDxe/FvbSmmDxe.inf
+  INF BraswellPlatformPkg/Common/Flash/SpiDeviceDxe/SpiDeviceSmm.inf
+  INF BraswellPlatformPkg/Common/Flash/SpiDeviceDxe/SpiDeviceSmmDxe.inf
+  INF BraswellPlatformPkg/Common/Flash/FvbRuntimeDxe/FvbSmm.inf
+  INF BraswellPlatformPkg/Common/Flash/FvbRuntimeDxe/FvbSmmDxe.inf
   INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
   !if $(SECURE_BOOT_ENABLE)
     INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
@@ -484,8 +429,8 @@ INF  BraswellPlatformPkg/Flash/SpiFlashParts/W25/W25.inf
 !else
   # Runtime solution for variable
   INF $(PLATFORM_RC_PACKAGE)/CherryViewSoc/SouthCluster/Spi/RuntimeDxe/PchSpiRuntime.inf
-  INF BraswellPlatformPkg/SpiDeviceDxe/SpiDeviceDxe.inf
-  INF BraswellPlatformPkg/FvbRuntimeDxe/FvbRuntimeDxe.inf
+  INF BraswellPlatformPkg/Common/SpiDeviceDxe/SpiDeviceDxe.inf
+  INF BraswellPlatformPkg/Common/FvbRuntimeDxe/FvbRuntimeDxe.inf
   INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
   !if $(SECURE_BOOT_ENABLE)
     INF  SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf
@@ -495,40 +440,16 @@ INF  BraswellPlatformPkg/Flash/SpiFlashParts/W25/W25.inf
   !endif
 !endif
 
-INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
-INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
-INF PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
-INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
-
-INF $(PLATFORM_PACKAGE)/Setup/PlatformSetupDxe.inf
-
-!if $(DATAHUB_ENABLE) == TRUE
-INF IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf
-!endif
-INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
-
+INF $(PLATFORM_PACKAGE)/Common/Setup/PlatformSetupDxe.inf
 INF $(PLATFORM_RC_PACKAGE)/Platform/PlatformEmmc/Dxe/PlatformEmmcDxe.inf
-
-#
-# EDK II Related Silicon codes
-#
-!if $(SEC_ENABLE) == TRUE
-!endif
-
-
-INF PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf
 INF $(PLATFORM_RC_PACKAGE)/CherryViewSoc/SouthCluster/SmmControl/RuntimeDxe/SmmControl.inf
 INF $(PLATFORM_RC_PACKAGE)/CherryViewSoc/SouthCluster/Reset/RuntimeDxe/PchReset.inf
 INF $(PCH_INIT_ROOT)/Dxe/PchInitDxe.inf
 INF $(PLATFORM_RC_PACKAGE)/CherryViewSoc/SouthCluster/PchSmiDispatcher/Smm/PchSmiDispatcher.inf
-
-INF BraswellPlatformPkg/IntelSiliconBasic/PciHostBridge/PciHostBridge.inf
+INF BraswellPlatformPkg/Common/Silicon/IntelSiliconBasic/PciHostBridge/PciHostBridge.inf
 INF $(PLATFORM_RC_PACKAGE)/CherryViewSoc/NorthCluster/SmmAccess/Dxe/SmmAccess.inf
 INF $(PLATFORM_RC_PACKAGE)/CherryViewSoc/NorthCluster/ChvInit/Dxe/ChvInit.inf
 
-!if $(SEC_ENABLE) == TRUE
-!endif
-
 !if $(TPM_ENABLED) == TRUE
 INF SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf
 INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
@@ -544,149 +465,47 @@ INF SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf
 !endif
 !endif
 
-#
-# EDK II Related Platform codes
-#
-INF $(PLATFORM_PACKAGE)/Acpi/AcpiSmm/AcpiSmm.inf
-INF $(PLATFORM_PACKAGE)/AdvancedFeature/PciPlatform/PciPlatform.inf
+INF $(PLATFORM_PACKAGE)/Common/Acpi/AcpiSmm/AcpiSmm.inf
+INF $(PLATFORM_PACKAGE)/Common/Feature/PciPlatform/PciPlatform.inf
 INF $(PLATFORM_RC_PACKAGE)/CherryViewSoc/CPU/SampleCode/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.inf
+INF $(PLATFORM_PACKAGE)/Common/PlatformSmm/PlatformSmm.inf
 
 !if $(GOP_DRIVER_ENABLE) == TRUE
-INF $(PLATFORM_PACKAGE)/FspSupport/GraphicsOutputDxe/GraphicsOutputDxe.inf
+INF $(PLATFORM_PACKAGE)/Common/FspSupport/GraphicsOutputDxe/GraphicsOutputDxe.inf
 !endif
 
-#INF $(PLATFORM_RC_PACKAGE)/CherryViewSoc/SouthCluster/Pnp/Dxe/PnpDxe.inf
-
-#
-# SMM
-#
-INF MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
-INF MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
-INF BraswellPlatformPkg/IntelSiliconBasic/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
-INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
-INF MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf
-INF BraswellPlatformPkg/IntelSiliconBasic/PiSmmCommunication/PiSmmCommunicationSmm.inf
 INF $(PLATFORM_RC_PACKAGE)/CherryViewSoc/CPU/PowerManagement/Smm/PowerManagement.inf
 
 #
 # ACPI
 #
-INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
-INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
-#INF $(PLATFORM_RC_PACKAGE)/DigitalThermalSensor/Smm/DigitalThermalSensor.inf
 INF RuleOverride = ACPITABLE2 $(PLATFORM_RC_PACKAGE)/CherryViewSoc/CPU/AcpiTables/CpuAcpiTables.inf
 INF RuleOverride = ACPITABLE $(PLATFORM_RC_PACKAGE)/AcpiTablesPCAT/AcpiTables.inf
-INF $(PLATFORM_PACKAGE)/Acpi/AcpiPlatform/AcpiPlatform.inf
+INF $(PLATFORM_PACKAGE)/Common/Acpi/AcpiPlatform/AcpiPlatform.inf
 INF RuleOverride = DRIVER_ACPITABLE $(PLATFORM_PACKAGE)/Board/BraswellCR/Acpi/Acpi.inf
 INF RuleOverride = DRIVER_ACPITABLE $(PLATFORM_PACKAGE)/Board/BraswellCherryHill/Acpi/Acpi.inf
 
-#
-# PCI
-#
-INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
 INF $(PLATFORM_RC_PACKAGE)/CherryViewSoc/NorthCluster/ISPDxe/ISPDxe.inf
 
 #
 # Network Modules
 #
-!if $(NETWORK_ENABLE) == TRUE
-  FILE DRIVER = 22DE1691-D65D-456a-993E-A253DD1F308C {
-    SECTION PE32 = BraswellPlatformPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi
-    SECTION UI = "UNDI"
-  }
-  INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-  INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  !if $(NETWORK_IP6_ENABLE) == TRUE
-  INF  NetworkPkg/Ip6Dxe/Ip6Dxe.inf
-  INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-  INF  NetworkPkg/IpSecDxe/IpSecDxe.inf
-  INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
-  INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-  !endif
-  !if $(NETWORK_IP6_ENABLE) == TRUE
-  INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  INF  NetworkPkg/TcpDxe/TcpDxe.inf
-  !else
-  INF  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
-  !endif
-  !if $(NETWORK_VLAN_ENABLE) == TRUE
-  INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  !endif
-  !if $(NETWORK_ISCSI_ENABLE) == TRUE
-    !if $(NETWORK_IP6_ENABLE) == TRUE
-    INF  NetworkPkg/IScsiDxe/IScsiDxe.inf
-    !else
-    INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
-    !endif
-  !endif
-!endif
-
-
-
-INF BraswellPlatformPkg/SerialDxe/SerialDxe.inf
+FILE DRIVER = 22DE1691-D65D-456a-993E-A253DD1F308C {
+  SECTION PE32 = BraswellPlatformPkg/Common/Silicon/UNDI/RealtekUndi/Rtl8111gUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi
+  SECTION UI = "UNDI"
+}
 
 INF $(PLATFORM_RC_PACKAGE)/CherryViewSoc/SouthCluster/SDControllerDxe/MmcHostDxe.inf
 INF $(PLATFORM_RC_PACKAGE)/CherryViewSoc/SouthCluster/SDMediaDeviceDxe/MmcMediaDeviceDxe.inf
-
-#
-# IDE/SCSI/AHCI
-#
-INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
-INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
-INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
-!if $(SATA_ENABLE) == TRUE
 INF $(PLATFORM_RC_PACKAGE)/CherryViewSoc/SouthCluster/SataController/Dxe/SataController.inf
-INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
-INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
-!if $(SCSI_ENABLE) == TRUE
-INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
-INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
-!endif
-!endif
-
-
-#
-# Console
-#
-INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
-INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
-INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
-INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
-INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
-INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
-INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
 
 
 #
-# USB
-#
-!if $(USB_ENABLE) == TRUE
-INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
-INF MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
-INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
-INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
-INF MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
-INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
-INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
-!endif
-
-#
 # SMBIOS
 #
-INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
-INF $(PLATFORM_PACKAGE)/AdvancedFeature/SmBiosMiscDxe/SmbiosMiscDxe.inf
+INF $(PLATFORM_PACKAGE)/Common/Feature/SmBiosMiscDxe/SmbiosMiscDxe.inf
 INF $(PLATFORM_RC_PACKAGE)/CherryViewSoc/NorthCluster/SmBiosMemory/Dxe/SmBiosMemory.inf
 
-
-INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
-
 #
 # FAT file system
 #
@@ -698,38 +517,10 @@ FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {
 # Logo
 #
 FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
-SECTION RAW = BraswellPlatformPkg/AdvancedFeature/Logo/Logo.bmp
+SECTION RAW = BraswellPlatformPkg/Common/Feature/Logo/Logo.bmp
 SECTION UI = "Logo"
 }
 
-[FV.FVSHELL]
-BlockSize          = $(FLASH_BLOCK_SIZE)
-FvAlignment        = 16
-ERASE_POLARITY     = 1
-MEMORY_MAPPED      = TRUE
-STICKY_WRITE       = TRUE
-LOCK_CAP           = TRUE
-LOCK_STATUS        = TRUE
-WRITE_DISABLED_CAP = TRUE
-WRITE_ENABLED_CAP  = TRUE
-WRITE_STATUS       = TRUE
-WRITE_LOCK_CAP     = TRUE
-WRITE_LOCK_STATUS  = TRUE
-READ_DISABLED_CAP  = TRUE
-READ_ENABLED_CAP   = TRUE
-READ_STATUS        = TRUE
-READ_LOCK_CAP      = TRUE
-READ_LOCK_STATUS   = TRUE
-
-FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {
-#          SECTION PE32 = EdkShellBinPkg/FullShell/$(EDK_DXE_ARCHITECTURE)/Shell_Full.efi
-# LZMA Compress
-       SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {
-         #SECTION PE32 = EdkShellBinPkg/FullShell/$(EDK_DXE_ARCHITECTURE)/Shell_Full.efi
-         SECTION PE32 = ShellBinPkg/UefiShell/$(EDK_DXE_ARCHITECTURE)/Shell.efi
-       }
-     }
-
 [FV.FVMAIN_COMPACT]
 BlockSize          = $(FLASH_BLOCK_SIZE)
 FvAlignment        = 16
@@ -756,129 +547,12 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
        }
      }
 
-[FV.SETUP_DATA]
-BlockSize          = $(FLASH_BLOCK_SIZE)
-#NumBlocks         = 0x10
-FvAlignment        = 16
-ERASE_POLARITY     = 1
-MEMORY_MAPPED      = TRUE
-STICKY_WRITE       = TRUE
-LOCK_CAP           = TRUE
-LOCK_STATUS        = TRUE
-WRITE_DISABLED_CAP = TRUE
-WRITE_ENABLED_CAP  = TRUE
-WRITE_STATUS       = TRUE
-WRITE_LOCK_CAP     = TRUE
-WRITE_LOCK_STATUS  = TRUE
-READ_DISABLED_CAP  = TRUE
-READ_ENABLED_CAP   = TRUE
-READ_STATUS        = TRUE
-READ_LOCK_CAP      = TRUE
-READ_LOCK_STATUS   = TRUE
-
-
-[FV.Bios_Update_Data]
-BlockSize          = $(FLASH_BLOCK_SIZE)
-FvAlignment        = 16
-ERASE_POLARITY     = 1
-MEMORY_MAPPED      = TRUE
-STICKY_WRITE       = TRUE
-LOCK_CAP           = TRUE
-LOCK_STATUS        = TRUE
-WRITE_DISABLED_CAP = TRUE
-WRITE_ENABLED_CAP  = TRUE
-WRITE_STATUS       = TRUE
-WRITE_LOCK_CAP     = TRUE
-WRITE_LOCK_STATUS  = TRUE
-READ_DISABLED_CAP  = TRUE
-READ_ENABLED_CAP   = TRUE
-READ_STATUS        = TRUE
-READ_LOCK_CAP      = TRUE
-READ_LOCK_STATUS   = TRUE
-
-FILE FV_IMAGE = 4A538818-5AE0-4eb2-B2EB-488B23657022 {
-       SECTION FV_IMAGE = FVMAIN_COMPACT
-     }
-
-!if $(CAPSULE_ENABLE) == TRUE
-[FV.BiosUpdateCargo]
-BlockSize          = $(FLASH_BLOCK_SIZE)
-FvAlignment        = 16
-ERASE_POLARITY     = 1
-MEMORY_MAPPED      = TRUE
-STICKY_WRITE       = TRUE
-LOCK_CAP           = TRUE
-LOCK_STATUS        = TRUE
-WRITE_DISABLED_CAP = TRUE
-WRITE_ENABLED_CAP  = TRUE
-WRITE_STATUS       = TRUE
-WRITE_LOCK_CAP     = TRUE
-WRITE_LOCK_STATUS  = TRUE
-READ_DISABLED_CAP  = TRUE
-READ_ENABLED_CAP   = TRUE
-READ_STATUS        = TRUE
-READ_LOCK_CAP      = TRUE
-READ_LOCK_STATUS   = TRUE
-
-INF  IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf
-
-FILE RAW = 283FA2EE-532C-484d-9383-9F93B36F0B7E {
-       FV = Bios_Update_Data
-     }
-
-FILE RAW = 98B8D59B-E8BA-48EE-98DD-C295392F1EDB {
-   BraswellPlatformPkg/BiosUpdateConfig/BiosUpdateConfig.ini
-   }
-
-
-[FV.BiosUpdate]
-BlockSize          = $(FLASH_BLOCK_SIZE)
-FvAlignment        = 16
-ERASE_POLARITY     = 1
-MEMORY_MAPPED      = TRUE
-STICKY_WRITE       = TRUE
-LOCK_CAP           = TRUE
-LOCK_STATUS        = TRUE
-WRITE_DISABLED_CAP = TRUE
-WRITE_ENABLED_CAP  = TRUE
-WRITE_STATUS       = TRUE
-WRITE_LOCK_CAP     = TRUE
-WRITE_LOCK_STATUS  = TRUE
-READ_DISABLED_CAP  = TRUE
-READ_ENABLED_CAP   = TRUE
-READ_STATUS        = TRUE
-READ_LOCK_CAP      = TRUE
-READ_LOCK_STATUS   = TRUE
-
-FILE FV_IMAGE = EDBEDF47-6EA3-4512-83C1-70F4769D4BDE {
-!if $(SIGNED_CAPSULE_ENABLE) == TRUE
-  #
-  # Signed Section
-  #
-  SECTION GUIDED A7717414-C616-4977-9420-844712A735BF AUTH_STATUS_VALID = TRUE {
-!endif
-    #
-    # Compressed Section
-    #
-    SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {
-      SECTION FV_IMAGE = BiosUpdateCargo
-    }
-!if $(SIGNED_CAPSULE_ENABLE) == TRUE
-  }
-!endif
-}
-
-[Capsule.Capsule_Reset]
+################################################################################
 #
-# gEfiCapsuleGuid supported by platform
-# { 0x3B6686BD, 0x0D76, 0x4030, { 0xB7, 0x0E, 0xB5, 0x51, 0x9E, 0x2F, 0xC5, 0xA0 }}
+# [FV] CapsuleUpdate
 #
-CAPSULE_GUID  = 3B6686BD-0D76-4030-B70E-B5519E2FC5A0
-CAPSULE_FLAGS = PersistAcrossReset,InitiateReset
-CAPSULE_HEADER_SIZE = 0x20
-
-FV = BiosUpdate
-!endif
+################################################################################
+!include Include/Build/Features.fdf
 
 ################################################################################
 #
@@ -888,227 +562,5 @@ FV = BiosUpdate
 # content of the FFS file.
 #
 ################################################################################
-[Rule.Common.SEC]
-  FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED {
-    TE  TE        Align = 8       $(INF_OUTPUT)/$(MODULE_NAME).efi
-    RAW BIN       Align = 16      |.com
-  }
-
-[Rule.Common.SEC.BINARY]
-  FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED {
-    TE  TE        Align = 8       |.efi
-    RAW BIN       Align = 16      |.com
-  }
-
-[Rule.Common.PEI_CORE]
-  FILE PEI_CORE = $(NAMED_GUID)            {
-    TE       TE    Align = Auto      $(INF_OUTPUT)/$(MODULE_NAME).efi
-    UI       STRING="$(MODULE_NAME)" Optional
-    VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.PEIM]
-  FILE PEIM = $(NAMED_GUID) {
-     PEI_DEPEX PEI_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex
-     TE        TE   Align = Auto       $(INF_OUTPUT)/$(MODULE_NAME).efi
-     UI        STRING="$(MODULE_NAME)" Optional
-     VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.PEIM.BINARY]
-  FILE PEIM = $(NAMED_GUID) {
-     PEI_DEPEX PEI_DEPEX Optional        |.depex
-     PE32        PE32   Align = Auto     |.efi
-     UI        STRING="$(MODULE_NAME)" Optional
-     VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.USER_DEFINED.APINIT]
-  FILE RAW = $(NAMED_GUID) Fixed Align=4K {
-     RAW SEC_BIN |.com
-     }
-
-[Rule.Common.USER_DEFINED.LEGACY16]
-  FILE FREEFORM = $(NAMED_GUID) {
-     UI  STRING="$(MODULE_NAME)" Optional
-     RAW BIN |.bin
-     }
-
-[Rule.Common.USER_DEFINED.ASM16]
-  FILE FREEFORM = $(NAMED_GUID) {
-     UI  STRING="$(MODULE_NAME)" Optional
-     RAW BIN |.com
-   }
-
-[Rule.Common.DXE_CORE]
-  FILE DXE_CORE = $(NAMED_GUID) {
-    PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi
-    UI        STRING="$(MODULE_NAME)" Optional
-    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.UEFI_DRIVER]
-  FILE DRIVER = $(NAMED_GUID) {
-    DXE_DEPEX DXE_DEPEX Optional       $(INF_OUTPUT)/$(MODULE_NAME).depex
-    PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi
-    UI        STRING="$(MODULE_NAME)" Optional
-    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-[Rule.Common.UEFI_DRIVER.NATIVE_BINARY]
-  FILE DRIVER = $(NAMED_GUID) {
-    DXE_DEPEX DXE_DEPEX Optional      $(WORKSPACE)/$(PLATFORM_INTEL_RESTRICT_PACKAGE)/GopDriver/IntelGopDriver.depex
-    PE32      PE32                    |.efi
-    UI        STRING="$(MODULE_NAME)" Optional
-    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.DXE_DRIVER]
-  FILE DRIVER = $(NAMED_GUID) {
-    DXE_DEPEX DXE_DEPEX Optional       $(INF_OUTPUT)/$(MODULE_NAME).depex
-    PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi
-    UI        STRING="$(MODULE_NAME)" Optional
-    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.DXE_DRIVER.BINARY]
-  FILE DRIVER = $(NAMED_GUID) {
-    DXE_DEPEX DXE_DEPEX Optional       |.depex
-    PE32      PE32                     |.efi
-    UI        STRING="$(MODULE_NAME)" Optional
-    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.DXE_DRIVER.DRIVER_ACPITABLE]
-  FILE DRIVER = $(NAMED_GUID) {
-    DXE_DEPEX DXE_DEPEX Optional       $(INF_OUTPUT)/$(MODULE_NAME).depex
-    PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi
-    UI        STRING="$(MODULE_NAME)" Optional
-    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-    RAW ACPI  Optional                |.acpi
-    RAW ASL   Optional                |.aml
-  }
-
-[Rule.Common.DXE_RUNTIME_DRIVER]
-  FILE DRIVER = $(NAMED_GUID) {
-    DXE_DEPEX DXE_DEPEX Optional       $(INF_OUTPUT)/$(MODULE_NAME).depex
-    PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi
-    UI        STRING="$(MODULE_NAME)" Optional
-    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
+!include Include/Build/BuildRule.fdf
 
-[Rule.Common.DXE_SMM_DRIVER]
-  FILE SMM = $(NAMED_GUID) {
-    DXE_DEPEX DXE_DEPEX Optional       $(INF_OUTPUT)/$(MODULE_NAME).depex
-    PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi
-    UI        STRING="$(MODULE_NAME)" Optional
-    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.DXE_SMM_DRIVER.DRIVER_ACPITABLE]
-  FILE SMM = $(NAMED_GUID) {
-    DXE_DEPEX DXE_DEPEX Optional       $(INF_OUTPUT)/$(MODULE_NAME).depex
-    PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi
-    UI        STRING="$(MODULE_NAME)" Optional
-    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-    RAW ACPI  Optional                |.acpi
-    RAW ASL   Optional                |.aml
-  }
-
-[Rule.Common.SMM_CORE]
-  FILE SMM_CORE = $(NAMED_GUID) {
-    DXE_DEPEX DXE_DEPEX Optional       $(INF_OUTPUT)/$(MODULE_NAME).depex
-    PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi
-    UI        STRING="$(MODULE_NAME)" Optional
-    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.UEFI_APPLICATION]
-  FILE APPLICATION = $(NAMED_GUID) {
-    DXE_DEPEX DXE_DEPEX Optional       $(INF_OUTPUT)/$(MODULE_NAME).depex
-    PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi
-    UI        STRING="$(MODULE_NAME)" Optional
-    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.USER_DEFINED]
-  FILE FREEFORM = $(NAMED_GUID) {
-    UI  STRING="$(MODULE_NAME)" Optional
-    RAW BIN                |.bin
-  }
-
-[Rule.Common.USER_DEFINED.ACPITABLE]
-  FILE FREEFORM = $(NAMED_GUID) {
-    RAW ACPI  Optional            |.acpi
-    RAW ASL   Optional            |.aml
-  }
-
-[Rule.Common.USER_DEFINED.ACPITABLE2]
-  FILE FREEFORM = $(NAMED_GUID) {
-    RAW ASL   Optional            |.aml
-  }
-
-#
-# FFS layout for R8 component type
-#
-[Rule.Common.PE32_PEIM]
-  FILE PEIM = $(NAMED_GUID) {
-     PEI_DEPEX PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).depex
-     PE32       PE32     Align = Auto    $(INF_OUTPUT)/$(MODULE_NAME).efi
-     UI       STRING="$(MODULE_NAME)" Optional
-     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.BS_DRIVER]
-  FILE DRIVER = $(NAMED_GUID) {
-    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex
-        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi
-        UI       STRING="$(MODULE_NAME)" Optional
-        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.RT_DRIVER]
-  FILE DRIVER = $(NAMED_GUID) {
-    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex
-        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi
-        UI       STRING="$(MODULE_NAME)" Optional
-        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.APPLICATION]
-  FILE APPLICATION = $(NAMED_GUID) {
-        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi
-        UI       STRING="$(MODULE_NAME)" Optional
-        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.ACPITABLE]
-  FILE FREEFORM = $(NAMED_GUID) {
-    RAW ACPI  Optional            |.acpi
-    RAW ASL   Optional            |.aml
-  }
-
-[Rule.Common.PE32_PEIM.Align32K]
-  FILE PEIM = $(NAMED_GUID) Align=32K {
-     PEI_DEPEX PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).depex
-     PE32       PE32     Align = Auto    $(INF_OUTPUT)/$(MODULE_NAME).efi
-     UI       STRING="$(MODULE_NAME)" Optional
-     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.PE32_PEIM.Align64K]
-  FILE PEIM = $(NAMED_GUID) Align=64K {
-     PEI_DEPEX PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).depex
-     PE32       PE32     Align = Auto    $(INF_OUTPUT)/$(MODULE_NAME).efi
-     UI       STRING="$(MODULE_NAME)" Optional
-     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.BS_DRIVER.NONECOMPRESS]
-  FILE DRIVER = $(NAMED_GUID) {
-    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex
-    COMPRESS PI_NONE {
-        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi
-        UI       STRING="$(MODULE_NAME)" Optional
-        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-    }
-  }
diff --git a/BraswellPlatformPkg/PlatformPkgConfig.dsc b/BraswellPlatformPkg/PlatformPkgConfig.dsc
deleted file mode 100644
index 4cc2fa2105..0000000000
--- a/BraswellPlatformPkg/PlatformPkgConfig.dsc
+++ /dev/null
@@ -1,72 +0,0 @@
-## @file
-#  Contains the Platform Configuration
-#
-#  Copyright (c) 2012 - 2015, 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.
-#
-##
-
-#
-# TRUE is ENABLE. FASLE is DISABLE.
-#
-
-#
-# BIOS selection
-#
-DEFINE MINI_BIOS_ENABLE = FALSE
-
-DEFINE HYBRID_ENABLE = FALSE
-
-#
-# To enable extra configuration for clk gen
-#
-DEFINE CLKGEN_CONFIG_EXTRA_ENABLE=TRUE
-
-DEFINE FSP_BOOT_ENABLE = TRUE
-DEFINE SEC_ENABLE = FALSE
-
-DEFINE TPM_ENABLED = FALSE
-DEFINE FTPM_ENABLE = FALSE
-
-DEFINE ISH_ENABLE = FALSE
-
-!if $(MINI_BIOS_ENABLE) == TRUE
-
-!else # $(MINI_BIOS_ENABLE) == TRUE
-  DEFINE ACPI50_ENABLE = FALSE ## BUGBUG ZWEI4: DxeTscTimerLib Timer Lib uses wrong registers?
-  DEFINE PERFORMANCE_ENABLE = FALSE
-
-  DEFINE SCSI_ENABLE = TRUE
-
-  DEFINE SECURE_BOOT_ENABLE = TRUE
-  DEFINE S3_ENABLE = TRUE
-  DEFINE ACPI_ENABLE = TRUE
-  DEFINE CAPSULE_ENABLE = TRUE
-  DEFINE SIGNED_CAPSULE_ENABLE = TRUE
-  DEFINE SMBIOS_ENABLE = TRUE
-  DEFINE GOP_DRIVER_ENABLE = TRUE
-  DEFINE DATAHUB_ENABLE = TRUE
-  DEFINE USB_ENABLE = TRUE
-  DEFINE ATA_ENABLE = TRUE
-  DEFINE SMM_VARIABLE_ENABLE = TRUE
-
-  DEFINE NETWORK_ENABLE = FALSE
-
-!endif # $(MINI_BIOS_ENABLE) == TRUE
-
-DEFINE NETWORK_ENABLE = TRUE
-DEFINE NETWORK_IP6_ENABLE = TRUE
-DEFINE NETWORK_ISCSI_ENABLE = FALSE
-DEFINE NETWORK_VLAN_ENABLE = FALSE
-
-DEFINE SATA_ENABLE       = TRUE
-DEFINE PCIESC_ENABLE     = TRUE
-
-DEFINE ENABLE_FAST_BOOT  = FALSE
diff --git a/BraswellPlatformPkg/PlatformPkgIA32.dsc b/BraswellPlatformPkg/PlatformPkgIA32.dsc
index 7074a3f010..8748cd24f5 100644
--- a/BraswellPlatformPkg/PlatformPkgIA32.dsc
+++ b/BraswellPlatformPkg/PlatformPkgIA32.dsc
@@ -48,11 +48,14 @@
   DEFINE PROJECT_VLV_ROOT          = ../$(PLATFORM_RC_PACKAGE)/CherryViewSoc/NorthCluster
   DEFINE CHIPSET_MEMORY_CONTROLLER = ValleyView2
 
-  !include BraswellPlatformPkg/AutoPlatformCFG.txt
-  !include BraswellPlatformPkg/PlatformPkgConfig.dsc
-  DEFINE SIGNED_CAPSULE_ENABLE = FALSE
+  !include $(WORKSPACE)/BraswellPlatformPkg/AutoPlatformCFG.txt
+  !include $(WORKSPACE)/BraswellPlatformPkg/PlatformFeatureConfig.dsc
 
-  FLASH_DEFINITION                    = BraswellPlatformPkg/PlatformPkg.fdf
+!if $(ENABLE_FV_BIN)
+  FLASH_DEFINITION                    = $(WORKSPACE)/BraswellPlatformPkg/PlatformFvBinPkg.fdf
+!else
+  FLASH_DEFINITION                    = $(WORKSPACE)/BraswellPlatformPkg/PlatformPkg.fdf
+!endif
   FIX_LOAD_TOP_MEMORY_ADDRESS         = 0x0
   DEFINE   TOP_MEMORY_ADDRESS         = 0x0
 
@@ -61,41 +64,6 @@
   #
   DEFINE   PLATFORM_PCIEXPRESS_BASE   = 0E0000000
 
-  #
-  # Set the global variables for EDK sytle module
-  # EDK_GLOBAL only takes effect to R8 INF.
-  #
-  EDK_GLOBAL GG_SOURCE                 = $(WORKSPACE)/$(PLATFORM2_PACKAGE)/AmiCsm/Restricted/GreensGlacier
-  EDK_GLOBAL AMI_RESTRICTED_SOURCE     = $(WORKSPACE)/$(PLATFORM2_PACKAGE)/AmiCsm/Restricted
-  EDK_GLOBAL INTEL_RESTRICTED_SOURCE   = $(WORKSPACE)/$(PLATFORM_INTEL_RESTRICT_PACKAGE)
-  EDK_GLOBAL PROJECT_VLV_ROOT          = ../$(PLATFORM_RC_PACKAGE)/CherryViewSoc/NorthCluster
-
-  EDK_GLOBAL PLATFORM_PACKAGE          = $(PLATFORM_PACKAGE)
-  EDK_GLOBAL PLATFORM2_PACKAGE         = $(PLATFORM2_PACKAGE)
-  EDK_GLOBAL PLATFORM_RC_PACKAGE       = $(PLATFORM_RC_PACKAGE)
-  EDK_GLOBAL PLATFORM_ECP_PACKAGE      = R8ChvTbltDevicePkg
-  EDK_GLOBAL CPU_ARCH                  = ValleyView2
-  EDK_GLOBAL PROJECT_SC_FAMILY         = IntelPch
-  EDK_GLOBAL PROJECT_SC_ROOT           = ../$(PLATFORM_RC_PACKAGE)/CherryViewSoc/SouthCluster
-  EDK_GLOBAL PROJECT_VLV_ROOT          = ../$(PLATFORM_RC_PACKAGE)/CherryViewSoc/NorthCluster
-  EDK_GLOBAL CHIPSET_MEMORY_CONTROLLER = ValleyView2
-
-  EDK_GLOBAL PROJECT_SC_ROOT           = ../$(PLATFORM_RC_PACKAGE)/CherryViewSoc/SouthCluster
-  EDK_GLOBAL PROJECT_ACPI_ROOT         = ../$(PLATFORM_RC_PACKAGE)/AcpiTables
-  EDK_GLOBAL PROJECT_PPM_ROOT          = ../$(PLATFORM_RC_PACKAGE)/PowerManagement
-  EDK_GLOBAL PROJECT_DTS_ROOT          = ../$(PLATFORM_RC_PACKAGE)/DigitalThermalSensor
-  EDK_GLOBAL PROJECT_SEC_ROOT          = ../$(PLATFORM_RC_PACKAGE)/SeC
-
-  EDK_GLOBAL PROJECT_SC                = SouthCluster
-  EDK_GLOBAL PROJECT_DTS               = DigitalThermalSensor
-  EDK_GLOBAL CHIPSET_MEMORY_CONTROLLER = ValleyView2
-
-  EDK_GLOBAL EFI_ACPI_TABLE_STORAGE_GUID = 7E374E25-8E01-4FEE-87F2-390C23C606CD
-  EDK_GLOBAL EFI_ACPI_OEM_FADT_REVISION  = 0x0001
-
-  EDK_GLOBAL UEFI_PREFIX = Uefi
-  EDK_GLOBAL PI_PERFIX   =
-
   DEFINE PCH_INIT_ROOT          = ChvRefCodePkg/CherryViewSoc/SouthCluster/PchInit
   DEFINE DXE_ARCHITECTURE       = IA32
   DEFINE EDK_DXE_ARCHITECTURE   = Ia32
@@ -115,58 +83,26 @@
 
 ################################################################################
 #
+# Pcd Section - list of all EDK II PCD Entries defined by this Platform
+#
+################################################################################
+!include PlatformPcdIA32.dsc
+
+################################################################################
+#
+# EDK2 Core
+#
+################################################################################
+!include Include/Build/Edk2CorePkgIA32.dsc
+
+################################################################################
+#
 # Library Class section - list of all Library Classes needed by this Platform.
 #
 ################################################################################
 [LibraryClasses.common]
-  #
-  # Entry point
-  #
-  PeiCoreEntryPoint|MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
-  PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
-  DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
-  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
-  UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
-  DxeSmmDriverEntryPoint|IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf
-  PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf
-  #
-  # Basic
-  #
-  BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
-  BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
-  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
-  CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
-  IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
-  PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf
-#  PciLib|MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
-  PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf
-  PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf
-  CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
-  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
-  PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
 
-  #
-  # UEFI & PI
-  #
-  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
-  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
-  UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
-  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
-  HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
-  UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
-  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
-  UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
-  PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
-  PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
-  DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
-  DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
-  UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
-  GenericBdsLib|$(PLATFORM_PACKAGE)/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
-#  PlatformBdsLib|$(PLATFORM_PACKAGE)/Library/PlatformBdsLib/PlatformBdsLib_BB.inf
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-  FlashDeviceLib|$(PLATFORM_PACKAGE)/Library/FlashDeviceLib/FlashDeviceLib.inf
+  FlashDeviceLib|$(PLATFORM_PACKAGE)/Common/Library/FlashDeviceLib/FlashDeviceLib.inf
   #
   # Framework
   #
@@ -179,579 +115,129 @@
   S3PciLib|MdePkg/Library/BaseS3PciLib/BaseS3PciLib.inf
 
   #
-  # Generic Modules
-  #
-!if $(USB_ENABLE) == TRUE
-  UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
-!endif
-!if $(SCSI_ENABLE) == TRUE
-  UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
-!endif
-!if $(NETWORK_ENABLE) == TRUE
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-!endif
-!if $(S3_ENABLE) == TRUE
-  S3Lib|IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
-!endif
-  OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
-!if $(CAPSULE_ENABLE) == TRUE
-  CapsuleLib|IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.inf
-!else
-  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
-!endif
-  SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
-  SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
-  IoApicLib|PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf
-
-  DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
-
-  #
   # CPU
   #
-  MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
-  CpuConfigLib|BraswellPlatformPkg/IntelSiliconBasic/Library/CpuConfigLib/CpuConfigLib.inf
-  LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
+  CpuConfigLib|BraswellPlatformPkg/Common/Silicon/IntelSiliconBasic/Library/CpuConfigLib/CpuConfigLib.inf
+  CpuIA32Lib|$(PLATFORM_PACKAGE)/Common/Library/CpuIA32Lib/CpuIA32Lib.inf
+  StallSmmLib|$(PLATFORM_PACKAGE)/Common/Library/StallSmmLib/StallSmmLib.inf
 
   #
   # ICH
   #
   SmbusLib|ChvRefCodePkg/CherryViewSoc/SouthCluster/Library/SmbusLib/SmbusLib.inf
-  SmmLib|MdePkg/Library/SmmLibNull/SmmLibNull.inf
-  SmmIoLib|$(PLATFORM_PACKAGE)/Library/SmmIo/SmmIoLib.inf
-
-  #PchPlatformLib|ChvRefCodePkg/CherryViewSoc/SouthCluster/Library/PchPlatformLib/PchPlatformLib.inf
+  SmmIoLib|$(PLATFORM_PACKAGE)/Common/Library/SmmIo/SmmIoLib.inf
+  ResetSystemLib|$(PLATFORM_PACKAGE)/Common/Library/ResetSystemLib/ResetSystemLib.inf
 
   #
-  # Platform
+  # RC Common Library
   #
-  ResetSystemLib|$(PLATFORM_PACKAGE)/Library/ResetSystemLib/ResetSystemLib.inf
+  !include $(WORKSPACE)/$(PLATFORM_RC_PACKAGE)/ClientRefCodePkgCommonLib.dsc
 
   #
-  # Misc
+  # FSP platform sample
   #
-!if $(TARGET) == RELEASE
-  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-  SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
-!else
-  DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-  SerialPortLib|BraswellPlatformPkg/Override/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
-!endif
-  PlatformHookLib|BraswellPlatformPkg/Library/PlatformHookLib/PlatformHookLib.inf
-  PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-!if $(TPM_ENABLED) == TRUE
-  TpmCommLib|SecurityPkg/Library/TpmCommLib/TpmCommLib.inf
-  Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
-  Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
+  FspPlatformInfoLib|$(PLATFORM_PACKAGE)/Common/FspSupport/Library/FspPlatformInfoLib/FspPlatformInfoLib.inf
+  FspPlatformSecLib|IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/SecPeiFspPlatformSecLibSample.inf
+  FspHobProcessLib|$(PLATFORM_PACKAGE)/Common/FspSupport/Library/PeiFspHobProcessLib/PeiFspHobProcessLib.inf
+  BltLib|$(PLATFORM_PACKAGE)/Common/FspSupport/Library/FrameBufferBltLib/FrameBufferBltLib.inf
 
-!endif
-  DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
+  RecoveryOemHookLib|$(PLATFORM_PACKAGE)/Common/Library/RecoveryOemHookLib/RecoveryOemHookLib.inf
 
+[LibraryClasses.IA32]
   #
-  # CryptLib
+  # RC Pei Library
   #
-!if $(TPM_ENABLED) == TRUE
-  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
-!endif
+  !include $(WORKSPACE)/$(PLATFORM_RC_PACKAGE)/ClientRefCodePkgPeiLib.dsc
 
-#
-# For R9 compilation
-#
-  CpuIA32Lib|$(PLATFORM_PACKAGE)/Library/CpuIA32Lib/CpuIA32Lib.inf
-
-  StallSmmLib|$(PLATFORM_PACKAGE)/Library/StallSmmLib/StallSmmLib.inf
-
-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
-  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-  PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
-
-  ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
-  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
-  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-  SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
-!if ($(HYBRID_ENABLE) == TRUE)|| ($(FTPM_ENABLE) == TRUE)
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
-  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-!endif
-  TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
-  TrEEPhysicalPresenceLib|SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.inf
-  Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
-  TrEEPpVendorLib|SecurityPkg/Library/TrEEPpVendorLibNull/TrEEPpVendorLibNull.inf
-#
-# RC Common Library
-#
-!include $(PLATFORM_RC_PACKAGE)/ClientRefCodePkgCommonLib.dsc
-
-
-  # FSP lib
-  FspApiLib|IntelFspWrapperPkg/Library/BaseFspApiLib/BaseFspApiLib.inf
-
-  # FSP platform sample
-  FspPlatformInfoLib|$(PLATFORM_PACKAGE)/FspSupport/Library/BaseFspPlatformInfoLibSample/BaseFspPlatformInfoLibSample.inf
-  FspPlatformSecLib|$(PLATFORM_PACKAGE)/Override/IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/SecPeiFspPlatformSecLibSample.inf
-  FspHobProcessLib|$(PLATFORM_PACKAGE)/FspSupport/Library/PeiFspHobProcessLib/PeiFspHobProcessLib.inf
-  BltLib|$(PLATFORM_PACKAGE)/FspSupport/Library/FrameBufferBltLib/FrameBufferBltLib.inf
-  RecoveryOemHookLib|$(PLATFORM_PACKAGE)/Library/RecoveryOemHookLib/RecoveryOemHookLib.inf
-  AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
-  VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
-
-[LibraryClasses.IA32]
-#
-# RC Pei Library
-#
-!include $(PLATFORM_RC_PACKAGE)/ClientRefCodePkgPeiLib.dsc
-
-  TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf
   GpioLib|ChvRefCodePkg/CherryViewSoc/SouthCluster/Library/GpioLib/GpioLib.inf
 
 [LibraryClasses.IA32.SEC]
-  TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf
-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-  HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
-  MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
-  ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
-  SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
-  CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf  # RP_BDW_CorePkgDifference
-  ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
+
 
 
 [LibraryClasses.IA32.PEIM, LibraryClasses.IA32.PEI_CORE]
   #
   # PEI phase common
   #
-
-  BiosIdLib|BraswellPlatformPkg/Library/BiosIdLib/BiosIdLib.inf
+  BiosIdLib|BraswellPlatformPkg/Common/Library/BiosIdLib/BiosIdLib.inf
   I2CLibPei|ChvRefCodePkg/CherryViewSoc/SouthCluster/Library/I2CLibPei/I2CLibPei.inf
-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-  HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
-  MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
-  ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
-  ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
-  MultiPlatformLib|$(PLATFORM_PACKAGE)/Library/MultiPlatformLib/MultiPlatformLib.inf
-!if $(TPM_ENABLED) == TRUE
-  Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.inf
-!endif
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
-  TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf
+  MultiPlatformLib|$(PLATFORM_PACKAGE)/Common/Library/MultiPlatformLib/MultiPlatformLib.inf
+  PeiKscLib|$(PLATFORM_PACKAGE)/Common/Library/Ksc/Pei/PeiKscLib.inf
 
-!if $(PERFORMANCE_ENABLE) == TRUE
-  PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
-!endif
-
-!if $(TARGET) == RELEASE
-  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-  SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
-!else
-  DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
-!endif
-  LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf
+[LibraryClasses.IA32]
 
-PeiKscLib|$(PLATFORM_PACKAGE)/Library/Ksc/Pei/PeiKscLib.inf
-HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf
+  BiosIdLib|BraswellPlatformPkg/Common/Library/BiosIdLib/BiosIdLib.inf
+  DxeKscLib|$(PLATFORM_PACKAGE)/Common/Library/Ksc/Dxe/DxeKscLib.inf
+  EfiRegTableLib|$(PLATFORM_PACKAGE)/Common/Library/EfiRegTableLib/EfiRegTableLib.inf
 
-[LibraryClasses.IA32]
   #
-  # DXE phase common
+  # RC Dxe Library
   #
-  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
-  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
-  ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
-  ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
-  TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf
-
-  TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
-  BiosIdLib|BraswellPlatformPkg/Library/BiosIdLib/BiosIdLib.inf
-!if $(TPM_ENABLED) == TRUE
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
-!endif
-  DxeKscLib|$(PLATFORM_PACKAGE)/Library/Ksc/Dxe/DxeKscLib.inf
-  LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
-  EfiRegTableLib|$(PLATFORM_PACKAGE)/Library/EfiRegTableLib/EfiRegTableLib.inf
+  !include $(WORKSPACE)/$(PLATFORM_RC_PACKAGE)/ClientRefCodePkgDxeLib.dsc
 
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
-
-!if $(TPM_ENABLED) == TRUE
-  Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
-!endif
-  HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
-#
-# RC Dxe Library
-#
-!include $(PLATFORM_RC_PACKAGE)/ClientRefCodePkgDxeLib.dsc
-  CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf  # RP_BDW_CorePkgDifference
-CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf  # RP_BDW_CorePkgDifference
-  CustomizedDisplayLib|MdeModulePkg\Library\CustomizedDisplayLib\CustomizedDisplayLib.inf
 
 [LibraryClasses.IA32.PEIM]
-  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
 
 
 [LibraryClasses.IA32.DXE_DRIVER]
-!if $(PERFORMANCE_ENABLE) == TRUE
-  PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
-!endif
+
 
 [LibraryClasses.IA32.DXE_CORE]
- HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
- MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
- PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-!if $(PERFORMANCE_ENABLE) == TRUE
-  PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
-!endif
-  CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf  # RP_BDW_CorePkgDifference
+
 
 [LibraryClasses.IA32.DXE_SMM_DRIVER]
-  SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf
-  ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf
-  MemoryAllocationLib|MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf
-  LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf
-  SmmCpuPlatformHookLib|BraswellPlatformPkg/IntelSiliconBasic/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf
-  SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf
-!if $(PERFORMANCE_ENABLE) == TRUE
-  PerformanceLib|MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.inf
-!endif
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
-#
-# RC Smm Library
-#
-  !include $(PLATFORM_RC_PACKAGE)/ClientRefCodePkgSmmLib.dsc
+
+  SmmCpuPlatformHookLib|BraswellPlatformPkg/Common/Silicon/IntelSiliconBasic/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf
+
+  #
+  # RC Smm Library
+  #
+  !include $(WORKSPACE)/$(PLATFORM_RC_PACKAGE)/ClientRefCodePkgSmmLib.dsc
   SmmIoLib|$(PLATFORM_RC_PACKAGE)/CherryViewSoc/CPU/SampleCode/Library/SmmIo/SmmIo.inf
   SmmKscLib|$(PLATFORM_RC_PACKAGE)/CherryViewSoc/CPU/SampleCode/Library/Ksc/Smm/SmmKscLib.inf
   DTSHookLib|$(PLATFORM_RC_PACKAGE)/CherryViewSoc/CPU/SampleCode/Library/DTSHookLib/Smm/DTSHookLib.inf
-  CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf  # RP_BDW_CorePkgDifference
 
 [LibraryClasses.IA32.SMM_CORE]
-  MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf
-  SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf
-  ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf
-  SmmCorePlatformHookLib|MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.inf
-  SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf
-
-!if $(TPM_ENABLED) == TRUE
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
-!endif
-!if $(PERFORMANCE_ENABLE) == TRUE
-  PerformanceLib|MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.inf
-!endif
-
-[LibraryClasses.IA32.DXE_RUNTIME_DRIVER]
-  ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
-!if $(TPM_ENABLED) == TRUE
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
-!endif
 
 [LibraryClasses.IA32.UEFI_APPLICATION]
-  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-
-################################################################################
-#
-# Pcd Section - list of all EDK II PCD Entries defined by this Platform
-#
-################################################################################
-[PcdsFeatureFlag.common]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserGrayOutTextStatement|TRUE
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|TRUE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst|FALSE
-!if $(TARGET) == RELEASE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
-!else
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE
-!endif
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE
-
-  ## This PCD specifies whether PS2 keyboard does a extended verification during start.
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPs2KbdExtendedVerification|FALSE
-
-  ## This PCD specifies whether PS2 mouse does a extended verification during start.
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPs2MouseExtendedVerification|FALSE
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|FALSE
-
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE
-
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmProfileEnable|TRUE
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnIdeDisk|FALSE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnFatFloppyDisk|FALSE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnDataCD|FALSE
-
-[PcdsFeatureFlag.X64]
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE
-
-[PcdsFixedAtBuild.common]
-  gFspWrapperTokenSpaceGuid.PcdTemporaryRamSize|0x00020000
-
-  gChvRefCodePkgTokenSpaceGuid.PcdPeiTemporaryRamStackSize|0x10000
-
-!if $(SECURE_BOOT_ENABLE) == TRUE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x22000
-!else
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x7000
-!endif
-  gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize|0x00000800
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize|0x400
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize|0x200000
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeimPerFv|50
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAriSupport|FALSE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPpiSupported|128
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmApSyncTimeout|1000
-  gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE
-!if $(TARGET) == RELEASE
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x3
-!else
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07
-!endif
-!if $(PERFORMANCE_ENABLE) == TRUE
-  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask|0x1
-!else
-  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask|0
-!endif
-
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdEbdaReservedMemorySize|0x10000
-  gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable|$(TOP_MEMORY_ADDRESS)
-  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserSubtitleTextColor|0x0
-  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldTextColor|0x01
-!if $(SECURE_BOOT_ENABLE) == TRUE
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmStackSize|0x20000
-
-  ## Pcd for OptionRom.
-  #  Image verification policy settings:
-  #  ALWAYS_EXECUTE                         0x00000000
-  #  NEVER_EXECUTE                          0x00000001
-  #  ALLOW_EXECUTE_ON_SECURITY_VIOLATION    0x00000002
-  #  DEFER_EXECUTE_ON_SECURITY_VIOLATION    0x00000003
-  #  DENY_EXECUTE_ON_SECURITY_VIOLATION     0x00000004
-  #  QUERY_USER_ON_SECURITY_VIOLATION       0x00000005
-  gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy | 0x00000004
-!endif
-
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVbeEnable|TRUE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVgaEnable|TRUE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0
-#[PcdsFixedAtBuild.IA32.PEIM, PcdsFixedAtBuild.IA32.PEI_CORE, PcdsFixedAtBuild.IA32.SEC]
-
-  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPciBusNumber|0
-  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPciDeviceNumber|31
-  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPciFunctionNumber|0
-  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPciEnableRegisterOffset|0x40
-  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoBarEnableMask|0x02
-  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPciBarRegisterOffset|0x40
-  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPortBaseAddress|0x400
-  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiPm1TmrOffset|0x08
-  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPortBaseAddressMask|0xFF80
-
-[PcdsFixedAtBuild.IA32]
-#  gFspWrapperTokenSpaceGuid.PcdPeiTemporaryRamStackSize|0x2000
-!if $(PERFORMANCE_ENABLE) == TRUE
-  gFspWrapperTokenSpaceGuid.PcdPeiTemporaryRamStackSize|0x1600
-!else
-  gFspWrapperTokenSpaceGuid.PcdPeiTemporaryRamStackSize|0x2600
-!endif
-  gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFC60000
-  gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00023000
-  gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60
-  gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress|0xFFC00000
-  gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00400000
-  gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFF20000
-  gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize|0x0009E000
-  gFspWrapperTokenSpaceGuid.PcdMaxUpdRegionSize|0xB60
-
-[PcdsFixedAtBuild.IA32]
-!if $(TARGET) == RELEASE
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x3
-!else
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07
-!endif
-
-
-[PcdsPatchableInModule.common]
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80380546
-  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x$(PLATFORM_PCIEXPRESS_BASE)
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLegacyBiosCacheLegacyRegion|FALSE
-
-  ## This PCD specifies whether to use the optimized timing for best PS2 detection performance.
-  #  Note this PCD could be set to TRUE for best boot performance and set to FALSE for best device compatibility.
-  #gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdFastPS2Detection|TRUE|BOOLEAN|0x3000000b
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdFastPS2Detection|TRUE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareRevision|0x00010000
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"Intel Corporation"|VOID* |0x80
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSBiosVersion|"Cherryview Platform BIOS"|VOID* |0x80
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSSystemUuid|{0xa5, 0x00, 0x02, 0x88, 0x64, 0x62, 0x45, 0x24, 0x98, 0x6a, 0x9b, 0x77, 0x37, 0xe3, 0x15, 0xcf}
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSSystemManufacturer|"Intel Corporation"|VOID* |0x80
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSSystemVersion|"0.1"|VOID* |0x40
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSSystemSerialNumber|"112233445566"|VOID* |0x80
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSBoardManufacturer|"Intel Corp."|VOID* |0x80
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSBoardVersion|"FAB"|VOID* |0x20
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSBoardSerialNumber|"1"|VOID* |0x80
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSChassisManufacturer|"Intel Corporation"|VOID* |0x80
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSChassisVersion|"0.1"|VOID* |0x20
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSChassisSerialNumber|"serial"|VOID* |0x80
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSChassisAssetTag|"Asset Tag"|VOID* |0x20
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x3F8
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio|FALSE
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId|"Intel "
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId|0x20202020324B4445
-  gEfiEdkIIPlatformTokenSpaceGuid.PcdSsidSvid|0x12348086
-  gPlatformModuleTokenSpaceGuid.PcdCustomizedVbtFile|{0xFF, 0xFF, 0xFF, 0xFF} |4  # Reserve n bytes for customized vbt
-!if $(ENABLE_FAST_BOOT)
-  gPlatformModuleTokenSpaceGuid.PcdEnableFastBoot|TRUE
-!else
-  gPlatformModuleTokenSpaceGuid.PcdEnableFastBoot|FALSE
-!endif
-
-[PcdsDynamicHii.common.DEFAULT]
-  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5 # Variable: L"Timeout"
-
-  gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupport"|gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport"
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState|L"BootState"|gEfiBootStateGuid|0x0|TRUE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|L"ConOutConfig"|gClientCommonModuleTokenSpaceGuid|0x0|100
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|L"ConOutConfig"|gClientCommonModuleTokenSpaceGuid|0x4|31
-
-[PcdsDynamicDefault.common.DEFAULT]
-  gEfiEdkIIPlatformTokenSpaceGuid.PcdPlatformInfo|{0x0}|VOID*|0x100
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0x0
-  gEfiCHVTokenSpaceGuid.PcdBmpImageGuid |{0x87, 0x8A, 0xC2, 0xCC, 0x53, 0x43, 0x46, 0xF2, 0xB5, 0x63, 0x51, 0xF8, 0x9D, 0xAF, 0x56, 0xBA}
-
-  ## This PCD defines the video horizontal resolution.
-  #  This PCD could be set to 0 then video resolution could be at highest resolution.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|0
-  ## This PCD defines the video vertical resolution.
-  #  This PCD could be set to 0 then video resolution could be at highest resolution.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|0
-
-  ## This PCD defines the Console output column and the default value is 25 according to UEFI spec.
-  #  This PCD could be set to 0 then console output could be at max column and max row.
-  #gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|31|UINT32|0x40000006
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|31
-  ## This PCD defines the Console output row and the default value is 80 according to UEFI spec.
-  #  This PCD could be set to 0 then console output could be at max column and max row.
-  #gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|100|UINT32|0x40000007
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|100
-
-  ## The PCD is used to specify the video horizontal resolution of text setup.
-  #gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|800|UINT32|0x50000001
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|800
-  ## The PCD is used to specify the video vertical resolution of text setup.
-  #gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|600|UINT32|0x50000002
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|600
-  ## The PCD is used to specify the console output column of text setup.
-  #gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutColumn|100|UINT32|0x50000003
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutColumn|100
-  ## The PCD is used to specify the console output column of text setup.
-  #gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutRow|31|UINT32|0x50000004
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutRow|31
-
-  gPlatformModuleTokenSpaceGuid.PcdBootToFirmwareUserInterface|FALSE
-!if $(TPM_ENABLED) == TRUE
-  ## Put Ptt guid here: e.g. { 0xf9c6a62f, 0xc60f, 0x4b44, { 0xa6, 0x29, 0xed, 0x3d, 0x40, 0xae, 0xfa, 0x5f } }
-  ## TPM1.2 { 0x8b01e5b6, 0x4f19, 0x46e8, { 0xab, 0x93, 0x1c, 0x53, 0x67, 0x1b, 0x90, 0xcc } }
-  ## TPM2.0Dtpm { 0x286bf25a, 0xc2c3, 0x408c, { 0xb3, 0xb4, 0x25, 0xe6, 0x75, 0x8b, 0x73, 0x17 } }
-  ## TPM2.0Ptt { 0x72cd3a7b, 0xfea5, 0x4f5e, { 0x91, 0x65, 0x4d, 0xd1, 0x21, 0x87, 0xbb, 0x13 } }
-  #gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0xb6, 0xe5, 0x01, 0x8b, 0x19, 0x4f, 0xe8, 0x46, 0xab, 0x93, 0x1c, 0x53, 0x67, 0x1b, 0x90, 0xcc}
-  #gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x7b, 0x3a, 0xcd, 0x72, 0xA5, 0xFE, 0x5e, 0x4f, 0x91, 0x65, 0x4d, 0xd1, 0x21, 0x87, 0xbb, 0x13}
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x5a, 0xf2, 0x6b, 0x28, 0xc3, 0xc2, 0x8c, 0x40, 0xb3, 0xb4, 0x25, 0xe6, 0x75, 0x8b, 0x73, 0x17}
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmAutoDetection|FALSE
-
-  gEfiSecurityPkgTokenSpaceGuid.PcdTrEEAvailableEventLogs|0x00000001
-  gEfiSecurityPkgTokenSpaceGuid.PcdTrEEHashAlgorithmBitmap|0
-  gEfiSecurityPkgTokenSpaceGuid.PcdTrEESupportedEventLogs|0xFFFFFFFF
-  gEfiSecurityPkgTokenSpaceGuid.PcdTrEEProtocolVersion|0x0001
-
-  gClientCommonModuleTokenSpaceGuid.PcdTpm2HierarchyChangeAuthPlatform|1
-  gClientCommonModuleTokenSpaceGuid.PcdTpm2HierarchyControlPlatform|1
-  gClientCommonModuleTokenSpaceGuid.PcdTpm2HierarchyControlEndorsement|1
-  gClientCommonModuleTokenSpaceGuid.PcdTpm2HierarchyControlOwner|1
-  gClientCommonModuleTokenSpaceGuid.PcdTpm2ChangeEps|0
-  gClientCommonModuleTokenSpaceGuid.PcdTpm2ChangePps|0
-  gClientCommonModuleTokenSpaceGuid.PcdTpm2Clear|0
-
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2InitializationPolicy|1
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2SelfTestPolicy|1
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2ScrtmPolicy|1
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy|1
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmScrtmPolicy|1
-!endif
-
-[PcdsDynamicExDefault.common.DEFAULT]
-  gEfiEdkIIPlatformTokenSpaceGuid.PcdSystemConfiguration|{0x0}|VOID*|0x3A0
-
-[PcdsDynamicExVpd.common.DEFAULT]
-#  gEfiMdeModulePkgTokenSpaceGuid.PcdRsa2048Sha256PublicKeyBuffer|*|32|{0x91, 0x29, 0xc4, 0xbd, 0xea, 0x6d, 0xda, 0xb3, 0xaa, 0x6f, 0x50, 0x16, 0xfc, 0xdb, 0x4b, 0x7e, 0x3c, 0xd6, 0xdc, 0xa4, 0x7a, 0x0e, 0xdd, 0xe6, 0x15, 0x8c, 0x73, 0x96, 0xa2, 0xd4, 0xa6, 0x4d}
 
 [Components.IA32]
 
   IntelFspWrapperPkg/FspWrapperSecCore/FspWrapperSecCore.inf {
   <LibraryClasses>
-    FspPlatformInfoLib|$(PLATFORM_PACKAGE)/FspSupport/Library/BaseFspPlatformInfoLibSample/BaseFspPlatformInfoLibSample.inf
+    FspPlatformInfoLib|$(PLATFORM_PACKAGE)/Common/FspSupport/Library/FspPlatformInfoLib/FspPlatformInfoLib.inf
     DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
     SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
   <PcdsPatchableInModule>
     gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043
   <PcdsFixedAtBuild>
     gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x27
-  <Defines>
-    FILE_GUID = 1BA0062E-C779-4582-8566-336AE8F78F09
-}
+  }
+
   IntelFspWrapperPkg/FspInitPei/FspInitPei.inf {
     <LibraryClasses>
       PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
   }
 
-  MdeModulePkg/Core/Pei/PeiMain.inf {
-!if $(TARGET) == DEBUG
-    <PcdsFixedAtBuild>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
-!endif
-    <PcdsPatchableInModule>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046
-  }
-  MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
-  MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
-#
-# RC PEI Component
-#
-!include $(PLATFORM_RC_PACKAGE)/ClientRefCodePkgPei.dsc
 
-  MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf
-  MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
+  #
+  # RC PEI Component
+  #
+  !include $(WORKSPACE)/$(PLATFORM_RC_PACKAGE)/ClientRefCodePkgPei.dsc
 
-  $(PLATFORM_PACKAGE)/PlatformPei/PlatformPei.inf {
+  $(PLATFORM_PACKAGE)/Common/PlatformPei/PlatformPei.inf {
     <LibraryClasses>
        NULL|BraswellPlatformPkg\Board\BraswellCR\BoardInit\BoardInit.inf
        NULL|BraswellPlatformPkg\Board\BraswellCherryHill\BoardInit\BoardInit.inf
        NULL|BraswellPlatformPkg\Board\WesternDigital\BoardInit\BoardInit.inf
-#      SeCUmaLib|ChvRefCodePkg/Txe/SeCUma/SeCUma.inf
 !if ($(FTPM_ENABLED) == TRUE)
       fTPMInitLib|ChvRefCodePkg/Txe/fTPM/Pei/fTPMInitPei.inf
-!endif
-    !if $(TARGET) == DEBUG
+      !endif
+!if $(TARGET) == DEBUG
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-    !else
+!else
       DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-    !endif
+!endif
       PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
 
 !if $(ISH_ENABLE) == TRUE
@@ -759,83 +245,28 @@ CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExcept
 !endif
     <BuildOptions>
 !if $(SeC_DEBUG_INFO_ENABLE) == TRUE
-  *_*_IA32_CC_FLAGS      = /DSeC_DEBUG_INFO=1
+      *_*_IA32_CC_FLAGS      = /DSeC_DEBUG_INFO=1
 !else
-  *_*_IA32_CC_FLAGS      = /DSeC_DEBUG_INFO=0
+      *_*_IA32_CC_FLAGS      = /DSeC_DEBUG_INFO=0
 !endif
 !if $(FTPM_ENABLE)==TRUE
-  *_*_IA32_CC_FLAGS = /D FTPM_ENABLE
+      *_*_IA32_CC_FLAGS = /D FTPM_ENABLE
 !endif
 !if $(ISH_ENABLE) == TRUE
-  *_*_IA32_CC_FLAGS      = /DISH_ENABLE=1
+      *_*_IA32_CC_FLAGS      = /DISH_ENABLE=1
 !endif
   }
 
-!if $(TPM_ENABLED) == TRUE
-  SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
-  SecurityPkg/Tcg/TcgPei/TcgPei.inf {
-    <LibraryClasses>
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-}
-!endif
-  $(PLATFORM_PACKAGE)/PlatformInitPei/PlatformEarlyInit.inf {
+
+  $(PLATFORM_PACKAGE)/Common/PlatformPei/PostSilicon/PostSiliconInit.inf {
     <LibraryClasses>
-      NULL|BraswellPlatformPkg\Board\BraswellCR\BoardInit\BoardInitLate.inf
-      NULL|BraswellPlatformPkg\Board\BraswellCherryHill\BoardInit\BoardInitLate.inf
-      NULL|BraswellPlatformPkg\Board\WesternDigital\BoardInit\BoardInitLate.inf
 !if $(TARGET) != RELEASE
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
 !endif
       PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
   }
 
-  MdeModulePkg/Universal/PCD/Pei/Pcd.inf
-
-  UefiCpuPkg/CpuIoPei/CpuIoPei.inf
-  UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
-  BraswellPlatformPkg/IntelSiliconBasic/PiSmmCommunication/PiSmmCommunicationPei.inf
-
-!if $(CAPSULE_ENABLE) == TRUE
-  MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
-!endif
-  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {
-    <LibraryClasses>
-    NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
-  }
-
-!if ($(TPM_ENABLED) == TRUE)
-   SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf {
-    <LibraryClasses>
-      NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
-      NULL|ChvRefCodePkg/Txe/Library/Tpm2DeviceLibSeC/Tpm2InstanceLibFtpm.inf
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-  }
-
-   SecurityPkg/Tcg/TrEEPei/TrEEPei.inf {
-    <LibraryClasses>
-#      Tpm2DeviceLib|BraswellPlatformPkg/Restricted/Override/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
-      NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
-!if $(FTPM_ENABLE) == TRUE
-      NULL|ChvRefCodePkg/Txe/Library/Tpm2DeviceLibSeC/Tpm2InstanceLibFtpm.inf
-!endif
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-  }
-
-!if $(FTPM_ENABLE) == TRUE
-  ChvRefCodePkg/Txe/fTPM/Pei/fTPMInitPei.inf
-!endif
-
-!endif
-
-!if $(ACPI50_ENABLE) == TRUE
-  MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf{
-    <LibraryClasses>
-      TimerLib|PerformancePkg/Library/TscTimerLib/PeiTscTimerLib.inf
-  }
-
-!endif
+  BraswellPlatformPkg/Common/Silicon/IntelSiliconBasic/PiSmmCommunication/PiSmmCommunicationPei.inf
 
   #
   # Recovery Module
@@ -846,195 +277,65 @@ CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExcept
   MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf
 
 [Components.IA32]
-  #
-  # EDK II Related Platform codes
-  #
-  MdeModulePkg/Core/Dxe/DxeMain.inf {
-    <PcdsPatchableInModule>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046
-    <LibraryClasses>
-      NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
-  }
-  IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf {
-    <PcdsPatchableInModule>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043
-    <PcdsFixedAtBuild>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x27
-  }
-
-  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf {
-    <LibraryClasses>
-      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-  }
-
-  BraswellPlatformPkg/PcdConfigHook/DxePcdConfigHook.inf
 
+  BraswellPlatformPkg/Common/PcdConfigHook/DxePcdConfigHook.inf
   MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
 
-  IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxe.inf
-  UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
-!if $(DXE_ARCHITECTURE) == X64
-!if $(CAPSULE_ENABLE) == TRUE
-  MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf {
-    <LibraryClasses>
-      CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf
-  }
-!endif
-!endif
-  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
-  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf  {
-    <LibraryClasses>
-!if $(TARGET) != RELEASE
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-!endif
-  }
-  MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
-
-  MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
-  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf{
-    <LibraryClasses>
-!if $(SECURE_BOOT_ENABLE) == TRUE
-      NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
-!endif
-#!if $(TPM_ENABLED) == TRUE
-     # NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf
-#!endif
-!if ($(FTPM_ENABLE) == TRUE) || ($(TPM_ENABLED) == TRUE)
-      NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf
-!endif
-  }
-
-MdeModulePkg/Universal/Metronome/Metronome.inf
+  #
+  # RC DXE Component
+  #
+  !include $(WORKSPACE)/$(PLATFORM_RC_PACKAGE)/ClientRefCodePkgDxe.dsc
 
-#
-# RC DXE Component
-#
-!include $(PLATFORM_RC_PACKAGE)/ClientRefCodePkgDxe.dsc
+  BraswellPlatformPkg/Common/Silicon/IntelSiliconBasic/CpuInit/MpCpu.inf
+  BraswellPlatformPkg/Common/Silicon/IntelSiliconBasic/PciHostBridge/PciHostBridge.inf
 
-BraswellPlatformPkg\IntelSiliconBasic\CpuInit\MpCpu.inf
-BraswellPlatformPkg\IntelSiliconBasic\PciHostBridge\PciHostBridge.inf
 
-IntelFspWrapperPkg/FspNotifyDxe/FspNotifyDxe.inf
 
-IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf{
-  <LibraryClasses>
-   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
-   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-   PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
-   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
-   PlatformBdsLib|$(PLATFORM_PACKAGE)/Library/PlatformBdsLib/PlatformBdsLib.inf
-   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
-   #TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.inf
+  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf{
+    <LibraryClasses>
+     OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
+     IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
+     PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
+     BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
+     PlatformBdsLib|$(PLATFORM_PACKAGE)/Common/Library/PlatformBdsLib/PlatformBdsLib.inf
+     Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
 !if $(TPM_ENABLED) == TRUE
-   NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
+     NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
 !endif
 !if $(FTPM_ENABLE) == TRUE
-   NULL|ChvRefCodePkg/Txe/Library/Tpm2DeviceLibSeC/Tpm2InstanceLibFtpm.inf
+     NULL|ChvRefCodePkg/Txe/Library/Tpm2DeviceLibSeC/Tpm2InstanceLibFtpm.inf
 !endif
 }
 
-  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
-  MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
-
-  BraswellPlatformPkg/Flash/SpiFlashParts/MX25/MX25.inf
-  BraswellPlatformPkg/Flash/SpiFlashParts/W25/W25.inf
+  BraswellPlatformPkg/Common/Flash/SpiFlashParts/MX25/MX25.inf
 
 !if $(SMM_VARIABLE_ENABLE) == TRUE
-  BraswellPlatformPkg/Flash/SpiDeviceDxe/SpiDeviceSmm.inf
-  BraswellPlatformPkg/Flash/SpiDeviceDxe/SpiDeviceSmmDxe.inf
-  BraswellPlatformPkg/Flash/FvbRuntimeDxe/FvbSmm.inf
-  BraswellPlatformPkg/Flash/FvbRuntimeDxe/FvbSmmDxe.inf
+  BraswellPlatformPkg/Common/Flash/SpiDeviceDxe/SpiDeviceSmm.inf
+  BraswellPlatformPkg/Common/Flash/SpiDeviceDxe/SpiDeviceSmmDxe.inf
+  BraswellPlatformPkg/Common/Flash/FvbRuntimeDxe/FvbSmm.inf
+  BraswellPlatformPkg/Common/Flash/FvbRuntimeDxe/FvbSmmDxe.inf
   MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
 !else
-  BraswellPlatformPkg/SpiDeviceDxe/SpiDeviceDxe.inf
-  BraswellPlatformPkg/FvbRuntimeDxe/FvbRuntimeDxe.inf
+  BraswellPlatformPkg/Common/SpiDeviceDxe/SpiDeviceDxe.inf
+  BraswellPlatformPkg/Common/FvbRuntimeDxe/FvbRuntimeDxe.inf
   MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
-
-!endif
-
-  #
-  # Authenticated variable modules
-  #
-  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
-    <LibraryClasses>
-      NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
-      NULL|MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf
-      NULL|MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.inf
-  }
-  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf  {
-    <LibraryClasses>
-      NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
-      NULL|MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf
-      NULL|MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.inf
-  }
-  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf{
-  <LibraryClasses>
-  VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
-  !if $(SECURE_BOOT_ENABLE) == TRUE
-      AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
-!else
-      AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
 !endif
-      NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
-      NULL|MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf
-      NULL|MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.inf
-}
-  SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
-
-  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf{
-     <LibraryClasses>
-          FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-  }
-  MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
-  PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
-  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
 
-  $(PLATFORM_PACKAGE)/Setup/PlatformSetupDxe.inf
-
-!if $(DATAHUB_ENABLE) == TRUE
-  IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf {
-    <PcdsFixedAtBuild>
-      gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|0
-  }
-!endif
-  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
-
-  PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf
-
-!if ($(TPM_ENABLED) == TRUE) || ($(FTPM_ENABLE) == TRUE)
-  SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
-  SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf {
-    <LibraryClasses>
-#      Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-      NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
-      NULL|ChvRefCodePkg/Txe/Library/Tpm2DeviceLibSeC/Tpm2InstanceLibFtpm.inf
-  }
-!endif
-
-!if $(TPM_ENABLED) == TRUE
-    SecurityPkg/Tcg/TrEESmm/TrEESmm.inf
-    SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf {
-    <LibraryClasses>
-      NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
-      NULL|ChvRefCodePkg/Txe/Library/Tpm2DeviceLibSeC/Tpm2InstanceLibFtpm.inf
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  }
-!endif
+  $(PLATFORM_PACKAGE)/Common/Setup/PlatformSetupDxe.inf
 
   #
   # EDK II Related Platform codes
   #
-  $(PLATFORM_PACKAGE)/Acpi/AcpiSmm/AcpiSmm.inf {
+  $(PLATFORM_PACKAGE)/Common/Acpi/AcpiSmm/AcpiSmm.inf {
     <PcdsPatchableInModule>
       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043
     <PcdsFixedAtBuild>
       gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x3F
-
   }
-  $(PLATFORM_PACKAGE)/PlatformDxe/PlatformDxe.inf {
+
+  $(PLATFORM_PACKAGE)/Common/PlatformSmm/PlatformSmm.inf
+
+  $(PLATFORM_PACKAGE)/Common/PlatformDxe/PlatformDxe.inf {
     <LibraryClasses>
       Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
 !if $(TPM_ENABLED) == TRUE
@@ -1060,24 +361,18 @@ IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf{
      !endif
   }
 
-  $(PLATFORM_PACKAGE)/AdvancedFeature/PciPlatform/PciPlatform.inf
+  $(PLATFORM_PACKAGE)/Common/Feature/PciPlatform/PciPlatform.inf
+
 !if $(GOP_DRIVER_ENABLE) == TRUE
-  $(PLATFORM_PACKAGE)/FspSupport/GraphicsOutputDxe/GraphicsOutputDxe.inf  {
+  $(PLATFORM_PACKAGE)/Common/FspSupport/GraphicsOutputDxe/GraphicsOutputDxe.inf  {
     <LibraryClasses>
       DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
       SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
   }
 !endif
 
-  #
-  # SMM
-  #
-  MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
-  MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
-  #
-  #Override: Add CedarView and CherryView CPU information for smm
-  #
-  BraswellPlatformPkg/IntelSiliconBasic/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf {
+
+  BraswellPlatformPkg/Common/Silicon/IntelSiliconBasic/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf {
     <PcdsPatchableInModule>
       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046
     <PcdsFixedAtBuild>
@@ -1085,14 +380,12 @@ IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf{
     <LibraryClasses>
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
   }
-  UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
-  MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf
-  BraswellPlatformPkg/IntelSiliconBasic/PiSmmCommunication/PiSmmCommunicationSmm.inf
+
+  BraswellPlatformPkg/Common/Silicon/IntelSiliconBasic/PiSmmCommunication/PiSmmCommunicationSmm.inf
 
   #
   # ACPI
   #
-
    MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf {
     <PcdsPatchableInModule>
       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043
@@ -1102,273 +395,41 @@ IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf{
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
   }
 
-  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
-
-  $(PLATFORM_PACKAGE)/Acpi/AcpiPlatform/AcpiPlatform.inf {
+  $(PLATFORM_PACKAGE)/Common/Acpi/AcpiPlatform/AcpiPlatform.inf {
     <BuildOptions>
        *_*_X64_CC_FLAGS = /D SUPPORT_64BIT_D=1
   }
   $(PLATFORM_PACKAGE)/Board/BraswellCR/Acpi/Acpi.inf
   $(PLATFORM_PACKAGE)/Board/BraswellCherryHill/Acpi/Acpi.inf
 
+
   #
-  # PCI
+  # ISA
   #
-  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
+  BraswellPlatformPkg/Common/Silicon/WinbondSio/Wpce791/Wpce791.inf
 
-#
-# ISA
-#
-  $(PLATFORM_PACKAGE)/Sio/Wpce791/Wpce791.inf
-  IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
-  IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.inf
-  IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
-  IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
-  IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
-
-  BraswellPlatformPkg/SerialDxe/SerialDxe.inf {
-#   <PcdsPatchableInModule>
-#     gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xFFFFFFFF
-#   <PcdsFixedAtBuild>
-#     gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x3F
-    <LibraryClasses>
-      DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-      SerialPortLib|BraswellPlatformPkg/Override/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
-  }
 
-#
-# SDIO
-#
-!if $(ACPI50_ENABLE) == TRUE
-  MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf {
-    <LibraryClasses>
-      TimerLib|PerformancePkg/Library/TscTimerLib/DxeTscTimerLib.inf
-  }
-  MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf {
+  BraswellPlatformPkg/Common/Silicon/IntelSiliconBasic/SerialDxe/SerialDxe.inf {
     <LibraryClasses>
-      TimerLib|PerformancePkg/Library/TscTimerLib/DxeTscTimerLib.inf
-  }
-  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
-!endif
-
-#
-# IDE/SCSI/AHCI
-#
-  MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
-  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
-  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
-  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
-  MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
-!if $(SCSI_ENABLE) == TRUE
-  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
-  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
-!endif
-#
-# Console
-#
-  MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
-  MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
-  MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
-  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
-  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
-  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
-  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
-  #
-  # USB
-  #
-!if $(USB_ENABLE) == TRUE
-  MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
-  MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
-  MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
-  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
-  MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
-  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
-  MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf {
-    <BuildOptions>
-      *_*_*_CC_FLAGS = $(C_PROJ_FLAGS) /Od /D EFI_DEBUG /GL-
+      DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+      SerialPortLib|BraswellPlatformPkg/Common/Library/PlatformBaseSerialPortLib16550/BaseSerialPortLib16550.inf
   }
-!endif
 
   #
   # SMBIOS
   #
-  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
-  MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf {
-    <LibraryClasses>
-      NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf
-      NULL|SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.inf
-  }
-  $(PLATFORM_PACKAGE)/AdvancedFeature/SmBiosMiscDxe/SmbiosMiscDxe.inf
-
+  $(PLATFORM_PACKAGE)/Common/Feature/SmBiosMiscDxe/SmbiosMiscDxe.inf
 
   #
   # CPU/FW Microde
   #
-  $(PLATFORM2_PACKAGE)/Microcode/MicrocodeUpdatesFsp.inf
+  $(PLATFORM2_PACKAGE)/Common/Microcode/MicrocodeUpdatesFsp.inf
 
-  #
-  # Legacy Modules
-  #
-  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
 
-  #
-  # Network Modules
-  #
-!if $(NETWORK_ENABLE) == TRUE
-  !if $(NETWORK_ISCSI_ENABLE) == TRUE
-    !if $(NETWORK_IP6_ENABLE) == TRUE
-      NetworkPkg/IScsiDxe/IScsiDxe.inf
-    !else
-      MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
-    !endif
-  !endif
-  !if $(NETWORK_VLAN_ENABLE) == TRUE
-    MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  !endif
-  !if $(CSM_ENABLE) == TRUE
-    IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf
-  !endif
-!endif
-
-!if $(NETWORK_ENABLE) == TRUE
-  #
-  # UEFI network modules
-  #
-    MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-    MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-
-    MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-    MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-    MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-    MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-    MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-    MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf {
-      <PcdsPatchableInModule>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000000
-    }
-    MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-    !if $(NETWORK_IP6_ENABLE) == TRUE
-      NetworkPkg/Ip6Dxe/Ip6Dxe.inf
-      NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-      NetworkPkg/IpSecDxe/IpSecDxe.inf
-      NetworkPkg/TcpDxe/TcpDxe.inf
-      NetworkPkg/Udp6Dxe/Udp6Dxe.inf
-      NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-    !endif
-    !if $(NETWORK_IP6_ENABLE) == TRUE
-      NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-    !else
-      MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
-    !endif
-!endif
-
-!if $(CAPSULE_ENABLE) == TRUE
-  # capsule related drivers and Application.
-  IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxe.inf
-  IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf
-!endif
-
-!if $(PERFORMANCE_ENABLE) == TRUE
-    PerformancePkg/Dp_App/Dp.inf {
-    <LibraryClasses>
-      SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf
-      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
-      FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-      PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
-  }
-!endif
-
-[BuildOptions]
+######################################################################
 #
 # Define Build Options both for EDK and EDKII drivers.
 #
-
-#
-# Define token for different Platform
-#
-
-!if $(S3_ENABLE) == TRUE
-  DEFINE DSC_S3_BUILD_OPTIONS = /DEFI_S3_RESUME=1
-!else
-  DEFINE DSC_S3_BUILD_OPTIONS =
-!endif
-
-!if $(HYBRID_ENABLE) == TRUE
-  DEFINE HYBRID_BUILD_OPTIONS = /D_SLE_HYB_=1 /D_PSSD_FIX_=1
-!else
-  DEFINE HYBRID_BUILD_OPTIONS = /D_SLE_HYB_=0 /D_PSSD_FIX_=0
-!endif
-
-!if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
-  DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = /DCLKGEN_CONFIG_EXTRA=1
-!else
-  DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =
-!endif
-
-!if $(PCIESC_ENABLE) == TRUE
-  DEFINE PCIESC_SUPPORT_BUILD_OPTION = /DPCIESC_SUPPORT=1
-!else
-  DEFINE PCIESC_SUPPORT_BUILD_OPTION =
-!endif
-
-!if $(SATA_ENABLE) == TRUE
-  DEFINE SATA_SUPPORT_BUILD_OPTION = /DSATA_SUPPORT=1
-!else
-  DEFINE SATA_SUPPORT_BUILD_OPTION =
-!endif
-
-!if $(FTPM_ENABLE) == TRUE
-  DEFINE DSC_FTPM_BUILD_OPTIONS = /DFTPM_ENABLE
-!else
-  DEFINE DSC_FTPM_BUILD_OPTIONS =
-!endif
-
-!if $(TPM_ENABLED) == TRUE
-  DEFINE DSC_TPM_BUILD_OPTIONS = /DTPM_ENABLED
-!else
-  DEFINE DSC_TPM_BUILD_OPTIONS =
-!endif
-
-!if $(FSP_BOOT_ENABLE) == TRUE
-  DEFINE FSP_DSC_BUILD_OPTIONS = /DFSP_FLAG
-!else
-  DEFINE FSP_DSC_BUILD_OPTIONS =
-!endif
-
-  DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(HYBRID_BUILD_OPTIONS) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION) $(DSC_FTPM_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) $(DSC_HG_BUILD_OPTIONS) $(DSC_S3_BUILD_OPTIONS) $(FSP_DSC_BUILD_OPTIONS)
-
-!if $(PERFORMANCE_ENABLE) == TRUE
-  DEFINE PDB_BUILD_OPTION = /Zi
-!endif
-
-[BuildOptions.Common.EDKII]
-#!if $(PERFORMANCE_ENABLE) == TRUE
-#  RELEASE_*_*_DLINK_FLAGS = /DEBUG
-#!endif
-  DEFINE DEBUG_BUILD_OPTIONS = /D EFI_DEBUG /D DEBUG_MODE=1 /DEDKII_GLUE_DebugPrintErrorLevel=(EFI_D_ERROR)
-
-  *_*_IA32_ASM_FLAGS         = /D EDKII_GLUE_PciExpressBaseAddress=$(PLATFORM_PCIEXPRESS_BASE)h /DEFI_S3_RESUME
-
-  DEBUG_*_IA32_CC_FLAGS      = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) $(DEBUG_BUILD_OPTIONS)
-  RELEASE_*_IA32_CC_FLAGS    = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  DEBUG_*_IA32_VFRPP_FLAGS   = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) $(DEBUG_BUILD_OPTIONS)
-  RELEASE_*_IA32_VFRPP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  DEBUG_*_IA32_APP_FLAGS     = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) $(DEBUG_BUILD_OPTIONS)
-  RELEASE_*_IA32_APP_FLAGS   = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  DEBUG_*_IA32_PP_FLAGS      = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) $(DEBUG_BUILD_OPTIONS)
-  RELEASE_*_IA32_PP_FLAGS    = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_IA32_ASLPP_FLAGS       = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-
-  DEBUG_*_X64_CC_FLAGS       = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) $(DEBUG_BUILD_OPTIONS)
-  RELEASE_*_X64_CC_FLAGS     = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  DEBUG_*_X64_VFRPP_FLAGS    = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) $(DEBUG_BUILD_OPTIONS)
-  RELEASE_*_X64_VFRPP_FLAGS  = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  DEBUG_*_X64_APP_FLAGS      = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) $(DEBUG_BUILD_OPTIONS)
-  RELEASE_*_X64_APP_FLAGS    = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  DEBUG_*_X64_PP_FLAGS       = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) $(DEBUG_BUILD_OPTIONS)
-  RELEASE_*_X64_PP_FLAGS     = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_X64_ASLPP_FLAGS        = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-
-  MSFT:*_*_*_CC_FLAGS        = /wd4200
-
+######################################################################
+  !include Include/Build/BuildOptions.dsc
 
diff --git a/BraswellPlatformPkg/PlatformPkgX64.dsc b/BraswellPlatformPkg/PlatformPkgX64.dsc
index 94b2697420..9039452a4b 100644
--- a/BraswellPlatformPkg/PlatformPkgX64.dsc
+++ b/BraswellPlatformPkg/PlatformPkgX64.dsc
@@ -48,11 +48,14 @@
   DEFINE PROJECT_VLV_ROOT          = ../$(PLATFORM_RC_PACKAGE)/CherryViewSoc/NorthCluster
   DEFINE CHIPSET_MEMORY_CONTROLLER = ValleyView2
 
-  !include BraswellPlatformPkg/AutoPlatformCFG.txt
-  !include BraswellPlatformPkg/PlatformPkgConfig.dsc
-  DEFINE SIGNED_CAPSULE_ENABLE = FALSE
+  !include $(WORKSPACE)/BraswellPlatformPkg/AutoPlatformCFG.txt
+  !include $(WORKSPACE)/BraswellPlatformPkg/PlatformFeatureConfig.dsc
 
-  FLASH_DEFINITION                    = BraswellPlatformPkg/PlatformPkg.fdf
+!if $(ENABLE_FV_BIN)
+  FLASH_DEFINITION                    = $(WORKSPACE)/BraswellPlatformPkg/PlatformFvBinPkg.fdf
+!else
+  FLASH_DEFINITION                    = $(WORKSPACE)/BraswellPlatformPkg/PlatformPkg.fdf
+!endif
   FIX_LOAD_TOP_MEMORY_ADDRESS         = 0x0
   DEFINE   TOP_MEMORY_ADDRESS         = 0x0
 
@@ -61,41 +64,6 @@
   #
   DEFINE   PLATFORM_PCIEXPRESS_BASE   = 0E0000000
 
-  #
-  # Set the global variables for EDK sytle module
-  # EDK_GLOBAL only takes effect to R8 INF.
-  #
-  EDK_GLOBAL GG_SOURCE                 = $(WORKSPACE)/$(PLATFORM2_PACKAGE)/AmiCsm/Restricted/GreensGlacier
-  EDK_GLOBAL AMI_RESTRICTED_SOURCE     = $(WORKSPACE)/$(PLATFORM2_PACKAGE)/AmiCsm/Restricted
-  EDK_GLOBAL INTEL_RESTRICTED_SOURCE   = $(WORKSPACE)/$(PLATFORM_INTEL_RESTRICT_PACKAGE)
-  EDK_GLOBAL PROJECT_VLV_ROOT          = ../$(PLATFORM_RC_PACKAGE)/CherryViewSoc/NorthCluster
-
-  EDK_GLOBAL PLATFORM_PACKAGE          = $(PLATFORM_PACKAGE)
-  EDK_GLOBAL PLATFORM2_PACKAGE         = $(PLATFORM2_PACKAGE)
-  EDK_GLOBAL PLATFORM_RC_PACKAGE       = $(PLATFORM_RC_PACKAGE)
-  EDK_GLOBAL PLATFORM_ECP_PACKAGE      = R8ChvTbltDevicePkg
-  EDK_GLOBAL CPU_ARCH                  = ValleyView2
-  EDK_GLOBAL PROJECT_SC_FAMILY         = IntelPch
-  EDK_GLOBAL PROJECT_SC_ROOT           = ../$(PLATFORM_RC_PACKAGE)/CherryViewSoc/SouthCluster
-  EDK_GLOBAL PROJECT_VLV_ROOT          = ../$(PLATFORM_RC_PACKAGE)/CherryViewSoc/NorthCluster
-  EDK_GLOBAL CHIPSET_MEMORY_CONTROLLER = ValleyView2
-
-  EDK_GLOBAL PROJECT_SC_ROOT           = ../$(PLATFORM_RC_PACKAGE)/CherryViewSoc/SouthCluster
-  EDK_GLOBAL PROJECT_ACPI_ROOT         = ../$(PLATFORM_RC_PACKAGE)/AcpiTables
-  EDK_GLOBAL PROJECT_PPM_ROOT          = ../$(PLATFORM_RC_PACKAGE)/PowerManagement
-  EDK_GLOBAL PROJECT_DTS_ROOT          = ../$(PLATFORM_RC_PACKAGE)/DigitalThermalSensor
-  EDK_GLOBAL PROJECT_SEC_ROOT          = ../$(PLATFORM_RC_PACKAGE)/SeC
-
-  EDK_GLOBAL PROJECT_SC                = SouthCluster
-  EDK_GLOBAL PROJECT_DTS               = DigitalThermalSensor
-  EDK_GLOBAL CHIPSET_MEMORY_CONTROLLER = ValleyView2
-
-  EDK_GLOBAL EFI_ACPI_TABLE_STORAGE_GUID = 7E374E25-8E01-4FEE-87F2-390C23C606CD
-  EDK_GLOBAL EFI_ACPI_OEM_FADT_REVISION  = 0x0001
-
-  EDK_GLOBAL UEFI_PREFIX = Uefi
-  EDK_GLOBAL PI_PERFIX   =
-
   DEFINE PCH_INIT_ROOT          = ChvRefCodePkg/CherryViewSoc/SouthCluster/PchInit
   DEFINE DXE_ARCHITECTURE       = X64
   DEFINE EDK_DXE_ARCHITECTURE   = X64
@@ -115,58 +83,26 @@
 
 ################################################################################
 #
+# Pcd Section - list of all EDK II PCD Entries defined by this Platform
+#
+################################################################################
+!include PlatformPcdX64.dsc
+
+################################################################################
+#
+# EDK2 Core
+#
+################################################################################
+!include Include/Build/Edk2CorePkgX64.dsc
+
+################################################################################
+#
 # Library Class section - list of all Library Classes needed by this Platform.
 #
 ################################################################################
 [LibraryClasses.common]
-  #
-  # Entry point
-  #
-  PeiCoreEntryPoint|MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
-  PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
-  DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
-  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
-  UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
-  DxeSmmDriverEntryPoint|IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf
-  PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf
-  #
-  # Basic
-  #
-  BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
-  BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
-  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
-  CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
-  IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
-  PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf
-#  PciLib|MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
-  PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf
-  PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf
-  CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
-  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
-  PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
 
-  #
-  # UEFI & PI
-  #
-  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
-  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
-  UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
-  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
-  HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
-  UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
-  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
-  UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
-  PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
-  PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
-  DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
-  DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
-  UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
-  GenericBdsLib|$(PLATFORM_PACKAGE)/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
-#  PlatformBdsLib|$(PLATFORM_PACKAGE)/Library/PlatformBdsLib/PlatformBdsLib_BB.inf
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-  FlashDeviceLib|$(PLATFORM_PACKAGE)/Library/FlashDeviceLib/FlashDeviceLib.inf
+  FlashDeviceLib|$(PLATFORM_PACKAGE)/Common/Library/FlashDeviceLib/FlashDeviceLib.inf
   #
   # Framework
   #
@@ -179,580 +115,129 @@
   S3PciLib|MdePkg/Library/BaseS3PciLib/BaseS3PciLib.inf
 
   #
-  # Generic Modules
-  #
-!if $(USB_ENABLE) == TRUE
-  UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
-!endif
-!if $(SCSI_ENABLE) == TRUE
-  UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
-!endif
-!if $(NETWORK_ENABLE) == TRUE
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-!endif
-!if $(S3_ENABLE) == TRUE
-  S3Lib|IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
-!endif
-  OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
-!if $(CAPSULE_ENABLE) == TRUE
-  CapsuleLib|IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.inf
-!else
-  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
-!endif
-  SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
-  SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
-  IoApicLib|PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf
-
-  DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
-
-  #
   # CPU
   #
-  MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
-  CpuConfigLib|BraswellPlatformPkg/IntelSiliconBasic/Library/CpuConfigLib/CpuConfigLib.inf
-  LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
+  CpuConfigLib|BraswellPlatformPkg/Common/Silicon/IntelSiliconBasic/Library/CpuConfigLib/CpuConfigLib.inf
+  CpuIA32Lib|$(PLATFORM_PACKAGE)/Common/Library/CpuIA32Lib/CpuIA32Lib.inf
+  StallSmmLib|$(PLATFORM_PACKAGE)/Common/Library/StallSmmLib/StallSmmLib.inf
 
   #
   # ICH
   #
   SmbusLib|ChvRefCodePkg/CherryViewSoc/SouthCluster/Library/SmbusLib/SmbusLib.inf
-  SmmLib|MdePkg/Library/SmmLibNull/SmmLibNull.inf
-  SmmIoLib|$(PLATFORM_PACKAGE)/Library/SmmIo/SmmIoLib.inf
-
-  #PchPlatformLib|ChvRefCodePkg/CherryViewSoc/SouthCluster/Library/PchPlatformLib/PchPlatformLib.inf
+  SmmIoLib|$(PLATFORM_PACKAGE)/Common/Library/SmmIo/SmmIoLib.inf
+  ResetSystemLib|$(PLATFORM_PACKAGE)/Common/Library/ResetSystemLib/ResetSystemLib.inf
 
   #
-  # Platform
+  # RC Common Library
   #
-  ResetSystemLib|$(PLATFORM_PACKAGE)/Library/ResetSystemLib/ResetSystemLib.inf
+  !include $(WORKSPACE)/$(PLATFORM_RC_PACKAGE)/ClientRefCodePkgCommonLib.dsc
 
   #
-  # Misc
+  # FSP platform sample
   #
-!if $(TARGET) == RELEASE
-  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-  SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
-!else
-  DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-  SerialPortLib|BraswellPlatformPkg/Override/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
-!endif
-  PlatformHookLib|BraswellPlatformPkg/Library/PlatformHookLib/PlatformHookLib.inf
-  PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-!if $(TPM_ENABLED) == TRUE
-  TpmCommLib|SecurityPkg/Library/TpmCommLib/TpmCommLib.inf
-  Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
-  Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
+  FspPlatformInfoLib|$(PLATFORM_PACKAGE)/Common/FspSupport/Library/FspPlatformInfoLib/FspPlatformInfoLib.inf
+  FspPlatformSecLib|IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/SecPeiFspPlatformSecLibSample.inf
+  FspHobProcessLib|$(PLATFORM_PACKAGE)/Common/FspSupport/Library/PeiFspHobProcessLib/PeiFspHobProcessLib.inf
+  BltLib|$(PLATFORM_PACKAGE)/Common/FspSupport/Library/FrameBufferBltLib/FrameBufferBltLib.inf
 
-!endif
-  DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
+  RecoveryOemHookLib|$(PLATFORM_PACKAGE)/Common/Library/RecoveryOemHookLib/RecoveryOemHookLib.inf
 
+[LibraryClasses.IA32]
   #
-  # CryptLib
+  # RC Pei Library
   #
-!if $(TPM_ENABLED) == TRUE
-  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
-!endif
-
-#
-# For R9 compilation
-#
-  CpuIA32Lib|$(PLATFORM_PACKAGE)/Library/CpuIA32Lib/CpuIA32Lib.inf
-
-  StallSmmLib|$(PLATFORM_PACKAGE)/Library/StallSmmLib/StallSmmLib.inf
-
-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
-  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-  PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
-
-  ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
-  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
-  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-  SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
-!if ($(HYBRID_ENABLE) == TRUE)|| ($(FTPM_ENABLE) == TRUE)
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
-  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-!endif
-  TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
-  TrEEPhysicalPresenceLib|SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.inf
-  Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
-  TrEEPpVendorLib|SecurityPkg/Library/TrEEPpVendorLibNull/TrEEPpVendorLibNull.inf
-#
-# RC Common Library
-#
-!include $(PLATFORM_RC_PACKAGE)/ClientRefCodePkgCommonLib.dsc
-
-
-  # FSP lib
-  FspApiLib|IntelFspWrapperPkg/Library/BaseFspApiLib/BaseFspApiLib.inf
-
-  # FSP platform sample
-  FspPlatformInfoLib|$(PLATFORM_PACKAGE)/FspSupport/Library/BaseFspPlatformInfoLibSample/BaseFspPlatformInfoLibSample.inf
-  FspPlatformSecLib|$(PLATFORM_PACKAGE)/Override/IntelFspWrapperPkg/Library/SecPeiFspPlatformSecLibSample/SecPeiFspPlatformSecLibSample.inf
-  FspHobProcessLib|$(PLATFORM_PACKAGE)/FspSupport/Library/PeiFspHobProcessLib/PeiFspHobProcessLib.inf
-  BltLib|$(PLATFORM_PACKAGE)/FspSupport/Library/FrameBufferBltLib/FrameBufferBltLib.inf
-  RecoveryOemHookLib|$(PLATFORM_PACKAGE)/Library/RecoveryOemHookLib/RecoveryOemHookLib.inf
-  AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
-  VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
-
-[LibraryClasses.IA32]
-#
-# RC Pei Library
-#
-!include $(PLATFORM_RC_PACKAGE)/ClientRefCodePkgPeiLib.dsc
+  !include $(WORKSPACE)/$(PLATFORM_RC_PACKAGE)/ClientRefCodePkgPeiLib.dsc
 
-  TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf
   GpioLib|ChvRefCodePkg/CherryViewSoc/SouthCluster/Library/GpioLib/GpioLib.inf
 
 [LibraryClasses.IA32.SEC]
-  TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf
-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-  HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
-  MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
-  ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
-  SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
-  CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf  # RP_BDW_CorePkgDifference
-  ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
+
 
 
 [LibraryClasses.IA32.PEIM, LibraryClasses.IA32.PEI_CORE]
   #
   # PEI phase common
   #
-
-  BiosIdLib|BraswellPlatformPkg/Library/BiosIdLib/BiosIdLib.inf
+  BiosIdLib|BraswellPlatformPkg/Common/Library/BiosIdLib/BiosIdLib.inf
   I2CLibPei|ChvRefCodePkg/CherryViewSoc/SouthCluster/Library/I2CLibPei/I2CLibPei.inf
-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-  HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
-  MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
-  ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
-  ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
-  MultiPlatformLib|$(PLATFORM_PACKAGE)/Library/MultiPlatformLib/MultiPlatformLib.inf
-!if $(TPM_ENABLED) == TRUE
-  Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.inf
-!endif
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
-  TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf
+  MultiPlatformLib|$(PLATFORM_PACKAGE)/Common/Library/MultiPlatformLib/MultiPlatformLib.inf
+  PeiKscLib|$(PLATFORM_PACKAGE)/Common/Library/Ksc/Pei/PeiKscLib.inf
 
-!if $(PERFORMANCE_ENABLE) == TRUE
-  PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
-!endif
-
-!if $(TARGET) == RELEASE
-  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-  SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
-!else
-  DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
-!endif
-  LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf
+[LibraryClasses.X64]
 
-PeiKscLib|$(PLATFORM_PACKAGE)/Library/Ksc/Pei/PeiKscLib.inf
-HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf
+  BiosIdLib|BraswellPlatformPkg/Common/Library/BiosIdLib/BiosIdLib.inf
+  DxeKscLib|$(PLATFORM_PACKAGE)/Common/Library/Ksc/Dxe/DxeKscLib.inf
+  EfiRegTableLib|$(PLATFORM_PACKAGE)/Common/Library/EfiRegTableLib/EfiRegTableLib.inf
 
-[LibraryClasses.X64]
   #
-  # DXE phase common
+  # RC Dxe Library
   #
-  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
-  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
-  ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
-  ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
-  TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf
-
-  TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
-  BiosIdLib|BraswellPlatformPkg/Library/BiosIdLib/BiosIdLib.inf
-!if $(TPM_ENABLED) == TRUE
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
-!endif
-  DxeKscLib|$(PLATFORM_PACKAGE)/Library/Ksc/Dxe/DxeKscLib.inf
-  LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
-  EfiRegTableLib|$(PLATFORM_PACKAGE)/Library/EfiRegTableLib/EfiRegTableLib.inf
+  !include $(WORKSPACE)/$(PLATFORM_RC_PACKAGE)/ClientRefCodePkgDxeLib.dsc
 
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
-
-!if $(TPM_ENABLED) == TRUE
-  Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
-!endif
-  HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
-#
-# RC Dxe Library
-#
-!include $(PLATFORM_RC_PACKAGE)/ClientRefCodePkgDxeLib.dsc
-  CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf  # RP_BDW_CorePkgDifference
-CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf  # RP_BDW_CorePkgDifference
-  CustomizedDisplayLib|MdeModulePkg\Library\CustomizedDisplayLib\CustomizedDisplayLib.inf
 
 [LibraryClasses.X64.PEIM]
-  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
 
 
 [LibraryClasses.X64.DXE_DRIVER]
-!if $(PERFORMANCE_ENABLE) == TRUE
-  PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
-!endif
+
 
 [LibraryClasses.X64.DXE_CORE]
-  HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
-  MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-!if $(PERFORMANCE_ENABLE) == TRUE
-  PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
-!endif
-  CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf  # RP_BDW_CorePkgDifference
+
 
 [LibraryClasses.X64.DXE_SMM_DRIVER]
-  SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf
-  ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf
-  MemoryAllocationLib|MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf
-  LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf
-  SmmCpuPlatformHookLib|BraswellPlatformPkg/IntelSiliconBasic/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf
-  SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf
-!if $(PERFORMANCE_ENABLE) == TRUE
-  PerformanceLib|MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.inf
-!endif
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
-#
-# RC Smm Library
-#
-  !include $(PLATFORM_RC_PACKAGE)/ClientRefCodePkgSmmLib.dsc
+
+  SmmCpuPlatformHookLib|BraswellPlatformPkg/Common/Silicon/IntelSiliconBasic/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf
+
+  #
+  # RC Smm Library
+  #
+  !include $(WORKSPACE)/$(PLATFORM_RC_PACKAGE)/ClientRefCodePkgSmmLib.dsc
   SmmIoLib|$(PLATFORM_RC_PACKAGE)/CherryViewSoc/CPU/SampleCode/Library/SmmIo/SmmIo.inf
   SmmKscLib|$(PLATFORM_RC_PACKAGE)/CherryViewSoc/CPU/SampleCode/Library/Ksc/Smm/SmmKscLib.inf
   DTSHookLib|$(PLATFORM_RC_PACKAGE)/CherryViewSoc/CPU/SampleCode/Library/DTSHookLib/Smm/DTSHookLib.inf
-  CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf  # RP_BDW_CorePkgDifference
 
 [LibraryClasses.X64.SMM_CORE]
-  MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf
-  SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf
-  ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf
-  SmmCorePlatformHookLib|MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.inf
-  SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf
-
-!if $(TPM_ENABLED) == TRUE
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
-!endif
-!if $(PERFORMANCE_ENABLE) == TRUE
-  PerformanceLib|MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.inf
-!endif
-
-[LibraryClasses.X64.DXE_RUNTIME_DRIVER]
-  ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
-!if $(TPM_ENABLED) == TRUE
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
-!endif
 
 [LibraryClasses.X64.UEFI_APPLICATION]
-  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-
-################################################################################
-#
-# Pcd Section - list of all EDK II PCD Entries defined by this Platform
-#
-################################################################################
-[PcdsFeatureFlag.common]
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|TRUE
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserGrayOutTextStatement|TRUE
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|TRUE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst|FALSE
-!if $(TARGET) == RELEASE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
-!else
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE
-!endif
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE
-
-  ## This PCD specifies whether PS2 keyboard does a extended verification during start.
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPs2KbdExtendedVerification|FALSE
-
-  ## This PCD specifies whether PS2 mouse does a extended verification during start.
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPs2MouseExtendedVerification|FALSE
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|FALSE
-
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE
-
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmProfileEnable|TRUE
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnIdeDisk|FALSE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnFatFloppyDisk|FALSE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnDataCD|FALSE
-
-[PcdsFeatureFlag.X64]
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE
-
-[PcdsFixedAtBuild.common]
-  gFspWrapperTokenSpaceGuid.PcdTemporaryRamSize|0x00020000
-
-  gChvRefCodePkgTokenSpaceGuid.PcdPeiTemporaryRamStackSize|0x10000
-
-!if $(SECURE_BOOT_ENABLE) == TRUE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x22000
-!else
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x7000
-!endif
-  gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize|0x00000800
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize|0x400
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize|0x200000
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeimPerFv|50
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAriSupport|FALSE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPpiSupported|128
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmApSyncTimeout|1000
-  gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE
-!if $(TARGET) == RELEASE
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x3
-!else
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07
-!endif
-!if $(PERFORMANCE_ENABLE) == TRUE
-  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask|0x1
-!else
-  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask|0
-!endif
-
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdEbdaReservedMemorySize|0x10000
-  gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable|$(TOP_MEMORY_ADDRESS)
-  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserSubtitleTextColor|0x0
-  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldTextColor|0x01
-!if $(SECURE_BOOT_ENABLE) == TRUE
-  gEfiCpuTokenSpaceGuid.PcdCpuSmmStackSize|0x20000
-
-  ## Pcd for OptionRom.
-  #  Image verification policy settings:
-  #  ALWAYS_EXECUTE                         0x00000000
-  #  NEVER_EXECUTE                          0x00000001
-  #  ALLOW_EXECUTE_ON_SECURITY_VIOLATION    0x00000002
-  #  DEFER_EXECUTE_ON_SECURITY_VIOLATION    0x00000003
-  #  DENY_EXECUTE_ON_SECURITY_VIOLATION     0x00000004
-  #  QUERY_USER_ON_SECURITY_VIOLATION       0x00000005
-  gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy | 0x00000004
-!endif
-
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVbeEnable|TRUE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVgaEnable|TRUE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0
-#[PcdsFixedAtBuild.IA32.PEIM, PcdsFixedAtBuild.IA32.PEI_CORE, PcdsFixedAtBuild.IA32.SEC]
-
-  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPciBusNumber|0
-  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPciDeviceNumber|31
-  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPciFunctionNumber|0
-  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPciEnableRegisterOffset|0x40
-  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoBarEnableMask|0x02
-  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPciBarRegisterOffset|0x40
-  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPortBaseAddress|0x400
-  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiPm1TmrOffset|0x08
-  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPortBaseAddressMask|0xFF80
-
-[PcdsFixedAtBuild.IA32]
-#  gFspWrapperTokenSpaceGuid.PcdPeiTemporaryRamStackSize|0x2000
-!if $(PERFORMANCE_ENABLE) == TRUE
-  gFspWrapperTokenSpaceGuid.PcdPeiTemporaryRamStackSize|0x1600
-!else
-  gFspWrapperTokenSpaceGuid.PcdPeiTemporaryRamStackSize|0x2600
-!endif
-  gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFC60000
-  gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00023000
-  gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60
-  gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress|0xFFC00000
-  gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00400000
-  gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFF20000
-  gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize|0x0009E000
-  gFspWrapperTokenSpaceGuid.PcdMaxUpdRegionSize|0xB60
-
-[PcdsFixedAtBuild.X64]
-!if $(TARGET) == RELEASE
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x3
-!else
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07
-!endif
-
-
-[PcdsPatchableInModule.common]
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80380546
-  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x$(PLATFORM_PCIEXPRESS_BASE)
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLegacyBiosCacheLegacyRegion|FALSE
-
-  ## This PCD specifies whether to use the optimized timing for best PS2 detection performance.
-  #  Note this PCD could be set to TRUE for best boot performance and set to FALSE for best device compatibility.
-  #gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdFastPS2Detection|TRUE|BOOLEAN|0x3000000b
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdFastPS2Detection|TRUE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareRevision|0x00010000
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"Intel Corporation"|VOID* |0x80
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSBiosVersion|"Cherryview Platform BIOS"|VOID* |0x80
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSSystemUuid|{0xa5, 0x00, 0x02, 0x88, 0x64, 0x62, 0x45, 0x24, 0x98, 0x6a, 0x9b, 0x77, 0x37, 0xe3, 0x15, 0xcf}
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSSystemManufacturer|"Intel Corporation"|VOID* |0x80
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSSystemVersion|"0.1"|VOID* |0x40
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSSystemSerialNumber|"112233445566"|VOID* |0x80
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSBoardManufacturer|"Intel Corp."|VOID* |0x80
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSBoardVersion|"FAB"|VOID* |0x20
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSBoardSerialNumber|"1"|VOID* |0x80
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSChassisManufacturer|"Intel Corporation"|VOID* |0x80
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSChassisVersion|"0.1"|VOID* |0x20
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSChassisSerialNumber|"serial"|VOID* |0x80
-  gPlatformModuleTokenSpaceGuid.PcdSMBIOSChassisAssetTag|"Asset Tag"|VOID* |0x20
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x3F8
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio|FALSE
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId|"Intel "
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId|0x20202020324B4445
-  gEfiEdkIIPlatformTokenSpaceGuid.PcdSsidSvid|0x12348086
-  gPlatformModuleTokenSpaceGuid.PcdCustomizedVbtFile|{0xFF, 0xFF, 0xFF, 0xFF} |4  # Reserve n bytes for customized vbt
-!if $(ENABLE_FAST_BOOT)
-  gPlatformModuleTokenSpaceGuid.PcdEnableFastBoot|TRUE
-!else
-  gPlatformModuleTokenSpaceGuid.PcdEnableFastBoot|FALSE
-!endif
-
-[PcdsDynamicHii.common.DEFAULT]
-  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5 # Variable: L"Timeout"
-
-  gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupport"|gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport"
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState|L"BootState"|gEfiBootStateGuid|0x0|TRUE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|L"ConOutConfig"|gClientCommonModuleTokenSpaceGuid|0x0|100
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|L"ConOutConfig"|gClientCommonModuleTokenSpaceGuid|0x4|31
-
-[PcdsDynamicDefault.common.DEFAULT]
-  gEfiEdkIIPlatformTokenSpaceGuid.PcdPlatformInfo|{0x0}|VOID*|0x100
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0x0
-  gEfiCHVTokenSpaceGuid.PcdBmpImageGuid |{0x87, 0x8A, 0xC2, 0xCC, 0x53, 0x43, 0x46, 0xF2, 0xB5, 0x63, 0x51, 0xF8, 0x9D, 0xAF, 0x56, 0xBA}
-
-  ## This PCD defines the video horizontal resolution.
-  #  This PCD could be set to 0 then video resolution could be at highest resolution.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|0
-  ## This PCD defines the video vertical resolution.
-  #  This PCD could be set to 0 then video resolution could be at highest resolution.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|0
-
-  ## This PCD defines the Console output column and the default value is 25 according to UEFI spec.
-  #  This PCD could be set to 0 then console output could be at max column and max row.
-  #gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|31|UINT32|0x40000006
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|31
-  ## This PCD defines the Console output row and the default value is 80 according to UEFI spec.
-  #  This PCD could be set to 0 then console output could be at max column and max row.
-  #gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|100|UINT32|0x40000007
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|100
-
-  ## The PCD is used to specify the video horizontal resolution of text setup.
-  #gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|800|UINT32|0x50000001
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|800
-  ## The PCD is used to specify the video vertical resolution of text setup.
-  #gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|600|UINT32|0x50000002
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|600
-  ## The PCD is used to specify the console output column of text setup.
-  #gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutColumn|100|UINT32|0x50000003
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutColumn|100
-  ## The PCD is used to specify the console output column of text setup.
-  #gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutRow|31|UINT32|0x50000004
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutRow|31
-
-  gPlatformModuleTokenSpaceGuid.PcdBootToFirmwareUserInterface|FALSE
-!if $(TPM_ENABLED) == TRUE
-  ## Put Ptt guid here: e.g. { 0xf9c6a62f, 0xc60f, 0x4b44, { 0xa6, 0x29, 0xed, 0x3d, 0x40, 0xae, 0xfa, 0x5f } }
-  ## TPM1.2 { 0x8b01e5b6, 0x4f19, 0x46e8, { 0xab, 0x93, 0x1c, 0x53, 0x67, 0x1b, 0x90, 0xcc } }
-  ## TPM2.0Dtpm { 0x286bf25a, 0xc2c3, 0x408c, { 0xb3, 0xb4, 0x25, 0xe6, 0x75, 0x8b, 0x73, 0x17 } }
-  ## TPM2.0Ptt { 0x72cd3a7b, 0xfea5, 0x4f5e, { 0x91, 0x65, 0x4d, 0xd1, 0x21, 0x87, 0xbb, 0x13 } }
-  #gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0xb6, 0xe5, 0x01, 0x8b, 0x19, 0x4f, 0xe8, 0x46, 0xab, 0x93, 0x1c, 0x53, 0x67, 0x1b, 0x90, 0xcc}
-  #gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x7b, 0x3a, 0xcd, 0x72, 0xA5, 0xFE, 0x5e, 0x4f, 0x91, 0x65, 0x4d, 0xd1, 0x21, 0x87, 0xbb, 0x13}
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x5a, 0xf2, 0x6b, 0x28, 0xc3, 0xc2, 0x8c, 0x40, 0xb3, 0xb4, 0x25, 0xe6, 0x75, 0x8b, 0x73, 0x17}
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmAutoDetection|FALSE
-
-  gEfiSecurityPkgTokenSpaceGuid.PcdTrEEAvailableEventLogs|0x00000001
-  gEfiSecurityPkgTokenSpaceGuid.PcdTrEEHashAlgorithmBitmap|0
-  gEfiSecurityPkgTokenSpaceGuid.PcdTrEESupportedEventLogs|0xFFFFFFFF
-  gEfiSecurityPkgTokenSpaceGuid.PcdTrEEProtocolVersion|0x0001
-
-  gClientCommonModuleTokenSpaceGuid.PcdTpm2HierarchyChangeAuthPlatform|1
-  gClientCommonModuleTokenSpaceGuid.PcdTpm2HierarchyControlPlatform|1
-  gClientCommonModuleTokenSpaceGuid.PcdTpm2HierarchyControlEndorsement|1
-  gClientCommonModuleTokenSpaceGuid.PcdTpm2HierarchyControlOwner|1
-  gClientCommonModuleTokenSpaceGuid.PcdTpm2ChangeEps|0
-  gClientCommonModuleTokenSpaceGuid.PcdTpm2ChangePps|0
-  gClientCommonModuleTokenSpaceGuid.PcdTpm2Clear|0
-
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2InitializationPolicy|1
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2SelfTestPolicy|1
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2ScrtmPolicy|1
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy|1
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmScrtmPolicy|1
-!endif
-
-[PcdsDynamicExDefault.common.DEFAULT]
-  gEfiEdkIIPlatformTokenSpaceGuid.PcdSystemConfiguration|{0x0}|VOID*|0x3A0
-
-[PcdsDynamicExVpd.common.DEFAULT]
-#  gEfiMdeModulePkgTokenSpaceGuid.PcdRsa2048Sha256PublicKeyBuffer|*|32|{0x91, 0x29, 0xc4, 0xbd, 0xea, 0x6d, 0xda, 0xb3, 0xaa, 0x6f, 0x50, 0x16, 0xfc, 0xdb, 0x4b, 0x7e, 0x3c, 0xd6, 0xdc, 0xa4, 0x7a, 0x0e, 0xdd, 0xe6, 0x15, 0x8c, 0x73, 0x96, 0xa2, 0xd4, 0xa6, 0x4d}
 
 [Components.IA32]
 
   IntelFspWrapperPkg/FspWrapperSecCore/FspWrapperSecCore.inf {
   <LibraryClasses>
-    FspPlatformInfoLib|$(PLATFORM_PACKAGE)/FspSupport/Library/BaseFspPlatformInfoLibSample/BaseFspPlatformInfoLibSample.inf
+    FspPlatformInfoLib|$(PLATFORM_PACKAGE)/Common/FspSupport/Library/FspPlatformInfoLib/FspPlatformInfoLib.inf
     DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
     SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
   <PcdsPatchableInModule>
     gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043
   <PcdsFixedAtBuild>
     gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x27
-  <Defines>
-    FILE_GUID = 1BA0062E-C779-4582-8566-336AE8F78F09
-}
+  }
+
   IntelFspWrapperPkg/FspInitPei/FspInitPei.inf {
     <LibraryClasses>
       PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
   }
 
-  MdeModulePkg/Core/Pei/PeiMain.inf {
-!if $(TARGET) == DEBUG
-    <PcdsFixedAtBuild>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
-!endif
-    <PcdsPatchableInModule>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046
-  }
-  MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
-  MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
-#
-# RC PEI Component
-#
-!include $(PLATFORM_RC_PACKAGE)/ClientRefCodePkgPei.dsc
 
-  MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf
-  MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
+  #
+  # RC PEI Component
+  #
+  !include $(WORKSPACE)/$(PLATFORM_RC_PACKAGE)/ClientRefCodePkgPei.dsc
 
-  $(PLATFORM_PACKAGE)/PlatformPei/PlatformPei.inf {
+  $(PLATFORM_PACKAGE)/Common/PlatformPei/PlatformPei.inf {
     <LibraryClasses>
        NULL|BraswellPlatformPkg\Board\BraswellCR\BoardInit\BoardInit.inf
        NULL|BraswellPlatformPkg\Board\BraswellCherryHill\BoardInit\BoardInit.inf
        NULL|BraswellPlatformPkg\Board\WesternDigital\BoardInit\BoardInit.inf
-#      SeCUmaLib|ChvRefCodePkg/Txe/SeCUma/SeCUma.inf
 !if ($(FTPM_ENABLED) == TRUE)
       fTPMInitLib|ChvRefCodePkg/Txe/fTPM/Pei/fTPMInitPei.inf
-!endif
-    !if $(TARGET) == DEBUG
+      !endif
+!if $(TARGET) == DEBUG
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-    !else
+!else
       DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-    !endif
+!endif
       PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
 
 !if $(ISH_ENABLE) == TRUE
@@ -760,83 +245,28 @@ CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExcept
 !endif
     <BuildOptions>
 !if $(SeC_DEBUG_INFO_ENABLE) == TRUE
-  *_*_IA32_CC_FLAGS      = /DSeC_DEBUG_INFO=1
+      *_*_IA32_CC_FLAGS      = /DSeC_DEBUG_INFO=1
 !else
-  *_*_IA32_CC_FLAGS      = /DSeC_DEBUG_INFO=0
+      *_*_IA32_CC_FLAGS      = /DSeC_DEBUG_INFO=0
 !endif
 !if $(FTPM_ENABLE)==TRUE
-  *_*_IA32_CC_FLAGS = /D FTPM_ENABLE
+      *_*_IA32_CC_FLAGS = /D FTPM_ENABLE
 !endif
 !if $(ISH_ENABLE) == TRUE
-  *_*_IA32_CC_FLAGS      = /DISH_ENABLE=1
+      *_*_IA32_CC_FLAGS      = /DISH_ENABLE=1
 !endif
   }
 
-!if $(TPM_ENABLED) == TRUE
-  SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
-  SecurityPkg/Tcg/TcgPei/TcgPei.inf {
-    <LibraryClasses>
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-}
-!endif
-  $(PLATFORM_PACKAGE)/PlatformInitPei/PlatformEarlyInit.inf {
+
+  $(PLATFORM_PACKAGE)/Common/PlatformPei/PostSilicon/PostSiliconInit.inf {
     <LibraryClasses>
-      NULL|BraswellPlatformPkg\Board\BraswellCR\BoardInit\BoardInitLate.inf
-      NULL|BraswellPlatformPkg\Board\BraswellCherryHill\BoardInit\BoardInitLate.inf
-      NULL|BraswellPlatformPkg\Board\WesternDigital\BoardInit\BoardInitLate.inf
 !if $(TARGET) != RELEASE
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
 !endif
       PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
   }
 
-  MdeModulePkg/Universal/PCD/Pei/Pcd.inf
-
-  UefiCpuPkg/CpuIoPei/CpuIoPei.inf
-  UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
-  BraswellPlatformPkg/IntelSiliconBasic/PiSmmCommunication/PiSmmCommunicationPei.inf
-
-!if $(CAPSULE_ENABLE) == TRUE
-  MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
-!endif
-  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {
-    <LibraryClasses>
-    NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
-  }
-
-!if ($(TPM_ENABLED) == TRUE)
-   SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf {
-    <LibraryClasses>
-      NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
-      NULL|ChvRefCodePkg/Txe/Library/Tpm2DeviceLibSeC/Tpm2InstanceLibFtpm.inf
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-  }
-
-   SecurityPkg/Tcg/TrEEPei/TrEEPei.inf {
-    <LibraryClasses>
-#      Tpm2DeviceLib|BraswellPlatformPkg/Restricted/Override/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
-      NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
-!if $(FTPM_ENABLE) == TRUE
-      NULL|ChvRefCodePkg/Txe/Library/Tpm2DeviceLibSeC/Tpm2InstanceLibFtpm.inf
-!endif
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-  }
-
-!if $(FTPM_ENABLE) == TRUE
-  ChvRefCodePkg/Txe/fTPM/Pei/fTPMInitPei.inf
-!endif
-
-!endif
-
-!if $(ACPI50_ENABLE) == TRUE
-  MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf{
-    <LibraryClasses>
-      TimerLib|PerformancePkg/Library/TscTimerLib/PeiTscTimerLib.inf
-  }
-
-!endif
+  BraswellPlatformPkg/Common/Silicon/IntelSiliconBasic/PiSmmCommunication/PiSmmCommunicationPei.inf
 
   #
   # Recovery Module
@@ -847,197 +277,65 @@ CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExcept
   MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf
 
 [Components.X64]
-  #
-  # EDK II Related Platform codes
-  #
-  MdeModulePkg/Core/Dxe/DxeMain.inf {
-    <PcdsPatchableInModule>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046
-    <LibraryClasses>
-      NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
-  }
-  IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf {
-    <PcdsPatchableInModule>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043
-    <PcdsFixedAtBuild>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x27
-  }
-
-  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf {
-    <LibraryClasses>
-      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-  }
-
-  BraswellPlatformPkg/PcdConfigHook/DxePcdConfigHook.inf
 
+  BraswellPlatformPkg/Common/PcdConfigHook/DxePcdConfigHook.inf
   MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
 
-  IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxe.inf
-  UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
-
-!if $(DXE_ARCHITECTURE) == X64
-!if $(CAPSULE_ENABLE) == TRUE
-  MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf {
-    <LibraryClasses>
-      CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf
-  }
-!endif
-!endif
-
-  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
-  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf  {
-    <LibraryClasses>
-!if $(TARGET) != RELEASE
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-!endif
-  }
-  MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
-
-  MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
-  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf{
-    <LibraryClasses>
-!if $(SECURE_BOOT_ENABLE) == TRUE
-      NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
-!endif
-#!if $(TPM_ENABLED) == TRUE
-     # NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf
-#!endif
-!if ($(FTPM_ENABLE) == TRUE) || ($(TPM_ENABLED) == TRUE)
-      NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf
-!endif
-  }
-
-MdeModulePkg/Universal/Metronome/Metronome.inf
+  #
+  # RC DXE Component
+  #
+  !include $(WORKSPACE)/$(PLATFORM_RC_PACKAGE)/ClientRefCodePkgDxe.dsc
 
-#
-# RC DXE Component
-#
-!include $(PLATFORM_RC_PACKAGE)/ClientRefCodePkgDxe.dsc
+  BraswellPlatformPkg/Common/Silicon/IntelSiliconBasic/CpuInit/MpCpu.inf
+  BraswellPlatformPkg/Common/Silicon/IntelSiliconBasic/PciHostBridge/PciHostBridge.inf
 
-BraswellPlatformPkg\IntelSiliconBasic\CpuInit\MpCpu.inf
-BraswellPlatformPkg\IntelSiliconBasic\PciHostBridge\PciHostBridge.inf
 
-IntelFspWrapperPkg/FspNotifyDxe/FspNotifyDxe.inf
 
-IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf{
-  <LibraryClasses>
-   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
-   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-   PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
-   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
-   PlatformBdsLib|$(PLATFORM_PACKAGE)/Library/PlatformBdsLib/PlatformBdsLib.inf
-   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
-   #TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.inf
+  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf{
+    <LibraryClasses>
+     OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
+     IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
+     PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
+     BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
+     PlatformBdsLib|$(PLATFORM_PACKAGE)/Common/Library/PlatformBdsLib/PlatformBdsLib.inf
+     Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
 !if $(TPM_ENABLED) == TRUE
-   NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
+     NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
 !endif
 !if $(FTPM_ENABLE) == TRUE
-   NULL|ChvRefCodePkg/Txe/Library/Tpm2DeviceLibSeC/Tpm2InstanceLibFtpm.inf
+     NULL|ChvRefCodePkg/Txe/Library/Tpm2DeviceLibSeC/Tpm2InstanceLibFtpm.inf
 !endif
 }
 
-  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
-  MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
-
-  BraswellPlatformPkg/Flash/SpiFlashParts/MX25/MX25.inf
-  BraswellPlatformPkg/Flash/SpiFlashParts/W25/W25.inf
+  BraswellPlatformPkg/Common/Flash/SpiFlashParts/MX25/MX25.inf
 
 !if $(SMM_VARIABLE_ENABLE) == TRUE
-  BraswellPlatformPkg/Flash/SpiDeviceDxe/SpiDeviceSmm.inf
-  BraswellPlatformPkg/Flash/SpiDeviceDxe/SpiDeviceSmmDxe.inf
-  BraswellPlatformPkg/Flash/FvbRuntimeDxe/FvbSmm.inf
-  BraswellPlatformPkg/Flash/FvbRuntimeDxe/FvbSmmDxe.inf
+  BraswellPlatformPkg/Common/Flash/SpiDeviceDxe/SpiDeviceSmm.inf
+  BraswellPlatformPkg/Common/Flash/SpiDeviceDxe/SpiDeviceSmmDxe.inf
+  BraswellPlatformPkg/Common/Flash/FvbRuntimeDxe/FvbSmm.inf
+  BraswellPlatformPkg/Common/Flash/FvbRuntimeDxe/FvbSmmDxe.inf
   MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
 !else
-  BraswellPlatformPkg/SpiDeviceDxe/SpiDeviceDxe.inf
-  BraswellPlatformPkg/FvbRuntimeDxe/FvbRuntimeDxe.inf
+  BraswellPlatformPkg/Common/SpiDeviceDxe/SpiDeviceDxe.inf
+  BraswellPlatformPkg/Common/FvbRuntimeDxe/FvbRuntimeDxe.inf
   MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
-
-!endif
-
-  #
-  # Authenticated variable modules
-  #
-  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
-    <LibraryClasses>
-      NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
-      NULL|MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf
-      NULL|MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.inf
-  }
-  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf  {
-    <LibraryClasses>
-      NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
-      NULL|MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf
-      NULL|MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.inf
-  }
-  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf{
-  <LibraryClasses>
-  VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
-  !if $(SECURE_BOOT_ENABLE) == TRUE
-      AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
-!else
-      AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
-!endif
-      NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
-      NULL|MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf
-      NULL|MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.inf
-}
-  SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
-
-  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf{
-     <LibraryClasses>
-          FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-  }
-  MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
-  PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
-  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
-
-  $(PLATFORM_PACKAGE)/Setup/PlatformSetupDxe.inf
-
-!if $(DATAHUB_ENABLE) == TRUE
-  IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf {
-    <PcdsFixedAtBuild>
-      gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|0
-  }
-!endif
-  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
-
-  PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf
-
-!if ($(TPM_ENABLED) == TRUE) || ($(FTPM_ENABLE) == TRUE)
-  SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
-  SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf {
-    <LibraryClasses>
-#      Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-      NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
-      NULL|ChvRefCodePkg/Txe/Library/Tpm2DeviceLibSeC/Tpm2InstanceLibFtpm.inf
-  }
 !endif
 
-!if $(TPM_ENABLED) == TRUE
-    SecurityPkg/Tcg/TrEESmm/TrEESmm.inf
-    SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf {
-    <LibraryClasses>
-      NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
-      NULL|ChvRefCodePkg/Txe/Library/Tpm2DeviceLibSeC/Tpm2InstanceLibFtpm.inf
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  }
-!endif
+  $(PLATFORM_PACKAGE)/Common/Setup/PlatformSetupDxe.inf
 
   #
   # EDK II Related Platform codes
   #
-  $(PLATFORM_PACKAGE)/Acpi/AcpiSmm/AcpiSmm.inf {
+  $(PLATFORM_PACKAGE)/Common/Acpi/AcpiSmm/AcpiSmm.inf {
     <PcdsPatchableInModule>
       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043
     <PcdsFixedAtBuild>
       gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x3F
-
   }
-  $(PLATFORM_PACKAGE)/PlatformDxe/PlatformDxe.inf {
+
+  $(PLATFORM_PACKAGE)/Common/PlatformSmm/PlatformSmm.inf
+
+  $(PLATFORM_PACKAGE)/Common/PlatformDxe/PlatformDxe.inf {
     <LibraryClasses>
       Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
 !if $(TPM_ENABLED) == TRUE
@@ -1063,24 +361,18 @@ IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf{
      !endif
   }
 
-  $(PLATFORM_PACKAGE)/AdvancedFeature/PciPlatform/PciPlatform.inf
+  $(PLATFORM_PACKAGE)/Common/Feature/PciPlatform/PciPlatform.inf
+
 !if $(GOP_DRIVER_ENABLE) == TRUE
-  $(PLATFORM_PACKAGE)/FspSupport/GraphicsOutputDxe/GraphicsOutputDxe.inf  {
+  $(PLATFORM_PACKAGE)/Common/FspSupport/GraphicsOutputDxe/GraphicsOutputDxe.inf  {
     <LibraryClasses>
       DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
       SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
   }
 !endif
 
-  #
-  # SMM
-  #
-  MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
-  MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
-  #
-  #Override: Add CedarView and CherryView CPU information for smm
-  #
-  BraswellPlatformPkg/IntelSiliconBasic/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf {
+
+  BraswellPlatformPkg/Common/Silicon/IntelSiliconBasic/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf {
     <PcdsPatchableInModule>
       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046
     <PcdsFixedAtBuild>
@@ -1088,14 +380,12 @@ IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf{
     <LibraryClasses>
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
   }
-  UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
-  MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf
-  BraswellPlatformPkg/IntelSiliconBasic/PiSmmCommunication/PiSmmCommunicationSmm.inf
+
+  BraswellPlatformPkg/Common/Silicon/IntelSiliconBasic/PiSmmCommunication/PiSmmCommunicationSmm.inf
 
   #
   # ACPI
   #
-
    MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf {
     <PcdsPatchableInModule>
       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043
@@ -1105,273 +395,41 @@ IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf{
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
   }
 
-  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
-
-  $(PLATFORM_PACKAGE)/Acpi/AcpiPlatform/AcpiPlatform.inf {
+  $(PLATFORM_PACKAGE)/Common/Acpi/AcpiPlatform/AcpiPlatform.inf {
     <BuildOptions>
        *_*_X64_CC_FLAGS = /D SUPPORT_64BIT_D=1
   }
   $(PLATFORM_PACKAGE)/Board/BraswellCR/Acpi/Acpi.inf
   $(PLATFORM_PACKAGE)/Board/BraswellCherryHill/Acpi/Acpi.inf
 
+
   #
-  # PCI
+  # ISA
   #
-  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
+  BraswellPlatformPkg/Common/Silicon/WinbondSio/Wpce791/Wpce791.inf
 
-#
-# ISA
-#
-  $(PLATFORM_PACKAGE)/Sio/Wpce791/Wpce791.inf
-  IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
-  IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.inf
-  IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
-  IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
-  IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
-
-    BraswellPlatformPkg/SerialDxe/SerialDxe.inf {
-#    <PcdsPatchableInModule>
-#      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xFFFFFFFF
-#    <PcdsFixedAtBuild>
-#      gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x3F
-    <LibraryClasses>
-  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-  SerialPortLib|BraswellPlatformPkg/Override/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
-  }
 
-#
-# SDIO
-#
-!if $(ACPI50_ENABLE) == TRUE
-  MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf {
-    <LibraryClasses>
-      TimerLib|PerformancePkg/Library/TscTimerLib/DxeTscTimerLib.inf
-  }
-  MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf {
+  BraswellPlatformPkg/Common/Silicon/IntelSiliconBasic/SerialDxe/SerialDxe.inf {
     <LibraryClasses>
-      TimerLib|PerformancePkg/Library/TscTimerLib/DxeTscTimerLib.inf
-  }
-  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
-!endif
-
-#
-# IDE/SCSI/AHCI
-#
-  MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
-  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
-  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
-  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
-  MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
-!if $(SCSI_ENABLE) == TRUE
-  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
-  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
-!endif
-#
-# Console
-#
-  MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
-  MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
-  MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
-  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
-  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
-  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
-  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
-  #
-  # USB
-  #
-!if $(USB_ENABLE) == TRUE
-  MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
-  MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
-  MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
-  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
-  MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
-  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
-  MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf {
-    <BuildOptions>
-      *_*_*_CC_FLAGS = $(C_PROJ_FLAGS) /Od /D EFI_DEBUG /GL-
+      DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+      SerialPortLib|BraswellPlatformPkg/Common/Library/PlatformBaseSerialPortLib16550/BaseSerialPortLib16550.inf
   }
-!endif
 
   #
   # SMBIOS
   #
-  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
-  MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf {
-    <LibraryClasses>
-      NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf
-      NULL|SecurityPkg/Library/DxeRsa2048Sha256GuidedSectionExtractLib/DxeRsa2048Sha256GuidedSectionExtractLib.inf
-  }
-  $(PLATFORM_PACKAGE)/AdvancedFeature/SmBiosMiscDxe/SmbiosMiscDxe.inf
-
+  $(PLATFORM_PACKAGE)/Common/Feature/SmBiosMiscDxe/SmbiosMiscDxe.inf
 
   #
   # CPU/FW Microde
   #
-  $(PLATFORM2_PACKAGE)/Microcode/MicrocodeUpdatesFsp.inf
+  $(PLATFORM2_PACKAGE)/Common/Microcode/MicrocodeUpdatesFsp.inf
 
-  #
-  # Legacy Modules
-  #
-  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
 
-  #
-  # Network Modules
-  #
-!if $(NETWORK_ENABLE) == TRUE
-  !if $(NETWORK_ISCSI_ENABLE) == TRUE
-    !if $(NETWORK_IP6_ENABLE) == TRUE
-      NetworkPkg/IScsiDxe/IScsiDxe.inf
-    !else
-      MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
-    !endif
-  !endif
-  !if $(NETWORK_VLAN_ENABLE) == TRUE
-    MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  !endif
-  !if $(CSM_ENABLE) == TRUE
-    IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf
-  !endif
-!endif
-
-!if $(NETWORK_ENABLE) == TRUE
-  #
-  # UEFI network modules
-  #
-    MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-    MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
-
-    MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-    MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-    MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-    MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-    MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-    MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf {
-      <PcdsPatchableInModule>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000000
-    }
-    MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-    !if $(NETWORK_IP6_ENABLE) == TRUE
-      NetworkPkg/Ip6Dxe/Ip6Dxe.inf
-      NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
-      NetworkPkg/IpSecDxe/IpSecDxe.inf
-      NetworkPkg/TcpDxe/TcpDxe.inf
-      NetworkPkg/Udp6Dxe/Udp6Dxe.inf
-      NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
-    !endif
-    !if $(NETWORK_IP6_ENABLE) == TRUE
-      NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-    !else
-      MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
-    !endif
-!endif
-
-!if $(CAPSULE_ENABLE) == TRUE
-  # capsule related drivers and Application.
-  IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxe.inf
-  IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf
-!endif
-
-!if $(PERFORMANCE_ENABLE) == TRUE
-    PerformancePkg/Dp_App/Dp.inf {
-    <LibraryClasses>
-      SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf
-      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
-      FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-      PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
-  }
-!endif
-
-[BuildOptions]
+######################################################################
 #
 # Define Build Options both for EDK and EDKII drivers.
 #
-
-#
-# Define token for different Platform
-#
-
-!if $(S3_ENABLE) == TRUE
-  DEFINE DSC_S3_BUILD_OPTIONS = /DEFI_S3_RESUME=1
-!else
-  DEFINE DSC_S3_BUILD_OPTIONS =
-!endif
-
-!if $(HYBRID_ENABLE) == TRUE
-  DEFINE HYBRID_BUILD_OPTIONS = /D_SLE_HYB_=1 /D_PSSD_FIX_=1
-!else
-  DEFINE HYBRID_BUILD_OPTIONS = /D_SLE_HYB_=0 /D_PSSD_FIX_=0
-!endif
-
-!if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
-  DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = /DCLKGEN_CONFIG_EXTRA=1
-!else
-  DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =
-!endif
-
-!if $(PCIESC_ENABLE) == TRUE
-  DEFINE PCIESC_SUPPORT_BUILD_OPTION = /DPCIESC_SUPPORT=1
-!else
-  DEFINE PCIESC_SUPPORT_BUILD_OPTION =
-!endif
-
-!if $(SATA_ENABLE) == TRUE
-  DEFINE SATA_SUPPORT_BUILD_OPTION = /DSATA_SUPPORT=1
-!else
-  DEFINE SATA_SUPPORT_BUILD_OPTION =
-!endif
-
-!if $(FTPM_ENABLE) == TRUE
-  DEFINE DSC_FTPM_BUILD_OPTIONS = /DFTPM_ENABLE
-!else
-  DEFINE DSC_FTPM_BUILD_OPTIONS =
-!endif
-
-!if $(TPM_ENABLED) == TRUE
-  DEFINE DSC_TPM_BUILD_OPTIONS = /DTPM_ENABLED
-!else
-  DEFINE DSC_TPM_BUILD_OPTIONS =
-!endif
-
-!if $(FSP_BOOT_ENABLE) == TRUE
-  DEFINE FSP_DSC_BUILD_OPTIONS = /DFSP_FLAG
-!else
-  DEFINE FSP_DSC_BUILD_OPTIONS =
-!endif
-
-  DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(HYBRID_BUILD_OPTIONS) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION) $(DSC_FTPM_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) $(DSC_HG_BUILD_OPTIONS) $(DSC_S3_BUILD_OPTIONS) $(FSP_DSC_BUILD_OPTIONS)
-
-!if $(PERFORMANCE_ENABLE) == TRUE
-  DEFINE PDB_BUILD_OPTION = /Zi
-!endif
-
-[BuildOptions.Common.EDKII]
-#!if $(PERFORMANCE_ENABLE) == TRUE
-#  RELEASE_*_*_DLINK_FLAGS = /DEBUG
-#!endif
-  DEFINE DEBUG_BUILD_OPTIONS = /D EFI_DEBUG /D DEBUG_MODE=1 /DEDKII_GLUE_DebugPrintErrorLevel=(EFI_D_ERROR)
-
-  *_*_IA32_ASM_FLAGS         = /D EDKII_GLUE_PciExpressBaseAddress=$(PLATFORM_PCIEXPRESS_BASE)h /DEFI_S3_RESUME
-
-  DEBUG_*_IA32_CC_FLAGS      = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) $(DEBUG_BUILD_OPTIONS)
-  RELEASE_*_IA32_CC_FLAGS    = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  DEBUG_*_IA32_VFRPP_FLAGS   = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) $(DEBUG_BUILD_OPTIONS)
-  RELEASE_*_IA32_VFRPP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  DEBUG_*_IA32_APP_FLAGS     = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) $(DEBUG_BUILD_OPTIONS)
-  RELEASE_*_IA32_APP_FLAGS   = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  DEBUG_*_IA32_PP_FLAGS      = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) $(DEBUG_BUILD_OPTIONS)
-  RELEASE_*_IA32_PP_FLAGS    = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_IA32_ASLPP_FLAGS       = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-
-  DEBUG_*_X64_CC_FLAGS       = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) $(DEBUG_BUILD_OPTIONS)
-  RELEASE_*_X64_CC_FLAGS     = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  DEBUG_*_X64_VFRPP_FLAGS    = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) $(DEBUG_BUILD_OPTIONS)
-  RELEASE_*_X64_VFRPP_FLAGS  = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  DEBUG_*_X64_APP_FLAGS      = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) $(DEBUG_BUILD_OPTIONS)
-  RELEASE_*_X64_APP_FLAGS    = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  DEBUG_*_X64_PP_FLAGS       = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) $(DEBUG_BUILD_OPTIONS)
-  RELEASE_*_X64_PP_FLAGS     = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_X64_ASLPP_FLAGS        = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-
-  MSFT:*_*_*_CC_FLAGS        = /wd4200
-
+######################################################################
+  !include Include/Build/BuildOptions.dsc
 
diff --git a/BraswellPlatformPkg/cln.bat b/BraswellPlatformPkg/cln.bat
deleted file mode 100644
index e748efe305..0000000000
--- a/BraswellPlatformPkg/cln.bat
+++ /dev/null
@@ -1,74 +0,0 @@
-@echo off
-echo.
-echo Run build cleanall...
-echo.
-cd..
-if not defined WORKSPACE set WORKSPACE=%cd%
-if not defined PLATFORM_PACKAGE set PLATFORM_PACKAGE=ChvTbltDevicePkg
-if not defined PLATFORM_SV_PACKAGE set PLATFORM_SV_PACKAGE=R8ChtDeviceSvRestrictedPkg
-
-@if "%CD:~-1%" == "\" (set WORKSPACE=%CD:~0,-1%)
-@echo WORKSPACE=%WORKSPACE%
-
-echo.
-echo Directories to clean...
-echo.
-
-if exist build rmdir /q /s build
-if exist conf\.cache rmdir /q /s conf\.cache
-if exist RomImages rmdir /q /s RomImages
-if exist BiosImage rmdir /q /s BiosImage
-echo.
-echo Files to clean...
-echo.
-
-if exist %WORKSPACE%\edk2.log del %WORKSPACE%\edk2.log
-if exist %WORKSPACE%\Unitool.log del %WORKSPACE%\Unitool.log
-if exist %WORKSPACE%\UnitoolSv.log del %WORKSPACE%\UnitoolSv.log
-if exist %WORKSPACE%\Conf\target.txt del %WORKSPACE%\Conf\target.txt
-if exist %WORKSPACE%\Conf\BiosId.env del %WORKSPACE%\Conf\BiosId.env
-if exist %WORKSPACE%\Conf\tools_def.txt del %WORKSPACE%\Conf\tools_def.txt
-if exist %WORKSPACE%\Conf\build_rule.txt del %WORKSPACE%\Conf\build_rule.txt
-if exist %WORKSPACE%\Conf\FrameworkDatabase.db del %WORKSPACE%\Conf\FrameworkDatabase.db
-if exist %WORKSPACE%\%PLATFORM_SV_PACKAGE%\CpuSv\DXE\GBT_XML_2\AutoKnobs.c del %WORKSPACE%\%PLATFORM_SV_PACKAGE%\CpuSv\DXE\GBT_XML_2\AutoKnobs.c
-if exist %WORKSPACE%\%PLATFORM_SV_PACKAGE%\CpuSv\DXE\GBT_XML_2\AutoKnobs.h del %WORKSPACE%\%PLATFORM_SV_PACKAGE%\CpuSv\DXE\GBT_XML_2\AutoKnobs.h
-if exist %WORKSPACE%\%PLATFORM_SV_PACKAGE%\CpuSv\DXE\GBT_XML_2\AutoKnobs.xml del %WORKSPACE%\%PLATFORM_SV_PACKAGE%\CpuSv\DXE\GBT_XML_2\AutoKnobs.xml
-if exist %WORKSPACE%\%PLATFORM_SV_PACKAGE%\CpuSv\DXE\GBT_XML_2\KnobsInfoArray.c del %WORKSPACE%\%PLATFORM_SV_PACKAGE%\CpuSv\DXE\GBT_XML_2\KnobsInfoArray.c
-if exist %WORKSPACE%\%PLATFORM_SV_PACKAGE%\CpuSv\DXE\GBT_XML_2\SETUP_DATA.h del %WORKSPACE%\%PLATFORM_SV_PACKAGE%\CpuSv\DXE\GBT_XML_2\SETUP_DATA.h
-if exist %WORKSPACE%\string del string
-if exist Stitch\*.ROM del Stitch\*.ROM
-if exist Stitch\PDR\PDR_Signed.bin del Stitch\PDR\PDR_Signed.bin
-if exist Stitch\BIOS_Signing\MCGBIOS_SB_config.xml del Stitch\BIOS_Signing\MCGBIOS_SB_config.xml
-if exist Stitch\Fota\dfu_log.txt del Stitch\Fota\dfu_log.txt
-if exist Stitch\Fota\SysFwUpdateCapsuleDxe.efi del Stitch\Fota\SysFwUpdateCapsuleDxe.efi
-if exist Stitch\Fota\CapsuleGen rmdir /s /q Stitch\Fota\CapsuleGen
-if exist Stitch\Fota\FotaCapsuleBinary rmdir /s /q Stitch\Fota\FotaCapsuleBinary
-if exist Stitch\Fota\tmp rmdir /s /q Stitch\Fota\tmp
-if exist Stitch\Int rmdir /s /q Stitch\Int
-if exist Stitch\*.orig del Stitch\*.orig
-if exist Stitch\Stitching.log del Stitch\Stitching.log
-if exist Stitch\SEC\ftool.log del Stitch\SEC\ftool.log
-if exist Stitch_2MB\*.ROM del Stitch_2MB\*.ROM
-if exist Stitch_2MB\*.orig del Stitch_2MB\*.orig
-if exist Stitch_2MB\*.bin del Stitch_2MB\*.bin
-if exist Stitch_2MB\BIOS_Signing\MCGBIOS_SB_config.xml del Stitch_2MB\BIOS_Signing\MCGBIOS_SB_config.xml
-if exist Stitch_2MB\Fota\CapsuleGen\tmp rmdir /s /q Stitch_2MB\Fota\CapsuleGen\tmp
-if exist Stitch_2MB\Fota\CapsuleGen\dfu_log.txt del Stitch_2MB\Fota\CapsuleGen\dfu_log.txt
-if exist Stitch_2MB\Fota\CapsuleGen\FotaFwUpdateCapsuleDxe.efi del Stitch_2MB\Fota\CapsuleGen\FotaFwUpdateCapsuleDxe.efi
-if exist Stitch_2MB\Fota\*.fv del Stitch_2MB\Fota\*.fv
-if exist Stitch_2MB\Fota\*.bin del Stitch_2MB\Fota\*.bin
-if exist Stitch_2MB\SEC\Int rmdir /s /q Stitch_2MB\SEC\Int
-if exist Stitch_2MB\SEC\CH2T\FITC\fitc.log del Stitch_2MB\SEC\CH2T\FITC\fitc.log
-if exist Stitch_2MB\Stitching.log del Stitch_2MB\Stitching.log
-if exist %WORKSPACE%\*.ROM del %WORKSPACE%\*.ROM
-if exist ChvTbltDevicePkg\AutoPlatformCFG.txt del ChvTbltDevicePkg\AutoPlatformCFG.txt
-if exist BraswellPlatformPkg\AutoPlatformCFG.txt del BraswellPlatformPkg\AutoPlatformCFG.txt
-if exist ChtSvPkg\AutoPlatformCFG.txt del ChtSvPkg\AutoPlatformCFG.txt
-
-set PLATFORM_SV_PACKAGE=
-
-echo.
-echo All done...
-echo.
-@echo on
-cd BraswellPlatformPkg
author	Guo Mang <mang.guo@intel.com>	2016-08-03 14:08:25 +0800
committer	Guo Mang <mang.guo@intel.com>	2016-08-04 10:33:52 +0800
commit	603b6cea5e6b4a97f11dd342b10c9e6704605158 (patch)
tree	ac72faa0228ee453ee59b335dbd9387352388fd0
parent	469318c61f7603dcea7d7f77d1c0d4862a8ec290 (diff)
download	edk2-platforms-603b6cea5e6b4a97f11dd342b10c9e6704605158.tar.xz