From patchwork Thu Feb 1 16:10:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 126550 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1846314ljc; Thu, 1 Feb 2018 08:10:24 -0800 (PST) X-Google-Smtp-Source: AH8x225kS0dcN672sGQgeMW7mOHrRL3tmo0SYHlSsBNx7Cj0UUdkJOk1hoRPUN3g+OpKCYgrWPzu X-Received: by 2002:a17:902:6006:: with SMTP id r6-v6mr15956894plj.78.1517501424608; Thu, 01 Feb 2018 08:10:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517501424; cv=none; d=google.com; s=arc-20160816; b=CPk/tcOxJb4RP4Z0gmIwO5sI3LwxBbsi98LeBd0egBI47v8Rrj+Tsw+lW65LzFTdAU gsKFkDvHW8CQKQQYswdUh5nsFYcOLFoIOdB7RuyOrER4aaFUNiSqI0TEA7wNoBx+tM1f uR0pVaRsXk6KCvIoOW/A1obcBekCPqUbf8Dzk1GRHWyA+SI82Rzq6NqxUfPMCaQZGkJ6 7FqJMUSngAWtKKoZagVbaf9KbgEgD5Xa0k4hSI6bzbx2HYcwnV1mEGeDUUWS6xglulE+ JwIMFLcC631lgs0J3jYjvVzRzkSuTceDZ406fq4OB+McWy2BjwBULeGY0enar6UsBHLO rw1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=nrpoRgJideXaHchtFX77qKQBJcaNrVMRaF0+rWLSp8Y=; b=z7vCnCMXIxrEoqmETsA8vOHPOLCSHMv+811nuSpcGNiE3Y+5UxYOxFux7fScuB4R6r IgYRK0GmgpQ88jQHsYMLKsDPgPMbeV1+1EEy2NS/wstMOC7CMYzLD2a1LXhWgunPBOXc a+Yz5bXZS2UlM0WSMTCFsnjLOgw3sgnP1NiVj/HBCQnZ6kQzuf81YlnCBulEjKhGbWD5 BWLCNXA5X2SdcFR1by9sIt7Bypu1Q6NloOGP/N/2EMApcJJXqCrRxsr3Q2lUBj6JAMP9 cm7lwVmF+Aw+46wbudXqEc5Ew8LSjZr2kMCNkFOW0A8ED4xx1QEEb14yFEovxlf5kPKv l+FA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Z0DxwuV0; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id bi12-v6si759679plb.679.2018.02.01.08.10.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 08:10:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Z0DxwuV0; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 942CB223CCF1B; Thu, 1 Feb 2018 08:04:45 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::241; helo=mail-wm0-x241.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 28B20223CCEF5 for ; Thu, 1 Feb 2018 08:04:44 -0800 (PST) Received: by mail-wm0-x241.google.com with SMTP id 141so6725324wme.3 for ; Thu, 01 Feb 2018 08:10:21 -0800 (PST) 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=34JIPo+vj4s8SH1npyPrTIMNXd4nm8SD8CSwU8WV6tY=; b=Z0DxwuV0Zl2FsLOd6bVBJta9obOWTHk6d8GjYFJ5Sd56rHpxfjJaunNNZWHhkLQZZk BpwGl7boK+YthRzU6Y4sFPVnqkFPfYIGivaF1YgE828goFiNHrIJ0AzQ5abGEWO9KBAV Xp2He2NKRlKCRcB9PmlSLVZegBz7CBBk02GN0= 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=34JIPo+vj4s8SH1npyPrTIMNXd4nm8SD8CSwU8WV6tY=; b=FrEy/g2nY1WMCyPpy1LrqZ0nS1KZ8KXAKUil8/XjIVxk9JCA2ebcueJftUbvuQ3GBO SCCPz2VJJE6Pc/dTm0jRQJE08LgHI4UjMvIwx+YeJRPXKBOJAfDPtcvCV2hAUTcvhFkN Z56Fz8rPvrzM6VEmi4OHVmUEJh5cdPdtu/7g47GJWGNEayc3HwKhLHpze4gfk3mjW4bA QvBmXy84D/JfwE9Z6/g63oNDi0BubeZBbNS8s/WSnn9woAnt6o+VczQPAoC+dJYytcgj 77Fi7weFcguykiHETz222SianTqWN/C6Hnq/Sis/G+VrOpCjPBgNA1Z6qPTCho10xcJ7 rQew== X-Gm-Message-State: AKwxytdmgxtzR0hlBeeUbxzRrjjMLnrz/tM5nDfKG7tjJhfVoP4R5URi TycTS5IxTC0W0XkSngCX49LvktQtVv0= X-Received: by 10.28.194.137 with SMTP id s131mr3171537wmf.3.1517501419767; Thu, 01 Feb 2018 08:10:19 -0800 (PST) Received: from localhost.localdomain ([160.164.249.13]) by smtp.gmail.com with ESMTPSA id 39sm8204139wrz.85.2018.02.01.08.10.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 08:10:18 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Thu, 1 Feb 2018 16:10:05 +0000 Message-Id: <20180201161008.4037-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180201161008.4037-1-ard.biesheuvel@linaro.org> References: <20180201161008.4037-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 1/4] Platform/Cello, Overdrive: switch to split SCP and secure AP firmware images X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marc.zyngier@arm.com, alan@softiron.co.uk, leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Switch to the split prebuilt firmware image for the SCP and the AP secure world. This allows Overdrive and Cello to share the latter image, which we will update shortly. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 7 +++++-- Platform/LeMaker/CelloBoard/CelloBoard.fdf | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf index b43e080adc1e..54f209571f0e 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf @@ -49,8 +49,11 @@ [FD.STYX_ROM] # ################################################################################ -0x00000000|0x00200000 -FILE = Platform/AMD/OverdriveBoard/PreUefiFirmware.bin +0x00000000|0x0004bb00 +FILE = Platform/AMD/OverdriveBoard/ScpFirmware.bin + +0x0004bb00|0x00020000 +FILE = Silicon/AMD/Styx/ArmTrustedFirmware.bin 0x00200000|0x00260000 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.fdf b/Platform/LeMaker/CelloBoard/CelloBoard.fdf index c4e6748b6a73..e3a0915f5de5 100644 --- a/Platform/LeMaker/CelloBoard/CelloBoard.fdf +++ b/Platform/LeMaker/CelloBoard/CelloBoard.fdf @@ -49,8 +49,11 @@ [FD.STYX_ROM] # ################################################################################ -0x00000000|0x00200000 -FILE = Platform/LeMaker/CelloBoard/PreUefiFirmware.bin +0x00000000|0x0004b300 +FILE = Platform/LeMaker/CelloBoard/ScpFirmware.bin + +0x0004b300|0x00020000 +FILE = Silicon/AMD/Styx/ArmTrustedFirmware.bin 0x00200000|0x00260000 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize From patchwork Thu Feb 1 16:10:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 126551 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1846356ljc; Thu, 1 Feb 2018 08:10:27 -0800 (PST) X-Google-Smtp-Source: AH8x225rjMkUmLeK4Cq6vcQG5QxsRz7F64QfZultyCJwt3xubIIOvUvVUzzbx5/beYM111gVbjeW X-Received: by 10.101.80.69 with SMTP id k5mr18045880pgo.439.1517501427280; Thu, 01 Feb 2018 08:10:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517501427; cv=none; d=google.com; s=arc-20160816; b=ZNB95yNTDmYSdEnE6/AqlFKnYDOgQEAHTuDP7RS4EaJX7RmPL/68UMFrHOGhXLPNKy VDxuOVSE4T6YObcGix3diwE/UBbqtR/XBZrahJKu7NyORO/iFeqbKfloQvQ1W/FJHzGg FHJeYKmlgcIH3sqpa/fMuF1revnEo3k30WTItx23l24IzFadqxl6VNtkeNfgsVt6AfTy utFoZFxkWXFT9vKR0dDIABIRJoKhh/YBCVCAsGqObB2WwJf6/k4J1nim1Ahm5owMlqee 1q3GmvrLyrQ2IG+11BBRX2cAnP2ZcaiNx/rjqwZEGS/dNHrIz906ZCWP3ejCgv1q6ihN K49w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=jFuhdrJxytvSgN50cVUk5RWOTCf438KKfjJlwio+QCs=; b=F1n8Q5VXG/qmIL4+fPPiVU+LcBQZ921dkiEaLcWb4VHc6kvsVvpqsseiTrtaFcJccp cOqV4Drzrvj2IRCyIQpyoP1HLq2qRALhEuBdJDBz6xdF2nMLlENgoJK7LxjYhkxt4X/S T1Q6J9hj6PUqkJ4QPBcTXj9hdwTwZwDXLIWAjyJuST4qWBDCWfoQAOAP4Jj//0dShLyb JSPNuwXNlqbNWQbNPG8EKxixutqETOzxub1iwF0utfC9G7fnCMfcAfKo5trPBGJG9c3e kaER/3E7024Xkd4ac1YLS1kTaT7oi/j6VdOBF+VWFLOcZsa6KrF9KauctvnXECkvn4R1 IohA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=MZKJN79R; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id p1-v6si3989255plb.479.2018.02.01.08.10.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 08:10:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=MZKJN79R; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 01DEF223CCF1F; Thu, 1 Feb 2018 08:04:48 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::243; helo=mail-wm0-x243.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 695CF223CCF19 for ; Thu, 1 Feb 2018 08:04:46 -0800 (PST) Received: by mail-wm0-x243.google.com with SMTP id 141so6725590wme.3 for ; Thu, 01 Feb 2018 08:10:23 -0800 (PST) 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=wxyrtUHzhfZ3GfG8DtsvMzjIW2/gQxJp/posUUUH+bk=; b=MZKJN79RV1/my7ai+HlVU98geUyq3jlCtsBanOkopgNI2jbR89+gYiI3UVj7kpTFfU /jRpIMzbbrnpIs2eORHdTdc0+2GNmibgpgHiBeIvtMva3S1phDCV7P0ZnjPenUVOOxjP Eb48TtT3FOJevj8WD50INnTtSIGfSxhPh8/S0= 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=wxyrtUHzhfZ3GfG8DtsvMzjIW2/gQxJp/posUUUH+bk=; b=sjgrwaUQXqUH6xhkkOKqxd9Rqess6HngHzOtcl6X/XGBj4HU40qP4reJaNAohcrPKC /i2AAmuGzfP+SW7V5g9d+4bFiD7AzyQEhkhqde5ENVBlcKIWa8WIkcpbZTOwzKgVZyEx +WEHCrp+D/UkQX4c8A4Bx38GT/34mKq7d50MxFFW0tu5ZRJxaII7fSvKKJCZ57QSiZMq Jhq17kp5HAw6UE3Ec9WJeC0tO1k9jcefl5+e5iCq4IRJC5hYiTUUM0cAKTPU9Tr7yaCj ewfGJOkE1mToloSFTEMyiam880jEil4yHTb3I38JSrJrtPFoAYfGY+IHM1nqGtGd4nVu LOTg== X-Gm-Message-State: AKwxytc23hMduSPT0HC4KLIFyC0o85s0zwX9hBaPIwpULmZU36arvbky 5tgAs3lkBsCoFYeedqCe6TJPn2nQHPc= X-Received: by 10.28.48.10 with SMTP id w10mr28572573wmw.93.1517501422126; Thu, 01 Feb 2018 08:10:22 -0800 (PST) Received: from localhost.localdomain ([160.164.249.13]) by smtp.gmail.com with ESMTPSA id 39sm8204139wrz.85.2018.02.01.08.10.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 08:10:21 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Thu, 1 Feb 2018 16:10:06 +0000 Message-Id: <20180201161008.4037-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180201161008.4037-1-ard.biesheuvel@linaro.org> References: <20180201161008.4037-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 2/4] Platform/AMD/OverdriveBoard: cover secure firmware in capsule update X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marc.zyngier@arm.com, alan@softiron.co.uk, leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Add the first part of the flash device (FD) to the capsule image so we can update the secure and SCP firmware in one go along with the UEFI firmware volume (FV). Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 3 ++- Platform/AMD/OverdriveBoard/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini | 4 ++-- Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.c | 12 ++++-------- Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.inf | 3 +-- 4 files changed, 9 insertions(+), 13 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf index 54f209571f0e..8ceee9552765 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf @@ -343,7 +343,7 @@ [FV.SystemFirmwareUpdateCargo] READ_LOCK_STATUS = TRUE FILE RAW = 642e4fcf-2df7-4415-8b70-a03909c57b55 { # PcdEdkiiSystemFirmwareFileGuid - FV = STYX_EFI + FD = STYX_ROM } FILE RAW = ce57b167-b0e4-41e8-a897-5f4feb781d40 { # gEdkiiSystemFmpCapsuleDriverFvFileGuid @@ -353,6 +353,7 @@ [FV.SystemFirmwareUpdateCargo] FILE RAW = 812136D3-4D3A-433A-9418-29BB9BF78F6E { # gEdkiiSystemFmpCapsuleConfigFileGuid Platform/AMD/OverdriveBoard/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini } + INF RuleOverride = FMP_IMAGE_DESC Platform/AMD/OverdriveBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf [FmpPayload.FmpPayloadSystemFirmwarePkcs7] IMAGE_HEADER_INIT_VERSION = 0x02 diff --git a/Platform/AMD/OverdriveBoard/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/AMD/OverdriveBoard/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini index c89e95f60fba..49b6480b4ed0 100644 --- a/Platform/AMD/OverdriveBoard/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini +++ b/Platform/AMD/OverdriveBoard/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini @@ -19,7 +19,7 @@ Update0 = StyxFvMain [StyxFvMain] FirmwareType = 0 # SystemFirmware AddressType = 0 # 0 - relative address, 1 - absolute address. -BaseAddress = 0x00200000 # Base address offset on flash -Length = 0x00260000 # Length +BaseAddress = 0x00000000 # Base address offset on flash +Length = 0x00460000 # Length ImageOffset = 0x00000000 # Image offset of this SystemFirmware image FileGuid = 642e4fcf-2df7-4415-8b70-a03909c57b55 # PcdEdkiiSystemFirmwareFileGuid diff --git a/Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.c b/Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.c index a23500dd35dc..a94373bb4b53 100644 --- a/Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.c +++ b/Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.c @@ -22,9 +22,7 @@ #include -STATIC CONST UINT64 mFlashOffset = FixedPcdGet64 (PcdFvBaseAddress) - - FixedPcdGet64 (PcdFdBaseAddress); -STATIC CONST UINT64 mFlashMaxSize = FixedPcdGet64 (PcdFvSize); +STATIC CONST UINT64 mFlashMaxSize = FixedPcdGet64 (PcdFdSize); STATIC CONST UINTN mBlockSize = SIZE_64KB; @@ -77,12 +75,10 @@ PerformFlashWrite ( return EFI_INVALID_PARAMETER; } - if (FlashAddress < mFlashOffset || - (FlashAddress + Length) > (mFlashOffset + mFlashMaxSize)) { + if ((FlashAddress + Length) > mFlashMaxSize) { DEBUG ((DEBUG_ERROR, - "%a: updated region [0x%lx, 0x%lx) outside of FV region [0x%lx, 0x%lx)\n", - __FUNCTION__, FlashAddress, FlashAddress + Length, mFlashOffset, - mFlashOffset + mFlashMaxSize)); + "%a: updated region [0x%lx, 0x%lx) outside of FV region [0x0, 0x%lx)\n", + __FUNCTION__, FlashAddress, FlashAddress + Length, mFlashMaxSize)); return EFI_INVALID_PARAMETER; } diff --git a/Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.inf b/Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.inf index 411173f1f3c5..b54a2e90ff02 100644 --- a/Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.inf +++ b/Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.inf @@ -40,8 +40,7 @@ [Protocols] [FixedPcd] gArmTokenSpaceGuid.PcdFdBaseAddress - gArmTokenSpaceGuid.PcdFvBaseAddress - gArmTokenSpaceGuid.PcdFvSize + gArmTokenSpaceGuid.PcdFdSize [Depex] gAmdIscpDxeProtocolGuid From patchwork Thu Feb 1 16:10:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 126552 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1846384ljc; Thu, 1 Feb 2018 08:10:30 -0800 (PST) X-Google-Smtp-Source: AH8x227QMZU+UmfvQ1Lt5VopDuxVtMU1DurGOI+4wE+Cq1B0X8mQRjP4KWE6poTTz1Lq1ESUXfOd X-Received: by 2002:a17:902:5481:: with SMTP id e1-v6mr2042366pli.410.1517501429874; Thu, 01 Feb 2018 08:10:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517501429; cv=none; d=google.com; s=arc-20160816; b=ZewpSD//ZsDYS6r1oBt25nChs03vSF8weDiLkletgRqjf96XS1NkfX7CgsFe5dRIOK b/fza7z67cScrC29PA/jHZ7VGeMn9mz1uQcH7e2kL57jyhvM+GCoEa77hzWuIhWckDQn 1QSCnaOi4jsUqe4yc+SWJzBf6mabtjeQeQroYCFSJibsdAAn6rXruNsAu/Ug5KM+vgAM m29jcZ73YOX1juYaf5G/+8/gifLqN1DLsNQ0mn8Cmnnpnr9OGduEaxNC3vc+3ADzBFdQ 0pA6bjxNpr5XxAMkd/D/FAM3057HuV9q6IUXK5uxAxxqIZn49NelvJTvQ7WVa8U7z/oS Z6ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=IPwvI3sgVhnC+fXOErPzE+wwHl16InlkwmzrOqJzD9s=; b=KmdrVgUBtLoGL34feSveLL0sS70T6n/uHoR2Td6czMZgodm9rC9NOfP7pgM2hoI3rO gTdyic5zIZUWEXXq10VeN1Nt1bZqQUXiB9v/V7NtUxeDTUFoq+8s8PZG/nz6j5XM58RT dXFrBUHHLRUzt1P9txP3CROOW6K6o3mEB7cSVoVpprUMeyJXYglN1QrQcqmtCGQmjklj MpHf+c95fTEhbm2vPf8KWNeeDAUknP3M5s1PjyHSM0taO9vpkGCjXvl8ZKJzividhHuT iSnjOmqdiMpSZSjdnQ5IDSkeAGyuu9xLQ23a2SuJLnwFB5iidLfVyRajjoISo8vRakiC 3/jA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ev7+kU+X; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id 1-v6si223150plw.164.2018.02.01.08.10.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 08:10:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ev7+kU+X; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 684FA223CCF1E; Thu, 1 Feb 2018 08:04:50 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::243; helo=mail-wm0-x243.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 9839F223CCF01 for ; Thu, 1 Feb 2018 08:04:48 -0800 (PST) Received: by mail-wm0-x243.google.com with SMTP id v71so6765893wmv.2 for ; Thu, 01 Feb 2018 08:10:25 -0800 (PST) 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=8FZk7/hwB95wyvPGfPY2/pTpG9VXhwuquKmkTh5+sSM=; b=ev7+kU+XWFR2z25o96sj9PKN4M/PONkoWXWAkTAQETrkUfgx2QiNdfj9Ld6seOWNJ9 qI27+Wwe6KzNhAZ39FdiXY/D1yj7Z1l59i0fhseP2ElbUfkLQ4BG3GBy9+U6/Aa7orxG wJzKnykiO/hXsz1r7sWNlXYGwSC65q8/Kjqms= 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=8FZk7/hwB95wyvPGfPY2/pTpG9VXhwuquKmkTh5+sSM=; b=TFjBVniRWguoSnatGyK8Xi7RnFJjGS/fS857G07MzSrG1rV9M6pg59HQsq7l8046Q9 fYJ1QoaRfLDAiQ3FoSZ8Pok4VrGW7R+rHQIy/UwSWoXwINe7vECpuqkylVCU1XNMMGG+ dANYBMfNtI8E/wsSKSjswI6uSY7FkXHocVVqU+HKRbWHajXN8OG4IPpBnJdQLKTWoQ// lU9GjT8SMr/W6A3yB5UbTItFCcl5USnwDpbmR5J0n7N4WDOhRXSxvxQ3JQITyxx2ncbb /qs5IyNr6RYL6QUZPA7qkPvq5gbjYupamihsn9Hr4zgBn+rnf0LjQhffb+GaFXhmz5eT 7tVg== X-Gm-Message-State: AKwxytcv+xgAu8tgmtPwcAQTAH1MauaWIwTCUSPgXLM/VAqIL7zOOSCi gUojHxfL3eoRUtiQX4L9FMpkWFLLONE= X-Received: by 10.28.4.84 with SMTP id 81mr25851474wme.150.1517501424396; Thu, 01 Feb 2018 08:10:24 -0800 (PST) Received: from localhost.localdomain ([160.164.249.13]) by smtp.gmail.com with ESMTPSA id 39sm8204139wrz.85.2018.02.01.08.10.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 08:10:23 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Thu, 1 Feb 2018 16:10:07 +0000 Message-Id: <20180201161008.4037-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180201161008.4037-1-ard.biesheuvel@linaro.org> References: <20180201161008.4037-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 3/4] Platform/AMD/OverdriveBoard: enable ConsolePrefDxe X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marc.zyngier@arm.com, alan@softiron.co.uk, leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Add the ConsolePrefDxe driver so we can get the console on the framebuffer rather than on the serial port. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 6 ++++++ Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 1 + 2 files changed, 7 insertions(+) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc index 51d823892b17..a99a9a1062d4 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc @@ -298,6 +298,8 @@ [PcdsFeatureFlag.common] gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport|FALSE + gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE + [PcdsFixedAtBuild.common] gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000 gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000 @@ -585,6 +587,10 @@ [Components.common] MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf MdeModulePkg/Universal/SerialDxe/SerialDxe.inf + EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.inf { + + FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf + } MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf index 8ceee9552765..541d65ef753e 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf @@ -121,6 +121,7 @@ [FV.FvMain] INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf + INF EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.inf INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf From patchwork Thu Feb 1 16:10:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 126553 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1846414ljc; Thu, 1 Feb 2018 08:10:33 -0800 (PST) X-Google-Smtp-Source: AH8x224MjRX/f1xJsdNzirDqfKfkZRLYcDZGNvlRQ+ifs/7sPZA6cHmGujh9xBxHgseiaxvOktq7 X-Received: by 2002:a17:902:32a2:: with SMTP id z31-v6mr32819355plb.345.1517501432969; Thu, 01 Feb 2018 08:10:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517501432; cv=none; d=google.com; s=arc-20160816; b=Y76BA9HzS1b/BkVtqmzsVkNjGg4r7P8rJ2xbk1ogk/56sy/r2+MX4VkwOvGZFGEOg4 ND262ECBoGsTHyHtY9i5aefyJgCD0VnviKuCcZ/DBwUxrUhWKV5ZDbse59hyGQ4O+9b5 HNNzeckk1BOHPUjl1jkUPtmTRupWXJp3pSM/tcCAs2Oatww6pNhFIYDfKk+NKxOhVaLX oxlfmOzF7dz2XnU1SjzVghAhLFoi9ulvEEMVmYsDX2RBoywdxmXevxGdnSk34lbnPjFM woO+8xLMoa/VoFnVb4/CgzrKmRCzoyDBXO1r8jojMo+1jmozGBMHd7ZyWyrRoRB3uPtn joUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=jVop7h+9lW677+jKzaqwMaQt6eGw3KnnqgW+JEdKndY=; b=pF2KIAv6BUrCTKZG4weqWsQPVPsXlQCa0KoOso/b0c+TeD5y9wPx+ffGclH3c5MVlL nUd9YnJWnSHoMjN6HTsOFWNDga4XdWrB7SplZL2uDCpa5TmfgWMwlc143d47v8tLbxHy FmGevcglpergu1UTDViQaG+BoJwaAvY17WLQBfktGOcAhJaQIFskwqp5JFb8qOx3noy2 yOpTQ3lcSyExQkbN1tnJ+0bMGTEDNUeJ23su9u+2spiiag/F3/vx2E9HJMK+ew4mQf2I 31EAhfomnTD6ScxsZTDGqVumP0ZhiXNBisQxIvI3mzDJoic+ppueqhv0dhrTxQDHPe80 kzOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=PxtoAIzm; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id g15si5061551pgf.557.2018.02.01.08.10.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 08:10:32 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=PxtoAIzm; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id C7D7821E0B9ED; Thu, 1 Feb 2018 08:04:53 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::243; helo=mail-wm0-x243.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7A2F521E0B9E8 for ; Thu, 1 Feb 2018 08:04:50 -0800 (PST) Received: by mail-wm0-x243.google.com with SMTP id 141so6726017wme.3 for ; Thu, 01 Feb 2018 08:10:27 -0800 (PST) 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=bJ+Ggb/tSJojtiiXnS8KOehMkYtcT4PRYv08sRBZtPA=; b=PxtoAIzm3DUI9kpXBseZFKpQjZSlMCRCFNnx/NjkglepOqKgE1nYHmjv/iP/hQG61s txTZw2c9bimeQvlmPYGwP0nzolLYFM3i94XdrrfjBJ9zNlDctnOA8ZVTrQHSyBbFeGij glGISIZd5PGy0rTF9m436DlmUQZPC+f80vMa0= 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=bJ+Ggb/tSJojtiiXnS8KOehMkYtcT4PRYv08sRBZtPA=; b=kYBQqW9duOF+gpU8m35BdAqUASBdK8tRzsb5CXhY+wyfbs2aIhB/Zy9iynDz4jN45g tK9qg++9Mr0Hha8D1SN8hJJxqhpvrOC03i+ui60HYeuzEkoPuA0AlKpHXL2QaE4p36sU UlX1+WYvtOTUBtXYK+7W0tg5jPBW95XSxr8wPoWUjoLOJ6+GvCNIHFdpWBRr6VoDG2mW L9pCCZNdmTUbQiRP2iNL2cmGlSKdeWk881po74fDfkQsbhU9Sofp5ETle8Nu4ULAUEnq rmprAu3MXOgJX2RAwSrwY+uMPbZwQACxmkLuGBJPQ0N3/wMQvymu89M8x7QoJmw5zVXu i6hg== X-Gm-Message-State: AKwxytcNeor8CoaTvA/14mTAvaAOHfoO7dNfcBxJzShGDc5IlPRwE5t7 yAOZT1v3PmybqLs0Fha3Bzgm6lCgopY= X-Received: by 10.28.120.15 with SMTP id t15mr8522308wmc.34.1517501426280; Thu, 01 Feb 2018 08:10:26 -0800 (PST) Received: from localhost.localdomain ([160.164.249.13]) by smtp.gmail.com with ESMTPSA id 39sm8204139wrz.85.2018.02.01.08.10.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 08:10:25 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Thu, 1 Feb 2018 16:10:08 +0000 Message-Id: <20180201161008.4037-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180201161008.4037-1-ard.biesheuvel@linaro.org> References: <20180201161008.4037-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 4/4] Platform/Cello, Overdrive: set fw vendor PCD from FIRMWARE_VENDOR X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marc.zyngier@arm.com, alan@softiron.co.uk, leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" 'AMD Seattle' is not a firmware vendor, nor is 'LeMaker Cello' So let's do what other platforms do, and default to 'EDK II' unless it is overridden at build time by setting FIRMWARE_VENDOR. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 4 +++- Platform/LeMaker/CelloBoard/CelloBoard.dsc | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc index a99a9a1062d4..21edcc8798f4 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc @@ -365,7 +365,9 @@ [PcdsFixedAtBuild.common] gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"AMD Seattle" +!ifdef $(FIRMWARE_VENDOR) + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"$(FIRMWARE_VENDOR)" +!endif # Number of configured cores gArmPlatformTokenSpaceGuid.PcdCoreCount|$(NUM_CORES) diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc index fb9155ce3a0d..cf3df8651415 100644 --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc @@ -351,7 +351,9 @@ [PcdsFixedAtBuild.common] gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"LeMaker Cello" +!ifdef $(FIRMWARE_VENDOR) + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"$(FIRMWARE_VENDOR)" +!endif # Number of configured cores gArmPlatformTokenSpaceGuid.PcdCoreCount|$(NUM_CORES)