Skip to content

ArmVirt: move Defines section to new include file #10997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ArmVirt: move Defines section to new include file #10997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions ArmVirtPkg/ArmVirt.dsc.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,38 +8,6 @@
#
#

[Defines]

#
# Shell can be useful for debugging but should not be enabled for production
#
DEFINE BUILD_SHELL = TRUE

DEFINE DEBUG_PRINT_ERROR_LEVEL = 0x8000004F

# Dynamic stack cookies pushes the FD size up slightly over 2MB
!if $(TARGET) != NOOPT && $(ARCH) == ARM
DEFINE FD_SIZE_IN_MB = 2
!else
DEFINE FD_SIZE_IN_MB = 3
!endif

!if $(FD_SIZE_IN_MB) == 2
DEFINE FD_SIZE = 0x200000
DEFINE FD_NUM_BLOCKS = 0x200
!endif
!if $(FD_SIZE_IN_MB) == 3
DEFINE FD_SIZE = 0x300000
DEFINE FD_NUM_BLOCKS = 0x300
!endif

# Dynamic stack cookies are not supported on ARM
!if $(ARCH) == ARM
DEFINE CUSTOM_STACK_CHECK_LIB = STATIC
!else
DEFINE CUSTOM_STACK_CHECK_LIB = DYNAMIC
!endif

[BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEFI_APPLICATION]
GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000

Expand Down
3 changes: 2 additions & 1 deletion ArmVirtPkg/ArmVirtCloudHv.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
DEFINE SECURE_BOOT_ENABLE = FALSE

# This comes before MdeLibs to ensure stack cookie configuration is chosen
!include ArmVirtPkg/ArmVirt.dsc.inc
!include ArmVirtPkg/ArmVirtDefines.dsc.inc

[LibraryClasses.common]
ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
Expand Down Expand Up @@ -59,6 +59,7 @@
TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLibNull/PeiDxeTpmPlatformHierarchyLib.inf

!include MdePkg/MdeLibs.dsc.inc
!include ArmVirtPkg/ArmVirt.dsc.inc

[LibraryClasses.common.PEIM]
ArmVirtMemInfoLib|ArmVirtPkg/Library/CloudHvVirtMemInfoLib/CloudHvVirtMemInfoPeiLib.inf
Expand Down
35 changes: 35 additions & 0 deletions ArmVirtPkg/ArmVirtDefines.dsc.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#

[Defines]

#
# Shell can be useful for debugging but should not be enabled for production
#
DEFINE BUILD_SHELL = TRUE

DEFINE DEBUG_PRINT_ERROR_LEVEL = 0x8000004F

# Dynamic stack cookies pushes the FD size up slightly over 2MB
!if $(TARGET) != NOOPT && $(ARCH) == ARM
DEFINE FD_SIZE_IN_MB = 2
!else
DEFINE FD_SIZE_IN_MB = 3
!endif

!if $(FD_SIZE_IN_MB) == 2
DEFINE FD_SIZE = 0x200000
DEFINE FD_NUM_BLOCKS = 0x200
!endif
!if $(FD_SIZE_IN_MB) == 3
DEFINE FD_SIZE = 0x300000
DEFINE FD_NUM_BLOCKS = 0x300
!endif

# Dynamic stack cookies are not supported on ARM
!if $(ARCH) == ARM
DEFINE CUSTOM_STACK_CHECK_LIB = STATIC
!else
DEFINE CUSTOM_STACK_CHECK_LIB = DYNAMIC
!endif
3 changes: 2 additions & 1 deletion ArmVirtPkg/ArmVirtKvmTool.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,14 @@


# This comes before MdeLibs to ensure stack cookie configuration is chosen
!include ArmVirtPkg/ArmVirt.dsc.inc
!include ArmVirtPkg/ArmVirtDefines.dsc.inc

!if $(ARCH) == AARCH64
!include DynamicTablesPkg/DynamicTables.dsc.inc
!endif

!include MdePkg/MdeLibs.dsc.inc
!include ArmVirtPkg/ArmVirt.dsc.inc

[LibraryClasses.common]
ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
Expand Down
3 changes: 2 additions & 1 deletion ArmVirtPkg/ArmVirtQemu.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,10 @@
!include NetworkPkg/NetworkDefines.dsc.inc

# This comes before MdeLibs to ensure stack cookie configuration is chosen
!include ArmVirtPkg/ArmVirt.dsc.inc
!include ArmVirtPkg/ArmVirtDefines.dsc.inc

!include MdePkg/MdeLibs.dsc.inc
!include ArmVirtPkg/ArmVirt.dsc.inc

[LibraryClasses.common]
ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
Expand Down
3 changes: 2 additions & 1 deletion ArmVirtPkg/ArmVirtQemuKernel.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,10 @@
!include NetworkPkg/NetworkDefines.dsc.inc

# This comes before MdeLibs to ensure stack cookie configuration is chosen
!include ArmVirtPkg/ArmVirt.dsc.inc
!include ArmVirtPkg/ArmVirtDefines.dsc.inc

!include MdePkg/MdeLibs.dsc.inc
!include ArmVirtPkg/ArmVirt.dsc.inc

[LibraryClasses.common]
ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
Expand Down
3 changes: 2 additions & 1 deletion ArmVirtPkg/ArmVirtXen.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@
FLASH_DEFINITION = ArmVirtPkg/ArmVirtXen.fdf

# This comes before MdeLibs to ensure stack cookie configuration is chosen
!include ArmVirtPkg/ArmVirt.dsc.inc
!include ArmVirtPkg/ArmVirtDefines.dsc.inc

!include MdePkg/MdeLibs.dsc.inc
!include ArmVirtPkg/ArmVirt.dsc.inc

[LibraryClasses]
SerialPortLib|OvmfPkg/Library/XenConsoleSerialPortLib/XenConsoleSerialPortLib.inf
Expand Down
Loading