public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Ard Biesheuvel" <ard.biesheuvel@linaro.org>
To: devel@edk2.groups.io
Cc: leif.lindholm@linaro.org, mw@semihalf.com, jeremy.linton@arm.com,
	Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [PATCH edk2-platforms 3/3] Platform/MacchiatoBin: conditionally include the X64 PE/COFF emulator
Date: Mon, 15 Apr 2019 15:43:03 -0700	[thread overview]
Message-ID: <20190415224303.7369-4-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <20190415224303.7369-1-ard.biesheuvel@linaro.org>

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.biesheuvel@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


  parent reply	other threads:[~2019-04-15 22:43 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-15 22:43 [PATCH edk2-platforms 0/3] add X64 PE/COFF emulator to PCI systems Ard Biesheuvel
2019-04-15 22:43 ` [PATCH edk2-platforms 1/3] Platform/DeveloperBox: conditionally include the X64 PE/COFF emulator Ard Biesheuvel
2019-04-15 22:43 ` [PATCH edk2-platforms 2/3] Platform/Overdrive: " Ard Biesheuvel
2019-04-15 22:43 ` Ard Biesheuvel [this message]
2019-04-16  3:14   ` [edk2-devel] [PATCH edk2-platforms 3/3] Platform/MacchiatoBin: " Marcin Wojtas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190415224303.7369-4-ard.biesheuvel@linaro.org \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox