From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=MMAyOcOi; spf=pass (domain: linaro.org, ip: 209.85.221.66, mailfrom: ard.biesheuvel@linaro.org) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by groups.io with SMTP; Wed, 24 Apr 2019 06:24:28 -0700 Received: by mail-wr1-f66.google.com with SMTP id c12so18976518wrt.8 for ; Wed, 24 Apr 2019 06:24:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EbiIFGRAkwY+cE9RhrPsqOOEW6osTydKt83G2OWVo84=; b=MMAyOcOiPqzWvab2mxOU3vIBP+0g8B5l0UIxmTb8PGmBLa5V+k4VYQFB2B1NkcbZwb r/kWvZ8Mzeo1c2f0AjyS/fL8nwU1Rmjk8B0mA2Ty8qd+x0Jjx9eqR3R/f4CsLLEKTyyh P4fdQi9bhaW3HSi2CkbfXwcDOipZT5BLaSFq/yTCsOPpD2auRV6JA9eWByl8eUAjdihf 6L11Cl9lib9CK6OA6NsZWnCQktPElkIgY1X+77L+2ymSV+su4qBAwiglW3ERCa9CBkp9 TkzPjEEgDUNHSnodpu8L7k2MMJI8RyYHN3EcFvz7LgNeLIGcC9zE3+xcxbijNJLdJliZ jchQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EbiIFGRAkwY+cE9RhrPsqOOEW6osTydKt83G2OWVo84=; b=Zoq6kKVL0Okeg6zmgNQ+u3hzVjKoRXzfHyOdxBDEmmjOQ2hnMjRgY1Cn6BOnxxDeyO jobeUMg/peadcISk84z50YAHfk5HVafRpkLj+879NjcHwThQC0YG3zuSkH5ftdkrnitK 5TuTSiJMOoeVBl0Tv6OHmGSHwd5khTYrQTwxso0eOZuiNIRm1zNKRqV2R+HWXYcVt7ZV 49GoZcL9ADA64BaSjfVM8uGLhMwKfPH37X0rIZ1bVZo62uCHgAvlFPC62VsOp7Eue5Oa f0LHpd1wQujurg7u1c6vqyFr4d5WAaeebDX0PTEfTBQL+O4GFdJEhD4UeY/eRAPWIaSH SM4w== X-Gm-Message-State: APjAAAWZMWEEkBrzlKeIRlgbUisj6Gtr7e/zgrigo7eXAXlXseQEfUc+ g4KGzdWs+vdZlxOMIFkDdlLjfN/z+4D6yg== X-Google-Smtp-Source: APXvYqyhACkYcXty3fmqj+gHUA8npa5etRei/QXYtKH9kKMdlptBda0SWK4LAyKF6JbtrD5pXHMk4g== X-Received: by 2002:adf:e407:: with SMTP id g7mr21009445wrm.47.1556112266648; Wed, 24 Apr 2019 06:24:26 -0700 (PDT) Return-Path: Received: from localhost.localdomain (91-167-84-221.subs.proxad.net. [91.167.84.221]) by smtp.gmail.com with ESMTPSA id x18sm21281291wrw.14.2019.04.24.06.24.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Apr 2019 06:24:25 -0700 (PDT) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, mw@semihalf.com, Ard Biesheuvel Subject: [PATCH edk2-platforms v2 1/3] Platform/DeveloperBox: conditionally include the X64 PE/COFF emulator Date: Wed, 24 Apr 2019 15:23:55 +0200 Message-Id: <20190424132357.8565-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190424132357.8565-1-ard.biesheuvel@linaro.org> References: <20190424132357.8565-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 1 + Platform/Socionext/DeveloperBox/DeveloperBox.fdf | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc index 4ddb0d427f13..909cfb550757 100644 --- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc @@ -30,6 +30,7 @@ DEFINE DEBUG_ON_UART1 = FALSE DEFINE SECURE_BOOT_ENABLE = FALSE + DEFINE X64EMU_ENABLE = FALSE !include Platform/Socionext/DeveloperBox/DeveloperBox.dsc.inc diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf index 72997e143de5..e6b42fc2028c 100644 --- a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf @@ -159,6 +159,9 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf !if $(ARCH) == AARCH64 INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf +!if $(X64EMU_ENABLE) == TRUE + INF Emulator/X86EmulatorDxe/X86EmulatorDxe.inf +!endif !endif INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf -- 2.20.1