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=SznYL1QD; spf=pass (domain: linaro.org, ip: 209.85.214.193, mailfrom: ard.biesheuvel@linaro.org) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by groups.io with SMTP; Mon, 15 Apr 2019 15:43:15 -0700 Received: by mail-pl1-f193.google.com with SMTP id b3so9288420plr.7 for ; Mon, 15 Apr 2019 15:43:15 -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=afCPuW0BJHVWnnDJIbyGnUssvHgtfafJT5QRYPo+CIw=; b=SznYL1QD5muCe0in64di7qxTKQ3rvEyViN/9inGYh2IftuGa0HxIP3q8unouewyq4W DfbjSQOSyA4OTG8/6QuRX3U1nQzFS6/BYgARtGOLKRp5lV3yrXyvcXCGxpdB04cmmnqk Jevofj0meVxgfA6mUfJkimcUoHkH9I6JAxi2Q+FfianoXlalK/FRYQhs6jgWLZLSLOGA PFcIoit4IFPOAsmQu+EdxcYXGCN9+HgkAgeFC7sxbw/oS0GkzP1PauaGAAYEk+cha+7G kKdsUSoLyniM+8S/ks8sswDmJ2tHVKlCY4fB2R1KZDK0+nBl+ztwmB9vnjG192XlrU0u hY/A== 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=afCPuW0BJHVWnnDJIbyGnUssvHgtfafJT5QRYPo+CIw=; b=lr0SqX0AsrCLfiNgs62ar1b4s1Q7CTcEsrtZP8K5v+R+bSgezZVRz2KatyLCvbIZWR +Qwlt+fduahFoC+BhU+1pJ00cjmxsEKJKuFyJB6JRmjkwLx0E3ln7bk1DQnYID0DRYEF yMK4RSr6JSQDXDKTnPkgGie/Y6pY6qmRmyFrLy2z9fSPlYrLzYermgoTyMTSZDSnNyIq awrV4LMmBKh9Cpg35hyLzC9DqZbYQGfeP8umQFXLzbjNz5LhF8YryAH1zCN3me5Hcouy lktVBL70NucgObYzB4/QgjpdlFiQfUnIW3JVeD9EEhyymopfnCAD+eEYI0O16yGsYdzU aEIg== X-Gm-Message-State: APjAAAUTdYENDqp+o3lYJ4o7RlR0MI1xwSBEICIrwvHuXFIsRbUEdPDq 6QnJutizBvKHzjF6KGU1mhi756dr/GJ92Q== X-Google-Smtp-Source: APXvYqy5729sse3MkBWFLN2C2rmItiOP2feLRqk3qqOzhuLc9kkBuYXQ03s7eveb6Qgpsso22SnEyw== X-Received: by 2002:a17:902:e110:: with SMTP id cc16mr78796025plb.147.1555368194441; Mon, 15 Apr 2019 15:43:14 -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.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 15:43:13 -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 2/3] Platform/Overdrive: conditionally include the X64 PE/COFF emulator Date: Mon, 15 Apr 2019 15:43:02 -0700 Message-Id: <20190415224303.7369-3-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. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 5 +++-- Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc index 93d351de5a27..46d242489b66 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc @@ -17,8 +17,9 @@ ################################################################################ [Defines] -DEFINE NUM_CORES = 8 -DEFINE DO_FLASHER = FALSE +DEFINE NUM_CORES = 8 +DEFINE DO_FLASHER = FALSE +DEFINE X64EMU_ENABLE = FALSE PLATFORM_NAME = Overdrive PLATFORM_GUID = B2296C02-9DA1-4CD1-BD48-4D4F0F1276EB diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf index 4b6b808c1454..a058665bccdd 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf @@ -159,6 +159,9 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf +!if $(X64EMU_ENABLE) == TRUE + INF Emulator/X86EmulatorDxe/X86EmulatorDxe.inf +!endif # # AHCI Support -- 2.17.1