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=tMSUWPi2; spf=pass (domain: linaro.org, ip: 209.85.210.193, mailfrom: ard.biesheuvel@linaro.org) Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by groups.io with SMTP; Mon, 15 Apr 2019 15:43:16 -0700 Received: by mail-pf1-f193.google.com with SMTP id 188so9332354pfd.8 for ; Mon, 15 Apr 2019 15:43:16 -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; bh=E07wfTccRuHLM9ETyjO88abGs9+t39Tkwn/ubh8vfZg=; b=tMSUWPi2evx8EMAoAFhH1rNPTV30MxjGoNTrQS1yVr4FafcLP0JRD0Cvrr+qSCcEuK ErkmaWVlvd3JCMKysd0C45yZNmQC3CdpT8JrmseUOIrMYnGaokG42Y1jxGy1XmHYPmgB SBirzdsiTgMegtQUB0nDRMIZ9PnoxrUWGN6Fi8Br76JEfFUSlScMJmycXco08j8qY4KE U60LPBXlKrfcWSj3cWRCdJjszgcY3WOqFAni+dulAmoscbxdPxuqlUuoqUuvfrfxTLSw BbL+19F9bWb/UxXglKG1qeIsp55OuBlQtKYhycgFMSasihJXMh62YVqD6DrVGmN5InBL 9bKg== 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; bh=E07wfTccRuHLM9ETyjO88abGs9+t39Tkwn/ubh8vfZg=; b=ptslv9DRss/vPol+OtldXjxvi5OaWOQ0gH7wJya8DMKVxT9LehjrXi5Rq/NpYuHudH RsK0Knf7k/mdZWITLD2UKQsmvXzMvMxgY3zmTZXeZwFi49eLIY8V/uIXXAO+i8thmevl C2gVEhqk5rjEBPZwRPuJXFtS5A2S1MtLIYPAMhIQzF7uP55f6NvZjbO+OYtBW0caO1aC 53Din3wsDSEzBH5DArdP3psVeNWwUGuWQY5tYTjD45DJw4hBAGYxtUR3MW18aNmr5vG0 I10OOfzWJUj7WmEFt5PjvU74OyDL7m87ihvSG8yyd7kDjz0k0IWv6526d6wY+yfeqZLW cDuQ== X-Gm-Message-State: APjAAAVkaK9V0CJh1c0XDmzEx9LenQeQ+1y5Qh8YcaL3treQtOkq2Iqz Mw0oy9czXnXs3F5rXmIuoAZN3GtUkswZBQ== X-Google-Smtp-Source: APXvYqxPFKNhR7x7jVxeOoFj5HzCYu20z2Tx+Oj4SfD6M8KPxaeHuiuBWtpAkwtv338a93jVrtnuKQ== X-Received: by 2002:a63:fa54:: with SMTP id g20mr69553690pgk.242.1555368195703; Mon, 15 Apr 2019 15:43:15 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([217.140.103.76]) by smtp.gmail.com with ESMTPSA id q87sm79517798pfa.133.2019.04.15.15.43.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 15:43:14 -0700 (PDT) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, mw@semihalf.com, jeremy.linton@arm.com, Ard Biesheuvel Subject: [PATCH edk2-platforms 3/3] Platform/MacchiatoBin: conditionally include the X64 PE/COFF emulator Date: Mon, 15 Apr 2019 15:43:03 -0700 Message-Id: <20190415224303.7369-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190415224303.7369-1-ard.biesheuvel@linaro.org> References: <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 --- 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