Skip to content

Commit

Permalink
Fix line endings (LF to CRLF)
Browse files Browse the repository at this point in the history 
Since we are currently aligned on CRLF line endings (inherited from
TianoCore), this change updates any non-CRLF line endings to be
CRLF.

Fixes errors reported by Line Ending Check Test.
  • Loading branch information
@TaylorBeebe
TaylorBeebe committed Nov 4, 2022
1 parent cec471f commit c853b99
Show file tree
Hide file tree
Showing 4 changed files with 247 additions and 247 deletions.
130 changes: 65 additions & 65 deletions Platforms/QemuQ35Pkg/FvmainCompactScratchEnd.inc.fdf
View file
Original file line number Diff line number Diff line change
@@ -1,65 +1,65 @@
## @file
# This FDF include file computes the end of the scratch buffer used in
# DecompressMemFvs() [QemuQ35Pkg/Sec/SecMain.c]. It is based on the decompressed
# (ie. original) size of the LZMA-compressed section of the one FFS file in
# the FVMAIN_COMPACT firmware volume.
#
# Copyright (C) 2015, Red Hat, Inc.
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
##

# The GUID EE4E5898-3914-4259-9D6E-DC7BD79403CF means "LzmaCustomDecompress".
# The decompressed output will have the following structure (see the file
# "9E21FD93-9C72-4c15-8C4B-E77F1DB2D792SEC1.guided.dummy" in the
# Build/Ovmf*/*/FV/Ffs/9E21FD93-9C72-4c15-8C4B-E77F1DB2D792/ directory):
#
# Size Contents
# ------------------- --------------------------------------------------------
# 4 EFI_COMMON_SECTION_HEADER, stating size 124 (0x7C) and
# type 0x19 (EFI_SECTION_RAW). The purpose of this section
# is to pad the start of PEIFV to 128 bytes.
# 120 Zero bytes (padding).
#
# 4 EFI_COMMON_SECTION_HEADER, stating size
# (PcdOvmfPeiMemFvSize + 4), and type 0x17
# (EFI_SECTION_FIRMWARE_VOLUME_IMAGE).
# PcdOvmfPeiMemFvSize PEIFV. Note that the above sizes pad the offset of this
# object to 128 bytes. See also the "guided.dummy.txt"
# file in the same directory.
#
# 4 EFI_COMMON_SECTION_HEADER, stating size 12 (0xC) and
# type 0x19 (EFI_SECTION_RAW). The purpose of this section
# is to pad the start of DXEFV to 16 bytes.
# 8 Zero bytes (padding).
#
# 4 EFI_COMMON_SECTION_HEADER, stating size
# (PcdOvmfDxeMemFvSize + 4), and type 0x17
# (EFI_SECTION_FIRMWARE_VOLUME_IMAGE).
# PcdOvmfDxeMemFvSize DXEFV. Note that the above sizes pad the offset of this
# object to 16 bytes. See also the "guided.dummy.txt" file
# in the same directory.
#
# The total size after decompression is (128 + PcdOvmfPeiMemFvSize + 16 +
# PcdOvmfDxeMemFvSize).

DEFINE OUTPUT_SIZE = (128 + gUefiQemuQ35PkgTokenSpaceGuid.PcdOvmfPeiMemFvSize + 16 + gUefiQemuQ35PkgTokenSpaceGuid.PcdOvmfDxeMemFvSize)

# LzmaCustomDecompressLib uses a constant scratch buffer size of 64KB; see
# SCRATCH_BUFFER_REQUEST_SIZE in
# "MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompress.c".

DEFINE DECOMP_SCRATCH_SIZE = 0x00010000

# Note: when we use PcdOvmfDxeMemFvBase in this context, BaseTools have not yet
# offset it with MEMFD's base address. For that reason we have to do it manually.
#
# The calculation below mirrors DecompressMemFvs() [QemuQ35Pkg/Sec/SecMain.c].

DEFINE OUTPUT_BASE = ($(MEMFD_BASE_ADDRESS) + gUefiQemuQ35PkgTokenSpaceGuid.PcdOvmfDxeMemFvBase + 0x00100000)
DEFINE DECOMP_SCRATCH_BASE_UNALIGNED = ($(OUTPUT_BASE) + $(OUTPUT_SIZE))
DEFINE DECOMP_SCRATCH_BASE_ALIGNMENT = 0x000FFFFF
DEFINE DECOMP_SCRATCH_BASE_MASK = 0xFFF00000
DEFINE DECOMP_SCRATCH_BASE = (($(DECOMP_SCRATCH_BASE_UNALIGNED) + $(DECOMP_SCRATCH_BASE_ALIGNMENT)) & $(DECOMP_SCRATCH_BASE_MASK))

