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=LISfbulF; spf=pass (domain: linaro.org, ip: 209.85.221.68, mailfrom: ard.biesheuvel@linaro.org) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by groups.io with SMTP; Wed, 24 Apr 2019 06:24:30 -0700 Received: by mail-wr1-f68.google.com with SMTP id b1so13809779wru.3 for ; Wed, 24 Apr 2019 06:24:29 -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=ue2pV5hIARyamULrB5I2zXG/WgRgDEsJQb+/O/8V7c8=; b=LISfbulFULW7WD5+8B45hMryyncP902VARvIqK+ixDo6VoEV6S/OrV5MPh8DHw17Rh oTM2lSJsaH/gB4n98+ZgQurjFco6NQaJu+nwxBfcwuVAbpMx+mjJCYrvdHGwrcR90qmB dGi2ydDa/wB0hc92hD+a2ev5bwxYMYay7OoMCJJrcDaicWS8TZcL3NkwM4KGKd9CHmbV O1qmv9xcTOmMiRNpZo6+awkHtz4GOYLLsjyke23kXvIF7QZe08Q3YV/hcJnWAUhPQP/U Mq4yJpJiX+9zIF6reNMyCLTbePGcOl9RWzTTJC4HgOVQfnvPc7BfkXIkagqrwxVsU5zu HzKg== 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=ue2pV5hIARyamULrB5I2zXG/WgRgDEsJQb+/O/8V7c8=; b=GG8zeXkIESnSMmcY9/rBQOtTctK2oGXlCDUvAKXfCj/+kAJB6HirqQWKRX1d+9WmMS c1AhbDoPHkYBsSdvm9MI0noL3pORPRGfAcTraxsV40pssEpGyQ3PIcw+YeB04i3qJYDB ux9q47Dtj1ogrsy+FoA4YqhDCQaX2TaNoGY/607syxopcyQJozGuoeuL54drth+JcDNo FIAz/V7JdbL3xCzYGbyp5fvoval4+5OfD5DQGmdRTz/r3IJzW8c8DKZvvuLK/XLWQkV6 F6GzS3hJqS+ZKhHSv7hRjoGZEionK7G7ec99ltM0yvh3FDf/cL5LnArq+7itT4OhYWKr OlTg== X-Gm-Message-State: APjAAAUxLULpttPoOdArsC5O6ZAKlsEoHgB2EcxqrGDcDk2tW23swtYG oSUjoSc9jjEsi4Ly03AElFShapd8MUGRXw== X-Google-Smtp-Source: APXvYqyCf6I8ijuxbBvjK8cSJNiMBAovu+CQrSlLb5dKJNY3RMIpGoln5nu48TUS6rA8JCY1BGSljw== X-Received: by 2002:a05:6000:9:: with SMTP id h9mr2964739wrx.194.1556112268093; Wed, 24 Apr 2019 06:24:28 -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.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Apr 2019 06:24:26 -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 2/3] Platform/Overdrive: conditionally include the X64 PE/COFF emulator Date: Wed, 24 Apr 2019 15:23:56 +0200 Message-Id: <20190424132357.8565-3-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. 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 b6a1507b4ae3..0e1db0745d89 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.20.1