summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2017-10-23 12:24:21 +0100
committerArd Biesheuvel <ard.biesheuvel@linaro.org>2018-06-01 12:13:28 +0200
commitf5e1ac7221d9e249f5eb551c52c559c8c51ca5d4 (patch)
treec6f5350682144fe28526af9bec0f1fcb7ba406cc
parent0a4791eea9bb3d3bcb61b72a23ea7e6835eab928 (diff)
Platform/DeveloperBox: conditionally add the X86 emulator to the buildbuild39-f5e1ac72build38-f5e1ac72
Add the X86 emulator to the build if '-D DO_X86EMU=TRUE' is passed on the build command line. Note that this requires a version of the edk2-non-osi repository that contains the binaries. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-rw-r--r--Platform/Socionext/DeveloperBox/DeveloperBox.dsc2
-rw-r--r--Platform/Socionext/DeveloperBox/DeveloperBox.fdf7
2 files changed, 9 insertions, 0 deletions
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
index 3a397c17..5f76b743 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
@@ -28,6 +28,8 @@
FLASH_DEFINITION = Platform/Socionext/DeveloperBox/DeveloperBox.fdf
BUILD_NUMBER = 1
+ DEFINE DO_X86EMU = FALSE
+
[BuildOptions]
RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
index 434ff2d9..f3618fd1 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
@@ -270,6 +270,13 @@ READ_LOCK_STATUS = TRUE
INF Platform/Socionext/DeveloperBox/OsInstallerMenuDxe/OsInstallerMenuDxe.inf
+!if $(DO_X86EMU) == TRUE
+ #
+ # x86 emulator
+ #
+ INF Emulator/X86EmulatorDxe/X86EmulatorDxe.inf
+!endif
+
[FV.FVMAIN_COMPACT]
FvAlignment = 16
BlockSize = 0x10000