SET gUefiQemuQ35PkgTokenSpaceGuid.PcdOvmfDecompressionScratchEnd = $(DECOMP_SCRATCH_BASE) + $(DECOMP_SCRATCH_SIZE)
## @file
# This FDF include file computes the end of the scratch buffer used in
# DecompressMemFvs() [QemuQ35Pkg/Sec/SecMain.c]. It is based on the decompressed
# (ie. original) size of the LZMA-compressed section of the one FFS file in
# the FVMAIN_COMPACT firmware volume.
#
# Copyright (C) 2015, Red Hat, Inc.
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
##
# The GUID EE4E5898-3914-4259-9D6E-DC7BD79403CF means "LzmaCustomDecompress".
# The decompressed output will have the following structure (see the file
# "9E21FD93-9C72-4c15-8C4B-E77F1DB2D792SEC1.guided.dummy" in the
# Build/Ovmf*/*/FV/Ffs/9E21FD93-9C72-4c15-8C4B-E77F1DB2D792/ directory):
#
# Size Contents
# ------------------- --------------------------------------------------------
# 4 EFI_COMMON_SECTION_HEADER, stating size 124 (0x7C) and
# type 0x19 (EFI_SECTION_RAW). The purpose of this section
# is to pad the start of PEIFV to 128 bytes.
# 120 Zero bytes (padding).
#
# 4 EFI_COMMON_SECTION_HEADER, stating size
# (PcdOvmfPeiMemFvSize + 4), and type 0x17
# (EFI_SECTION_FIRMWARE_VOLUME_IMAGE).
# PcdOvmfPeiMemFvSize PEIFV. Note that the above sizes pad the offset of this
# object to 128 bytes. See also the "guided.dummy.txt"
# file in the same directory.
#
# 4 EFI_COMMON_SECTION_HEADER, stating size 12 (0xC) and
# type 0x19 (EFI_SECTION_RAW). The purpose of this section
# is to pad the start of DXEFV to 16 bytes.
# 8 Zero bytes (padding).
#
# 4 EFI_COMMON_SECTION_HEADER, stating size
# (PcdOvmfDxeMemFvSize + 4), and type 0x17
# (EFI_SECTION_FIRMWARE_VOLUME_IMAGE).
# PcdOvmfDxeMemFvSize DXEFV. Note that the above sizes pad the offset of this
# object to 16 bytes. See also the "guided.dummy.txt" file
# in the same directory.
#
# The total size after decompression is (128 + PcdOvmfPeiMemFvSize + 16 +
# PcdOvmfDxeMemFvSize).
DEFINE OUTPUT_SIZE = (128 + gUefiQemuQ35PkgTokenSpaceGuid.PcdOvmfPeiMemFvSize + 16 + gUefiQemuQ35PkgTokenSpaceGuid.PcdOvmfDxeMemFvSize)
# LzmaCustomDecompressLib uses a constant scratch buffer size of 64KB; see
# SCRATCH_BUFFER_REQUEST_SIZE in
# "MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompress.c".
DEFINE DECOMP_SCRATCH_SIZE = 0x00010000
# Note: when we use PcdOvmfDxeMemFvBase in this context, BaseTools have not yet
# offset it with MEMFD's base address. For that reason we have to do it manually.
#
# The calculation below mirrors DecompressMemFvs() [QemuQ35Pkg/Sec/SecMain.c].
DEFINE OUTPUT_BASE = ($(MEMFD_BASE_ADDRESS) + gUefiQemuQ35PkgTokenSpaceGuid.PcdOvmfDxeMemFvBase + 0x00100000)
DEFINE DECOMP_SCRATCH_BASE_UNALIGNED = ($(OUTPUT_BASE) + $(OUTPUT_SIZE))
DEFINE DECOMP_SCRATCH_BASE_ALIGNMENT = 0x000FFFFF
DEFINE DECOMP_SCRATCH_BASE_MASK = 0xFFF00000
DEFINE DECOMP_SCRATCH_BASE = (($(DECOMP_SCRATCH_BASE_UNALIGNED) + $(DECOMP_SCRATCH_BASE_ALIGNMENT)) & $(DECOMP_SCRATCH_BASE_MASK))
SET gUefiQemuQ35PkgTokenSpaceGuid.PcdOvmfDecompressionScratchEnd = $(DECOMP_SCRATCH_BASE) + $(DECOMP_SCRATCH_SIZE)
Loading

0 comments on commit c853b99

Please # to comment.