Add the X64 emulator to the build if '-D X64EMU_ENABLE=TRUE' is passed on the build command line. Note that this only works on AARCH64 builds. Also note that the edk2-non-osi repository needs to be listed in the PACKAGES_PATH environment variable.
Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org> --- Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc | 1 + Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc index d08013612ff7..0156c6edc8a5 100644 --- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc +++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc @@ -46,6 +46,7 @@ FLASH_DEFINITION = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf BOARD_DXE_FV_COMPONENTS = Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc CAPSULE_ENABLE = TRUE + X64EMU_ENABLE = FALSE !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc index 254fcee3419c..ce3ed1bce82a 100644 --- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc +++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc @@ -19,4 +19,7 @@ !if $(ARCH) == AARCH64 INF RuleOverride = ACPITABLE Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin.inf +!if $(X64EMU_ENABLE) == TRUE + INF Emulator/X86EmulatorDxe/X86EmulatorDxe.inf +!endif !endif -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39132): https://edk2.groups.io/g/devel/message/39132 Mute This Topic: https://groups.io/mt/31193877/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-