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=xklG9pf2; 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:31 -0700 Received: by mail-wr1-f66.google.com with SMTP id t17so13422501wrr.4 for ; Wed, 24 Apr 2019 06:24:30 -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=VOG8QHDnJcixFYZ/6f/reHd/ixLTV/mAxs6k1QfQvc0=; b=xklG9pf2mPK3dsZuStWzz0lY1CBbWcHbRHhDdAQqKq49vGt892d9Am02jBcj6KJI3m dQvQCPPEWQ1KBW52t2XAatnAJ3jKTgc1Ez+mcax9s0gJjxoMrqknUAYOhGpjUJTVYnb7 gUgUv812iJZq9M63dO6BSTErEeQje5J27jSLEiLFbIuvp0nInqrxRfihXqtrAv7KvxAg 1SH6k1su6RhBlxkeHLfPTNbtdEgumdFXGDujEFbFE1NW3WIiBJXz0QjnKLmTE0m3bzDS wwzVN9O/m4N67QkYdQn46EhUsVOwlrMjIqvktQWp6eiXcs10mVdFqoG7yMskECQatT6F CUyg== 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=VOG8QHDnJcixFYZ/6f/reHd/ixLTV/mAxs6k1QfQvc0=; b=HYaC8CujR1VV5mHITnDIPfIEytMf5yPyD0Z5rLlYv8keY+AZGei/nlkURRmwWZw88U f+YxVv1sa1Dj8p4VfkBgohx9uhfOG+/HPBqVKQ9PPeF0AdyziWIPheVjlmHwhgllSOAm lteSeIncP4kIcOlRN7jV9SmccvjX1wtLRqrNqqimbqYofr9Xu/oU867zW//1D96hm0AX tQA54nSc0KqyLfdPWDEp0z0IBmedia8D2bMKm1jPakqULyuhG8pK+LxfM8ZgN6W/Vk4X YFQOqYNfQZe6oIuJlJ+QRBlmZjfbu0ohm2lc9e32PPTY0FxPYOn27ts3osnoIj+2nr84 exjg== X-Gm-Message-State: APjAAAWTGYrZ2dsljcyviMsNLSJ3Z23a8TWhWeUswOfj2wtkQCeYI2Yc udYQGYPEl8Sa+Iepyg5Nq8tn9wcP4mGZig== X-Google-Smtp-Source: APXvYqweGHY7JEzEt87k+mL8ui4YY/nAxtQvhBftvJmbpPnGUwcrqVAFLBtYN0jN+QVTqSvB/LoKsg== X-Received: by 2002:a5d:664c:: with SMTP id f12mr22553070wrw.302.1556112269275; Wed, 24 Apr 2019 06:24:29 -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.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Apr 2019 06:24:28 -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 3/3] Platform/MacchiatoBin: conditionally include the X64 PE/COFF emulator Date: Wed, 24 Apr 2019 15:23:57 +0200 Message-Id: <20190424132357.8565-4-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. 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 --- Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf index e90e10e69623..ccfeb90102a2 100644 --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf @@ -220,6 +220,10 @@ FvNameGuid = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c # ACPI support INF MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf +!if $(X64EMU_ENABLE) == TRUE + # PE/COFF emulator for X64 option ROMs taken from edk2-non-osi + INF Emulator/X86EmulatorDxe/X86EmulatorDxe.inf +!endif !endif !include $(BOARD_DXE_FV_COMPONENTS) -- 2.20.1