I regularly see these commits, shouldn't we convert all files to DOS line
endings recursively?
there currently are 627 files with unix line endings.

Michael

On Wed, May 11, 2016 at 7:55 PM, Ma, Maurice <maurice...@intel.com> wrote:

> Looks fine.
>
> Reviewed-by: Maurice Ma <maurice...@intel.com>
>
> -----Original Message-----
> From: Leahy, Leroy P
> Sent: Tuesday, May 10, 2016 3:34 PM
> To: edk2-devel@lists.01.org; Leahy, Leroy P; Agyeman, Prince; Ma, Maurice
> Subject: [PATCH 1/7] CorebootPayloadPkg: Use DOS line endings
>
> Convert to using DOS line endings.
>
> Change-Id: Ie2f148867d9b2b386d556583afb6716ec21399e9
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Lee Leahy <leroy.p.le...@intel.com>
> ---
>  CorebootPayloadPkg/CorebootPayloadPkg.fdf        |  84 ++---
>  CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc    | 412
> +++++++++++-----------
>  CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc | 419
> +++++++++++------------
>  3 files changed, 455 insertions(+), 460 deletions(-)
>
> diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf
> b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
> index 85748a6..7b52f40 100644
> --- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf
> +++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
> @@ -1,16 +1,16 @@
>  ## @file
>  # Coreboot Payload Package
>  #
> -# Provides drivers and definitions to create uefi payload for coreboot.
> +# Provides drivers and definitions to create uefi payload for coreboot.
>  #
> -# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License that accompanies this
> distribution.
> +# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
> +# This program and the accompanying materials are licensed and made
> available under
> +# the terms and conditions of the BSD License that 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.
> +# 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.
>  #
>  ##
>
> @@ -93,31 +93,31 @@ INF
> MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
>  INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
>  INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
>  INF
> MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
> -INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
> -INF
> PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
> +INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
> +INF
> PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
>  INF
> MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
>
>  INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
>  INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
>  INF
> MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
> -INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
> +INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
>  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
> -INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
> +INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
>  INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
> -INF CorebootModulePkg/CbSupportDxe/CbSupportDxe.inf
> +INF CorebootModulePkg/CbSupportDxe/CbSupportDxe.inf
>
>  INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
>  #
>  # PCI Support
>  #
> -INF
> CorebootModulePkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
> -INF CorebootModulePkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf
> -INF CorebootModulePkg/PciSioSerialDxe/PciSioSerialDxe.inf
> +INF
> CorebootModulePkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
> +INF CorebootModulePkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf
> +INF CorebootModulePkg/PciSioSerialDxe/PciSioSerialDxe.inf
>
>  #
>  # ISA Support
>  #
> -INF CorebootModulePkg/SerialDxe/SerialDxe.inf
> +INF CorebootModulePkg/SerialDxe/SerialDxe.inf
>
>  #
>  # Console Support
> @@ -133,13 +133,13 @@ INF
> MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
>  INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
>  INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
>  INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
> -INF CorebootModulePkg/SataControllerDxe/SataControllerDxe.inf
> +INF CorebootModulePkg/SataControllerDxe/SataControllerDxe.inf
>  INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
>  INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
>  INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
>  INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
>
> -INF FatPkg/EnhancedFatDxe/Fat.inf
> +INF FatPkg/EnhancedFatDxe/Fat.inf
>
>  #
>  # Usb Support
> @@ -154,40 +154,40 @@ INF
> MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
>  #
>  # Shell
>  #
> -!if $(SHELL_TYPE) == BUILD_SHELL
> -INF  ShellPkg/Application/Shell/Shell.inf
> -!endif
> -
> -!if $(SHELL_TYPE) == FULL_BIN
> +!if $(SHELL_TYPE) == BUILD_SHELL
> +INF ShellPkg/Application/Shell/Shell.inf
> +!endif
> +
> +!if $(SHELL_TYPE) == FULL_BIN
>  !if $(ARCH) == IA32
>  INF  RuleOverride = BINARY USE = IA32
> EdkShellBinPkg/FullShell/FullShell.inf
>  !else
>  INF  RuleOverride = BINARY USE = X64
> EdkShellBinPkg/FullShell/FullShell.inf
>  !endif
> -!endif
> -
> -!if $(SHELL_TYPE) == MIN_BIN
> -!if $(ARCH) == IA32
> -INF  RuleOverride = BINARY USE = IA32
> ShellBinPkg/MinUefiShell/MinUefiShell.inf
> -!else
> -INF  RuleOverride = BINARY USE = X64
> ShellBinPkg/MinUefiShell/MinUefiShell.inf
> -!endif
> -!endif
> -
> -!if $(SHELL_TYPE) == UEFI_BIN
> -!if $(ARCH) == IA32
> -INF  RuleOverride = BINARY USE = IA32 ShellBinPkg/UefiShell/UefiShell.inf
> -!else
> -INF  RuleOverride = BINARY USE = X64 ShellBinPkg/UefiShell/UefiShell.inf
> -!endif
> -!endif
> +!endif
> +
> +!if $(SHELL_TYPE) == MIN_BIN
> +!if $(ARCH) == IA32
> +INF  RuleOverride = BINARY USE = IA32
> ShellBinPkg/MinUefiShell/MinUefiShell.inf
> +!else
> +INF  RuleOverride = BINARY USE = X64
> ShellBinPkg/MinUefiShell/MinUefiShell.inf
> +!endif
> +!endif
> +
> +!if $(SHELL_TYPE) == UEFI_BIN
> +!if $(ARCH) == IA32
> +INF  RuleOverride = BINARY USE = IA32 ShellBinPkg/UefiShell/UefiShell.inf
> +!else
> +INF  RuleOverride = BINARY USE = X64 ShellBinPkg/UefiShell/UefiShell.inf
> +!endif
> +!endif
>
>  FILE FREEFORM    =
> PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
>    SECTION RAW = MdeModulePkg/Logo/Logo.bmp
>  }
>
>  #
> -# Framebuffer Gop
> +# Framebuffer Gop
>  #
>  INF CorebootPayloadPkg/FbGop/FbGop.inf
>
> diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
> b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
> index 95bc9b7..907e952 100644
> --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
> +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
> @@ -1,16 +1,16 @@
>  ## @file
>  # Coreboot Payload Package
>  #
> -# Provides drivers and definitions to create uefi payload for coreboot.
> +# Provides drivers and definitions to create uefi payload for coreboot.
>  #
> -# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License that accompanies this
> distribution.
> +# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
> +# This program and the accompanying materials are licensed and made
> available under
> +# the terms and conditions of the BSD License that 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.
> +# 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.
>  #
>  ##
>
> @@ -23,60 +23,60 @@
>    PLATFORM_NAME                       = CorebootPayloadPkg
>    PLATFORM_GUID                       =
> F71608AB-D63D-4491-B744-A99998C8CD96
>    PLATFORM_VERSION                    = 0.1
> -  DSC_SPECIFICATION                   = 0x00010005
> +  DSC_SPECIFICATION                   = 0x00010005
>    SUPPORTED_ARCHITECTURES             = IA32
>    BUILD_TARGETS                       = DEBUG|RELEASE|NOOPT
>    SKUID_IDENTIFIER                    = DEFAULT
>    OUTPUT_DIRECTORY                    = Build/CorebootPayloadPkgIA32
>    FLASH_DEFINITION                    =
> CorebootPayloadPkg/CorebootPayloadPkg.fdf
> -
> +
>    DEFINE SECURE_BOOT_ENABLE      = FALSE
>    DEFINE SOURCE_DEBUG_ENABLE     = FALSE
> -
> -  #
> -  # CPU options
> -  #
> -  DEFINE MAX_LOGICAL_PROCESSORS  = 64
> -
> -  #
> -  # Serial port set up
> -  #
> -  DEFINE BAUD_RATE                        = 115200
> -  DEFINE SERIAL_CLOCK_RATE                = 1843200
> -  DEFINE SERIAL_LINE_CONTROL              = 3 # 8-bits, no parity
> -  DEFINE SERIAL_HARDWARE_FLOW_CONTROL     = FALSE
> -  DEFINE SERIAL_DETECT_CABLE              = FALSE
> -  DEFINE SERIAL_FIFO_CONTROL              = 7 # Enable FIFO
> -  DEFINE SERIAL_EXTENDED_TX_FIFO_SIZE     = 16
> -  DEFINE UART_DEFAULT_BAUD_RATE           = $(BAUD_RATE)
> -  DEFINE UART_DEFAULT_DATA_BITS           = 8
> -  DEFINE UART_DEFAULT_PARITY              = 1
> -  DEFINE UART_DEFAULT_STOP_BITS           = 1
> -  DEFINE DEFAULT_TERMINAL_TYPE            = 0
> -
> -  #
> -  #  typedef struct {
> -  #    UINT16  VendorId;          ///< Vendor ID to match the PCI
> device.  The value 0xFFFF terminates the list of entries.
> -  #    UINT16  DeviceId;          ///< Device ID to match the PCI device
> -  #    UINT32  ClockRate;         ///< UART clock rate.  Set to 0 for
> default clock rate of 1843200 Hz
> -  #    UINT64  Offset;            ///< The byte offset into to the BAR
> -  #    UINT8   BarIndex;          ///< Which BAR to get the UART base
> address
> -  #    UINT8   RegisterStride;    ///< UART register stride in bytes.
> Set to 0 for default register stride of 1 byte.
> -  #    UINT16  ReceiveFifoDepth;  ///< UART receive FIFO depth in bytes.
> Set to 0 for a default FIFO depth of 16 bytes.
> -  #    UINT16  TransmitFifoDepth; ///< UART transmit FIFO depth in bytes.
> Set to 0 for a default FIFO depth of 16 bytes.
> -  #    UINT8   Reserved[2];
> -  #  } PCI_SERIAL_PARAMETER;
> -  #
> -  # Vendor 0000 Device 0000 Prog Interface 1, BAR #0, Offset 0, Stride =
> 1, Clock 1843200 (0x1c2000)
> -  #
> -  #                                           [Vendor]   [Device]
> [----ClockRate---]  [------------Offset-----------] [Bar] [Stride] [RxFifo]
> [TxFifo]   [Rsvd]   [Vendor]
> -  DEFINE PCI_SERIAL_PARAMETERS            = {0x00,0x00, 0x00,0x00,
> 0x0,0x20,0x1c,0x00, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x00,    0x01,
> 0x0,0x0, 0x0,0x0, 0x0,0x0, 0xff,0xff}
> -
> -  #
> -  # Shell options: [BUILD_SHELL, FULL_BIN, MIN_BIN, NONE, UEFI]
> -  #
> -  DEFINE SHELL_TYPE              = FULL_BIN
> -
> +
> +  #
> +  # CPU options
> +  #
> +  DEFINE MAX_LOGICAL_PROCESSORS  = 64
> +
> +  #
> +  # Serial port set up
> +  #
> +  DEFINE BAUD_RATE                        = 115200
> +  DEFINE SERIAL_CLOCK_RATE                = 1843200
> +  DEFINE SERIAL_LINE_CONTROL              = 3 # 8-bits, no parity
> +  DEFINE SERIAL_HARDWARE_FLOW_CONTROL     = FALSE
> +  DEFINE SERIAL_DETECT_CABLE              = FALSE
> +  DEFINE SERIAL_FIFO_CONTROL              = 7 # Enable FIFO
> +  DEFINE SERIAL_EXTENDED_TX_FIFO_SIZE     = 16
> +  DEFINE UART_DEFAULT_BAUD_RATE           = $(BAUD_RATE)
> +  DEFINE UART_DEFAULT_DATA_BITS           = 8
> +  DEFINE UART_DEFAULT_PARITY              = 1
> +  DEFINE UART_DEFAULT_STOP_BITS           = 1
> +  DEFINE DEFAULT_TERMINAL_TYPE            = 0
> +
> +  #
> +  #  typedef struct {
> +  #    UINT16  VendorId;          ///< Vendor ID to match the PCI
> device.  The value 0xFFFF terminates the list of entries.
> +  #    UINT16  DeviceId;          ///< Device ID to match the PCI device
> +  #    UINT32  ClockRate;         ///< UART clock rate.  Set to 0 for
> default clock rate of 1843200 Hz
> +  #    UINT64  Offset;            ///< The byte offset into to the BAR
> +  #    UINT8   BarIndex;          ///< Which BAR to get the UART base
> address
> +  #    UINT8   RegisterStride;    ///< UART register stride in bytes.
> Set to 0 for default register stride of 1 byte.
> +  #    UINT16  ReceiveFifoDepth;  ///< UART receive FIFO depth in bytes.
> Set to 0 for a default FIFO depth of 16 bytes.
> +  #    UINT16  TransmitFifoDepth; ///< UART transmit FIFO depth in bytes.
> Set to 0 for a default FIFO depth of 16 bytes.
> +  #    UINT8   Reserved[2];
> +  #  } PCI_SERIAL_PARAMETER;
> +  #
> +  # Vendor 0000 Device 0000 Prog Interface 1, BAR #0, Offset 0, Stride =
> 1, Clock 1843200 (0x1c2000)
> +  #
> +  #                                           [Vendor]   [Device]
> [----ClockRate---]  [------------Offset-----------] [Bar] [Stride] [RxFifo]
> [TxFifo]   [Rsvd]   [Vendor]
> +  DEFINE PCI_SERIAL_PARAMETERS            = {0x00,0x00, 0x00,0x00,
> 0x0,0x20,0x1c,0x00, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x00,    0x01,
> 0x0,0x0, 0x0,0x0, 0x0,0x0, 0xff,0xff}
> +
> +  #
> +  # Shell options: [BUILD_SHELL, FULL_BIN, MIN_BIN, NONE, UEFI]
> +  #
> +  DEFINE SHELL_TYPE              = FULL_BIN
> +
>  [BuildOptions]
>    GCC:*_UNIXGCC_*_CC_FLAGS       = -DMDEPKG_NDEBUG
>    GCC:RELEASE_*_*_CC_FLAGS       = -DMDEPKG_NDEBUG
> @@ -109,7 +109,7 @@
>    #
>    # Basic
>    #
> -  BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
> +  BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
>    BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
>
>  
> SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
>    PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
> @@ -120,7 +120,7 @@
>    PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
>
>  
> PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
>
>  
> CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
> -
> +
>    #
>    # UEFI & PI
>    #
> @@ -137,7 +137,7 @@
>    DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
>
>  
> DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
>    UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> -
> +
>    #
>    # Generic Modules
>    #
> @@ -148,13 +148,13 @@
>
>  
> SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
>
>  GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
>
>  
> CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
> -
> +
>    #
>    # CPU
>    #
>    MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
> -  LocalApicLib|UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
> -
> +  LocalApicLib|UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
> +
>    #
>    # Platform
>    #
> @@ -163,7 +163,7 @@
>
>  
> SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
>
>  
> PlatformHookLib|CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf
>
>  PlatformBdsLib|CorebootPayloadPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
> -
> +
>    #
>    # Misc
>    #
> @@ -175,7 +175,7 @@
>
>  
> DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf
>  !else
>
>  
> PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf
> -
> DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
> +
> DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
>  !endif
>    CbParseLib|CorebootModulePkg/Library/CbParseLib/CbParseLib.inf
>
>  
> DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
> @@ -203,32 +203,32 @@
>    HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
>
>  
> MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
>
>  
> ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
> -
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> +
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
>  !if $(SOURCE_DEBUG_ENABLE)
>
>  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
> -!endif
> +!endif
>
>  
> CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf
>
> -[LibraryClasses.common.DXE_DRIVER]
> +[LibraryClasses.common.DXE_DRIVER]
>    PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
>    HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
>
>  
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
>
>  
> ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
>
>  
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
>
>  
> CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf
> -
> +
>  [LibraryClasses.common.DXE_RUNTIME_DRIVER]
>    PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
>    HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
>
>  
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
>
>  
> ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
> -
> +
>  [LibraryClasses.common.UEFI_DRIVER,LibraryClasses.common.UEFI_APPLICATION]
>    PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
>
>  
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
>
>  
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> -  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
> -
> +  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
> +
>
>  
> ################################################################################
>  #
>  # Pcd Section - list of all EDK II PCD Entries defined by this Platform.
> @@ -245,49 +245,49 @@
>    gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x10000
>    gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize|0x8000
>    gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x10000
> -
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0
> +
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0
>
>  !if $(SOURCE_DEBUG_ENABLE)
>    gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2
>  !endif
>
>  [PcdsPatchableInModule.common]
> -  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x7
> -  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
> -!if $(SOURCE_DEBUG_ENABLE)
> -  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
> -!else
> -  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F
> -!endif
> -
> -  #
> -  # The following parameters are set by Library/PlatformHookLib
> -  #
> +  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x7
> +  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
> +!if $(SOURCE_DEBUG_ENABLE)
> +  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
> +!else
> +  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F
> +!endif
> +
> +  #
> +  # The following parameters are set by Library/PlatformHookLib
> +  #
>    gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio|FALSE
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x3f8
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialBaudRate|$(BAUD_RATE)
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterStride|1
> -
> -  #
> -  # Enable these parameters to be set on the command line
> -  #
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialClockRate|$(SERIAL_CLOCK_RATE)
> -
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialLineControl|$(SERIAL_LINE_CONTROL)
> -
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|$(SERIAL_HARDWARE_FLOW_CONTROL)
> -
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialDetectCable|$(SERIAL_DETECT_CABLE)
> -
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialFifoControl|$(SERIAL_FIFO_CONTROL)
> -
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialExtendedTxFifoSize|$(SERIAL_EXTENDED_TX_FIFO_SIZE)
> -
> -
> gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|$(UART_DEFAULT_BAUD_RATE)
> -
> gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|$(UART_DEFAULT_DATA_BITS)
> -  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|$(UART_DEFAULT_PARITY)
> -
> gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|$(UART_DEFAULT_STOP_BITS)
> -  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|$(DEFAULT_TERMINAL_TYPE)
> -
> gEfiMdeModulePkgTokenSpaceGuid.PcdPciSerialParameters|$(PCI_SERIAL_PARAMETERS)
> -
> -
> gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber|$(MAX_LOGICAL_PROCESSORS)
> -
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x3f8
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialBaudRate|$(BAUD_RATE)
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterStride|1
> +
> +  #
> +  # Enable these parameters to be set on the command line
> +  #
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialClockRate|$(SERIAL_CLOCK_RATE)
> +
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialLineControl|$(SERIAL_LINE_CONTROL)
> +
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|$(SERIAL_HARDWARE_FLOW_CONTROL)
> +
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialDetectCable|$(SERIAL_DETECT_CABLE)
> +
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialFifoControl|$(SERIAL_FIFO_CONTROL)
> +
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialExtendedTxFifoSize|$(SERIAL_EXTENDED_TX_FIFO_SIZE)
> +
> +
> gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|$(UART_DEFAULT_BAUD_RATE)
> +
> gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|$(UART_DEFAULT_DATA_BITS)
> +  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|$(UART_DEFAULT_PARITY)
> +
> gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|$(UART_DEFAULT_STOP_BITS)
> +  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|$(DEFAULT_TERMINAL_TYPE)
> +
> gEfiMdeModulePkgTokenSpaceGuid.PcdPciSerialParameters|$(PCI_SERIAL_PARAMETERS)
> +
> +
> gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber|$(MAX_LOGICAL_PROCESSORS)
> +
>
>  
> ################################################################################
>  #
>  # Pcd Dynamic Section - list of all EDK II PCD Entries defined by this
> Platform
> @@ -300,7 +300,6 @@
>    gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
>    gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
>
> -
>
>  
> ################################################################################
>  #
>  # Components Section - list of all EDK II Modules needed by this Platform.
> @@ -311,12 +310,12 @@
>    # SEC Core
>    #
>    CorebootModulePkg/SecCore/SecCore.inf
> -
> +
>    #
>    # PEI Core
>    #
>    MdeModulePkg/Core/Pei/PeiMain.inf
> -
> +
>    #
>    # PEIM
>    #
> @@ -325,8 +324,8 @@
>        PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
>    }
>    IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
> -
> -  CorebootModulePkg/CbSupportPei/CbSupportPei.inf
> +
> +  CorebootModulePkg/CbSupportPei/CbSupportPei.inf
>    MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
>
>  [Components.IA32]
> @@ -337,7 +336,7 @@
>      <LibraryClasses>
>
>  
> NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
>    }
> -
> +
>    #
>    # Components that produce the architectural protocols
>    #
> @@ -350,59 +349,59 @@
>    MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
>    MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
>
>  
> MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
> -  MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
> -
> PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
> +  MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
> +
> PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
>    MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
> -
> +
>    #
> -  # Following are the DXE drivers
> +  # Following are the DXE drivers
>    #
>    MdeModulePkg/Universal/PCD/Dxe/Pcd.inf {
>      <LibraryClasses>
>        PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
>    }
> -
> +
>
>  
> IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
>    UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
>    MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
>
>  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
> -  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
> +  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
>    MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
> -  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
> +  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
>    MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
> -
> -  CorebootModulePkg/CbSupportDxe/CbSupportDxe.inf
> -
> +
> +  CorebootModulePkg/CbSupportDxe/CbSupportDxe.inf
> +
>    #
>    # SMBIOS Support
>    #
>    MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
> -
> +
>    #
>    # ACPI Support
>    #
> -  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
> -
> +  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
> +
>    #
>    # PCI Support
>    #
> -
> CorebootModulePkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
> -  CorebootModulePkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf
> -  CorebootModulePkg/PciSioSerialDxe/PciSioSerialDxe.inf
> -
> +
> CorebootModulePkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
> +  CorebootModulePkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf
> +  CorebootModulePkg/PciSioSerialDxe/PciSioSerialDxe.inf
> +
>    #
>    # SCSI/ATA/IDE/DISK Support
>    #
>    MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
>    MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
>    MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
> -  FatPkg/EnhancedFatDxe/Fat.inf
> -  CorebootModulePkg/SataControllerDxe/SataControllerDxe.inf
> +  FatPkg/EnhancedFatDxe/Fat.inf
> +  CorebootModulePkg/SataControllerDxe/SataControllerDxe.inf
>    MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
> -  MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
> +  MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
>    MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
>    MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
> -
> +
>    #
>    # Usb Support
>    #
> @@ -412,12 +411,12 @@
>    MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
>    MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
>    MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
> -
> +
>    #
>    # ISA Support
>    #
> -  CorebootModulePkg/SerialDxe/SerialDxe.inf
> -
> +  CorebootModulePkg/SerialDxe/SerialDxe.inf
> +
>    #
>    # Console Support
>    #
> @@ -425,77 +424,76 @@
>    MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
>    MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
>    MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
> -
> -
> +
>    #
> -  # Framebuffer Gop
> +  # Framebuffer Gop
>    #
>    CorebootPayloadPkg/FbGop/FbGop.inf
> -
> -  #------------------------------
> -  #  Build the shell
> -  #------------------------------
> -
> -!if $(SHELL_TYPE) == BUILD_SHELL
> -
> -[PcdsFixedAtBuild]
> -  ## This flag is used to control initialization of the shell library
> -  #  This should be FALSE for compiling the shell application itself only.
> -  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> -
> -  #
> -  # Shell Lib
> -  #
> -[LibraryClasses]
> -
> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
> -  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
> -  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> -
> -[Components.IA32]
> -  ShellPkg/Application/Shell/Shell.inf {
> -
> -    #------------------------------
> -    #  Basic commands
> -    #------------------------------
> -
> -    <LibraryClasses>
> -
> NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
> -
> NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
> -
> NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
> -
> NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
> -
> NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
> -
> NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
> -
> -    #------------------------------
> -    #  Networking commands
> -    #------------------------------
> -
> -    <LibraryClasses>
> -
> NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
> -
> NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf
> -
> -    #------------------------------
> -    #  Performance command
> -    #------------------------------
> -
> -    <LibraryClasses>
> -      NULL|ShellPkg/Library/UefiDpLib/UefiDpLib.inf
> -
> -    #------------------------------
> -    #  Support libraries
> -    #------------------------------
> -
> -    <LibraryClasses>
> -      DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
> -      DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
> -      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> -
> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
> -      NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> -      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
> -
> ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
> -
> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
> -      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> -      SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
> -  }
> -
> -!endif
> +
> +  #------------------------------
> +  #  Build the shell
> +  #------------------------------
> +
> +!if $(SHELL_TYPE) == BUILD_SHELL
> +
> +[PcdsFixedAtBuild]
> +  ## This flag is used to control initialization of the shell library
> +  #  This should be FALSE for compiling the shell application itself only.
> +  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> +
> +  #
> +  # Shell Lib
> +  #
> +[LibraryClasses]
> +
> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
> +  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
> +  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> +
> +[Components.IA32]
> +  ShellPkg/Application/Shell/Shell.inf {
> +
> +    #------------------------------
> +    #  Basic commands
> +    #------------------------------
> +
> +    <LibraryClasses>
> +
> NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
> +
> +    #------------------------------
> +    #  Networking commands
> +    #------------------------------
> +
> +    <LibraryClasses>
> +
> NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf
> +
> +    #------------------------------
> +    #  Performance command
> +    #------------------------------
> +
> +    <LibraryClasses>
> +      NULL|ShellPkg/Library/UefiDpLib/UefiDpLib.inf
> +
> +    #------------------------------
> +    #  Support libraries
> +    #------------------------------
> +
> +    <LibraryClasses>
> +      DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
> +      DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
> +      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> +
> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
> +      NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> +      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
> +
> ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
> +
> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
> +      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> +      SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
> +  }
> +
> +!endif
> diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
> b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
> index fec376d..90a484d 100644
> --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
> +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
> @@ -1,16 +1,16 @@
>  ## @file
>  # Coreboot Payload Package
>  #
> -# Provides drivers and definitions to create uefi payload for coreboot.
> +# Provides drivers and definitions to create uefi payload for coreboot.
>  #
> -# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License that accompanies this
> distribution.
> +# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
> +# This program and the accompanying materials are licensed and made
> available under
> +# the terms and conditions of the BSD License that 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.
> +# 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.
>  #
>  ##
>
> @@ -23,63 +23,63 @@
>    PLATFORM_NAME                       = CorebootPayloadPkg
>    PLATFORM_GUID                       =
> F71608AB-D63D-4491-B744-A99998C8CD96
>    PLATFORM_VERSION                    = 0.1
> -  DSC_SPECIFICATION                   = 0x00010005
> +  DSC_SPECIFICATION                   = 0x00010005
>    SUPPORTED_ARCHITECTURES             = IA32|X64
>    BUILD_TARGETS                       = DEBUG|RELEASE|NOOPT
>    SKUID_IDENTIFIER                    = DEFAULT
>    OUTPUT_DIRECTORY                    = Build/CorebootPayloadPkgX64
>    FLASH_DEFINITION                    =
> CorebootPayloadPkg/CorebootPayloadPkg.fdf
> -
> +
>    DEFINE SECURE_BOOT_ENABLE      = FALSE
>    DEFINE SOURCE_DEBUG_ENABLE     = FALSE
> -
> -  #
> -  # CPU options
> -  #
> -  DEFINE MAX_LOGICAL_PROCESSORS  = 64
> -
> -  #
> -  # Serial port set up
> -  #
> -  DEFINE BAUD_RATE                        = 115200
> -  DEFINE SERIAL_CLOCK_RATE                = 1843200
> -  DEFINE SERIAL_LINE_CONTROL              = 3 # 8-bits, no parity
> -  DEFINE SERIAL_HARDWARE_FLOW_CONTROL     = FALSE
> -  DEFINE SERIAL_DETECT_CABLE              = FALSE
> -  DEFINE SERIAL_FIFO_CONTROL              = 7 # Enable FIFO
> -  DEFINE SERIAL_EXTENDED_TX_FIFO_SIZE     = 16
> -  DEFINE UART_DEFAULT_BAUD_RATE           = $(BAUD_RATE)
> -  DEFINE UART_DEFAULT_DATA_BITS           = 8
> -  DEFINE UART_DEFAULT_PARITY              = 1
> -  DEFINE UART_DEFAULT_STOP_BITS           = 1
> -  DEFINE DEFAULT_TERMINAL_TYPE            = 0
> -
> -  #
> -  #  typedef struct {
> -  #    UINT16  VendorId;          ///< Vendor ID to match the PCI
> device.  The value 0xFFFF terminates the list of entries.
> -  #    UINT16  DeviceId;          ///< Device ID to match the PCI device
> -  #    UINT32  ClockRate;         ///< UART clock rate.  Set to 0 for
> default clock rate of 1843200 Hz
> -  #    UINT64  Offset;            ///< The byte offset into to the BAR
> -  #    UINT8   BarIndex;          ///< Which BAR to get the UART base
> address
> -  #    UINT8   RegisterStride;    ///< UART register stride in bytes.
> Set to 0 for default register stride of 1 byte.
> -  #    UINT16  ReceiveFifoDepth;  ///< UART receive FIFO depth in bytes.
> Set to 0 for a default FIFO depth of 16 bytes.
> -  #    UINT16  TransmitFifoDepth; ///< UART transmit FIFO depth in bytes.
> Set to 0 for a default FIFO depth of 16 bytes.
> -  #    UINT8   Reserved[2];
> -  #  } PCI_SERIAL_PARAMETER;
> -  #
> -  # Vendor 0000 Device 0000 Prog Interface 1, BAR #0, Offset 0, Stride =
> 1, Clock 1843200 (0x1c2000)
> -  #
> -  #                                           [Vendor]   [Device]
> [----ClockRate---]  [------------Offset-----------] [Bar] [Stride] [RxFifo]
> [TxFifo]   [Rsvd]   [Vendor]
> -  DEFINE PCI_SERIAL_PARAMETERS            = {0x00,0x00, 0x00,0x00,
> 0x0,0x20,0x1c,0x00, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x00,    0x01,
> 0x0,0x0, 0x0,0x0, 0x0,0x0, 0xff,0xff}
> -
> -  #
> -  # Shell options: [BUILD_SHELL, FULL_BIN, MIN_BIN, NONE, UEFI]
> -  #
> -  DEFINE SHELL_TYPE              = FULL_BIN
> -
> +
> +  #
> +  # CPU options
> +  #
> +  DEFINE MAX_LOGICAL_PROCESSORS  = 64
> +
> +  #
> +  # Serial port set up
> +  #
> +  DEFINE BAUD_RATE                        = 115200
> +  DEFINE SERIAL_CLOCK_RATE                = 1843200
> +  DEFINE SERIAL_LINE_CONTROL              = 3 # 8-bits, no parity
> +  DEFINE SERIAL_HARDWARE_FLOW_CONTROL     = FALSE
> +  DEFINE SERIAL_DETECT_CABLE              = FALSE
> +  DEFINE SERIAL_FIFO_CONTROL              = 7 # Enable FIFO
> +  DEFINE SERIAL_EXTENDED_TX_FIFO_SIZE     = 16
> +  DEFINE UART_DEFAULT_BAUD_RATE           = $(BAUD_RATE)
> +  DEFINE UART_DEFAULT_DATA_BITS           = 8
> +  DEFINE UART_DEFAULT_PARITY              = 1
> +  DEFINE UART_DEFAULT_STOP_BITS           = 1
> +  DEFINE DEFAULT_TERMINAL_TYPE            = 0
> +
> +  #
> +  #  typedef struct {
> +  #    UINT16  VendorId;          ///< Vendor ID to match the PCI
> device.  The value 0xFFFF terminates the list of entries.
> +  #    UINT16  DeviceId;          ///< Device ID to match the PCI device
> +  #    UINT32  ClockRate;         ///< UART clock rate.  Set to 0 for
> default clock rate of 1843200 Hz
> +  #    UINT64  Offset;            ///< The byte offset into to the BAR
> +  #    UINT8   BarIndex;          ///< Which BAR to get the UART base
> address
> +  #    UINT8   RegisterStride;    ///< UART register stride in bytes.
> Set to 0 for default register stride of 1 byte.
> +  #    UINT16  ReceiveFifoDepth;  ///< UART receive FIFO depth in bytes.
> Set to 0 for a default FIFO depth of 16 bytes.
> +  #    UINT16  TransmitFifoDepth; ///< UART transmit FIFO depth in bytes.
> Set to 0 for a default FIFO depth of 16 bytes.
> +  #    UINT8   Reserved[2];
> +  #  } PCI_SERIAL_PARAMETER;
> +  #
> +  # Vendor 0000 Device 0000 Prog Interface 1, BAR #0, Offset 0, Stride =
> 1, Clock 1843200 (0x1c2000)
> +  #
> +  #                                           [Vendor]   [Device]
> [----ClockRate---]  [------------Offset-----------] [Bar] [Stride] [RxFifo]
> [TxFifo]   [Rsvd]   [Vendor]
> +  DEFINE PCI_SERIAL_PARAMETERS            = {0x00,0x00, 0x00,0x00,
> 0x0,0x20,0x1c,0x00, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x00,    0x01,
> 0x0,0x0, 0x0,0x0, 0x0,0x0, 0xff,0xff}
> +
> +  #
> +  # Shell options: [BUILD_SHELL, FULL_BIN, MIN_BIN, NONE, UEFI]
> +  #
> +  DEFINE SHELL_TYPE              = FULL_BIN
> +
>  [BuildOptions]
> -  GCC:DEBUG_*_*_CC_FLAGS         = -Og -flto
> -  GCC:DEBUG_*_*_DLINK_FLAGS      = -flto
> +  GCC:DEBUG_*_*_CC_FLAGS         = -Og -flto
> +  GCC:DEBUG_*_*_DLINK_FLAGS      = -flto
>    GCC:*_UNIXGCC_*_CC_FLAGS       = -DMDEPKG_NDEBUG
>    GCC:RELEASE_*_*_CC_FLAGS       = -DMDEPKG_NDEBUG
>    INTEL:RELEASE_*_*_CC_FLAGS     = /D MDEPKG_NDEBUG
> @@ -111,7 +111,7 @@
>    #
>    # Basic
>    #
> -  BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
> +  BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
>    BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
>
>  
> SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
>    PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
> @@ -122,7 +122,7 @@
>    PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
>
>  
> PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
>
>  
> CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
> -
> +
>    #
>    # UEFI & PI
>    #
> @@ -139,7 +139,7 @@
>    DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
>
>  
> DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
>    UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> -
> +
>    #
>    # Generic Modules
>    #
> @@ -150,13 +150,13 @@
>
>  
> SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
>
>  GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
>
>  
> CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
> -
> +
>    #
>    # CPU
>    #
>    MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
> -  LocalApicLib|UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
> -
> +  LocalApicLib|UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
> +
>    #
>    # Platform
>    #
> @@ -165,7 +165,7 @@
>
>  
> SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
>
>  
> PlatformHookLib|CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf
>
>  PlatformBdsLib|CorebootPayloadPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
> -
> +
>    #
>    # Misc
>    #
> @@ -177,7 +177,7 @@
>
>  
> DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf
>  !else
>
>  
> PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf
> -
> DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
> +
> DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
>  !endif
>    CbParseLib|CorebootModulePkg/Library/CbParseLib/CbParseLib.inf
>
>  
> DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
> @@ -206,32 +206,32 @@
>    HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
>
>  
> MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
>
>  
> ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
> -
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> +
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
>  !if $(SOURCE_DEBUG_ENABLE)
>
>  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
> -!endif
> +!endif
>
>  
> CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf
>
> -[LibraryClasses.common.DXE_DRIVER]
> +[LibraryClasses.common.DXE_DRIVER]
>    PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
>    HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
>
>  
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
>
>  
> ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
>
>  
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
>
>  
> CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf
> -
> +
>  [LibraryClasses.common.DXE_RUNTIME_DRIVER]
>    PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
>    HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
>
>  
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
>
>  
> ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
> -
> +
>  [LibraryClasses.common.UEFI_DRIVER,LibraryClasses.common.UEFI_APPLICATION]
>    PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
>
>  
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
>
>  
> ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
> -  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
> -
> +  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
> +
>
>  
> ################################################################################
>  #
>  # Pcd Section - list of all EDK II PCD Entries defined by this Platform.
> @@ -248,8 +248,8 @@
>    gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x10000
>    gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize|0x8000
>    gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x10000
> -
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0
> +
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0
>    gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable|TRUE
>
>  !if $(SOURCE_DEBUG_ENABLE)
> @@ -257,42 +257,41 @@
>  !endif
>
>  [PcdsPatchableInModule.common]
> -  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x7
> -
> -  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
> -!if $(SOURCE_DEBUG_ENABLE)
> -  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
> -!else
> -  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F
> -!endif
> -
> -  #
> -  # The following parameters are set by Library/PlatformHookLib
> -  #
> +  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x7
> +  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
> +!if $(SOURCE_DEBUG_ENABLE)
> +  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
> +!else
> +  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F
> +!endif
> +
> +  #
> +  # The following parameters are set by Library/PlatformHookLib
> +  #
>    gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio|FALSE
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x3f8
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialBaudRate|$(BAUD_RATE)
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterStride|1
> -
> -  #
> -  # Enable these parameters to be set on the command line
> -  #
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialClockRate|$(SERIAL_CLOCK_RATE)
> -
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialLineControl|$(SERIAL_LINE_CONTROL)
> -
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|$(SERIAL_HARDWARE_FLOW_CONTROL)
> -
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialDetectCable|$(SERIAL_DETECT_CABLE)
> -
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialFifoControl|$(SERIAL_FIFO_CONTROL)
> -
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialExtendedTxFifoSize|$(SERIAL_EXTENDED_TX_FIFO_SIZE)
> -
> -
> gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|$(UART_DEFAULT_BAUD_RATE)
> -
> gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|$(UART_DEFAULT_DATA_BITS)
> -  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|$(UART_DEFAULT_PARITY)
> -
> gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|$(UART_DEFAULT_STOP_BITS)
> -  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|$(DEFAULT_TERMINAL_TYPE)
> -
> gEfiMdeModulePkgTokenSpaceGuid.PcdPciSerialParameters|$(PCI_SERIAL_PARAMETERS)
> -
> -
> gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber|$(MAX_LOGICAL_PROCESSORS)
> -
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x3f8
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialBaudRate|$(BAUD_RATE)
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterStride|1
> +
> +  #
> +  # Enable these parameters to be set on the command line
> +  #
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialClockRate|$(SERIAL_CLOCK_RATE)
> +
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialLineControl|$(SERIAL_LINE_CONTROL)
> +
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|$(SERIAL_HARDWARE_FLOW_CONTROL)
> +
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialDetectCable|$(SERIAL_DETECT_CABLE)
> +
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialFifoControl|$(SERIAL_FIFO_CONTROL)
> +
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialExtendedTxFifoSize|$(SERIAL_EXTENDED_TX_FIFO_SIZE)
> +
> +
> gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|$(UART_DEFAULT_BAUD_RATE)
> +
> gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|$(UART_DEFAULT_DATA_BITS)
> +  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|$(UART_DEFAULT_PARITY)
> +
> gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|$(UART_DEFAULT_STOP_BITS)
> +  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|$(DEFAULT_TERMINAL_TYPE)
> +
> gEfiMdeModulePkgTokenSpaceGuid.PcdPciSerialParameters|$(PCI_SERIAL_PARAMETERS)
> +
> +
> gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber|$(MAX_LOGICAL_PROCESSORS)
> +
>
>  
> ################################################################################
>  #
>  # Pcd Dynamic Section - list of all EDK II PCD Entries defined by this
> Platform
> @@ -305,7 +304,6 @@
>    gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
>    gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
>
> -
>
>  
> ################################################################################
>  #
>  # Components Section - list of all EDK II Modules needed by this Platform.
> @@ -316,12 +314,12 @@
>    # SEC Core
>    #
>    CorebootModulePkg/SecCore/SecCore.inf
> -
> +
>    #
>    # PEI Core
>    #
>    MdeModulePkg/Core/Pei/PeiMain.inf
> -
> +
>    #
>    # PEIM
>    #
> @@ -330,8 +328,8 @@
>        PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
>    }
>    IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
> -
> -  CorebootModulePkg/CbSupportPei/CbSupportPei.inf
> +
> +  CorebootModulePkg/CbSupportPei/CbSupportPei.inf
>    MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
>
>  [Components.X64]
> @@ -342,7 +340,7 @@
>      <LibraryClasses>
>
>  
> NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
>    }
> -
> +
>    #
>    # Components that produce the architectural protocols
>    #
> @@ -355,59 +353,59 @@
>    MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
>    MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
>
>  
> MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
> -  MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
> -
> PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
> +  MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
> +
> PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
>    MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
> -
> +
>    #
> -  # Following are the DXE drivers
> +  # Following are the DXE drivers
>    #
>    MdeModulePkg/Universal/PCD/Dxe/Pcd.inf {
>      <LibraryClasses>
>        PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
>    }
> -
> +
>
>  
> IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
>    UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
>    MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
>
>  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
> -  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
> +  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
>    MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
> -  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
> +  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
>    MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
> -
> -  CorebootModulePkg/CbSupportDxe/CbSupportDxe.inf
> -
> +
> +  CorebootModulePkg/CbSupportDxe/CbSupportDxe.inf
> +
>    #
>    # SMBIOS Support
>    #
>    MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
> -
> +
>    #
>    # ACPI Support
>    #
> -  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
> -
> +  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
> +
>    #
>    # PCI Support
> -  #
> -
> CorebootModulePkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
> -  CorebootModulePkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf
> -  CorebootModulePkg/PciSioSerialDxe/PciSioSerialDxe.inf
> -
> +  #
> +
> CorebootModulePkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
> +  CorebootModulePkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf
> +  CorebootModulePkg/PciSioSerialDxe/PciSioSerialDxe.inf
> +
>    #
>    # SCSI/ATA/IDE/DISK Support
>    #
>    MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
>    MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
>    MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
> -  FatPkg/EnhancedFatDxe/Fat.inf
> -  CorebootModulePkg/SataControllerDxe/SataControllerDxe.inf
> +  FatPkg/EnhancedFatDxe/Fat.inf
> +  CorebootModulePkg/SataControllerDxe/SataControllerDxe.inf
>    MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
> -  MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
> +  MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
>    MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
>    MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
> -
> +
>    #
>    # Usb Support
>    #
> @@ -417,12 +415,12 @@
>    MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
>    MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
>    MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
> -
> +
>    #
>    # ISA Support
>    #
> -  CorebootModulePkg/SerialDxe/SerialDxe.inf
> -
> +  CorebootModulePkg/SerialDxe/SerialDxe.inf
> +
>    #
>    # Console Support
>    #
> @@ -430,77 +428,76 @@
>    MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
>    MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
>    MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
> -
> -
> +
>    #
> -  # Framebuffer Gop
> +  # Framebuffer Gop
>    #
>    CorebootPayloadPkg/FbGop/FbGop.inf
> -
> -  #------------------------------
> -  #  Build the shell
> -  #------------------------------
> -
> -!if $(SHELL_TYPE) == BUILD_SHELL
> -
> -[PcdsFixedAtBuild]
> -  ## This flag is used to control initialization of the shell library
> -  #  This should be FALSE for compiling the shell application itself only.
> -  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> -
> -  #
> -  # Shell Lib
> -  #
> -[LibraryClasses]
> -
> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
> -  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
> -  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> -
> -[Components.X64]
> -  ShellPkg/Application/Shell/Shell.inf {
> -
> -    #------------------------------
> -    #  Basic commands
> -    #------------------------------
> -
> -    <LibraryClasses>
> -
> NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
> -
> NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
> -
> NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
> -
> NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
> -
> NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
> -
> NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
> -
> -    #------------------------------
> -    #  Networking commands
> -    #------------------------------
> -
> -    <LibraryClasses>
> -
> NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
> -
> NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf
> -
> -    #------------------------------
> -    #  Performance command
> -    #------------------------------
> -
> -    <LibraryClasses>
> -      NULL|ShellPkg/Library/UefiDpLib/UefiDpLib.inf
> -
> -    #------------------------------
> -    #  Support libraries
> -    #------------------------------
> -
> -    <LibraryClasses>
> -      DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
> -      DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
> -      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> -
> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
> -      NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> -      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
> -
> ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
> -
> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
> -      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> -      SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
> -  }
> -
> -!endif
> +
> +  #------------------------------
> +  #  Build the shell
> +  #------------------------------
> +
> +!if $(SHELL_TYPE) == BUILD_SHELL
> +
> +[PcdsFixedAtBuild]
> +  ## This flag is used to control initialization of the shell library
> +  #  This should be FALSE for compiling the shell application itself only.
> +  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> +
> +  #
> +  # Shell Lib
> +  #
> +[LibraryClasses]
> +
> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
> +  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
> +  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> +
> +[Components.X64]
> +  ShellPkg/Application/Shell/Shell.inf {
> +
> +    #------------------------------
> +    #  Basic commands
> +    #------------------------------
> +
> +    <LibraryClasses>
> +
> NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
> +
> +    #------------------------------
> +    #  Networking commands
> +    #------------------------------
> +
> +    <LibraryClasses>
> +
> NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf
> +
> +    #------------------------------
> +    #  Performance command
> +    #------------------------------
> +
> +    <LibraryClasses>
> +      NULL|ShellPkg/Library/UefiDpLib/UefiDpLib.inf
> +
> +    #------------------------------
> +    #  Support libraries
> +    #------------------------------
> +
> +    <LibraryClasses>
> +      DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
> +      DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
> +      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> +
> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
> +      NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> +      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
> +
> ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
> +
> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
> +      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> +      SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
> +  }
> +
> +!endif
> --
> 1.9.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
>
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to