From patchwork Tue May 17 12:47:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 67946 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp2053092qge; Tue, 17 May 2016 05:48:11 -0700 (PDT) X-Received: by 10.55.17.134 with SMTP id 6mr1146404qkr.207.1463489291044; Tue, 17 May 2016 05:48:11 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 124si2083882qkg.95.2016.05.17.05.48.10; Tue, 17 May 2016 05:48:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id A5E8561733; Tue, 17 May 2016 12:48:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 3ECB56164D; Tue, 17 May 2016 12:48:09 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 2A7606172B; Tue, 17 May 2016 12:48:03 +0000 (UTC) Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51]) by lists.linaro.org (Postfix) with ESMTPS id 4CC386164D for ; Tue, 17 May 2016 12:48:02 +0000 (UTC) Received: by mail-wm0-f51.google.com with SMTP id e201so138445961wme.0 for ; Tue, 17 May 2016 05:48:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Gsa63A8JFrrw5sQ/9zHqZ7o2GOfSdlbnZHH9vG4+XvQ=; b=kwyDAc7yceyJdV0Aj2tmZhRXXg6IsYlba5C4PWk4TbOZVs2uekWEj2Av3U2m7wSU9G o+YuB1L52SIBjPKMhlT0nLcblmz/GgxPQ+RCkELtKE1bOOk6Anm8+6XApGnYDrUBbRTL fISVviZKl6yKUAJ+D5jVD5n1d76I2u0Mv1b2GjLR0yb0KiPS3ZKGI0J/oJzdgLLCHwlm Da8J5b06qfZlabcQqMPAj3k2NvQFvvESfSX4eooiK6se0PRKi5jl6uxDfsSqO3Il0P4T B2MQO7lam/Jh1qm+CkThuIFyprpAf5SmOB9ah51oS1quU1TETiGc7sPYhvYZA75hEVMn KoPg== X-Gm-Message-State: AOPr4FUGhV1CO3HHqYq4asW7Bo/gg4oB64Dcvpoxz8XshuWIvNh/9rRo+RvoeO25WvDiCmxWPO8= X-Received: by 10.28.31.6 with SMTP id f6mr22660080wmf.69.1463489281323; Tue, 17 May 2016 05:48:01 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id c16sm3418016wme.16.2016.05.17.05.47.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 May 2016 05:48:00 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Tue, 17 May 2016 14:47:57 +0200 Message-Id: <1463489277-4853-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 Cc: leo.duran@amd.com Subject: [Linaro-uefi] [PATCH] Platforms/AMD/Styx: rename build artifacts now that TFW is included X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" Since the full image we build now contains the Trusted Firmware as well, update the image names to better reflect that: STYX_EFI.fd => STYX_ROM.fd FVMAIN_COMPACT.Fv => STYX_EFI.Fv Since the Trusted Firmware image is fairly static, and the varstore region that follows the EFI image in the ROM image typically does not always need to be updated when the EFI code is, it is possible to only flash STYX_EFI.Fv at an offset of 2 MB into the SPI flash. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- There is one slight snag with reusing the varstore, and that is that the UiApp or Shell entries will be recreated if the respective binaries appear at different offsets in memory, and the stale ones are not removed. However, this not only happens if you reuse the varstore with a new build, but even if you run, e.g., the same QEMU build but change the memory size. IOW, this is a generic issue that should be fixed on the BDS side (and not only for the shell), so I guess that should not block this patch. Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf index 30405551265f..dc1b6074778f 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf @@ -24,7 +24,7 @@ # ################################################################################ -[FD.STYX_EFI] +[FD.STYX_ROM] BaseAddress = 0x8000C80000|gArmTokenSpaceGuid.PcdFdBaseAddress # The base address of the Firmware in NOR Flash. Size = 0x00500000|gArmTokenSpaceGuid.PcdFdSize # The size in bytes of the FLASH Device ErasePolarity = 1 @@ -54,7 +54,7 @@ FILE = OpenPlatformPkg/Platforms/AMD/Styx/OverdriveBoard/Binary/TrustedFirmware. 0x00200000|0x00260000 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize -FV = FVMAIN_COMPACT +FV = STYX_EFI !include OpenPlatformPkg/Platforms/AMD/Styx/Common/Varstore.fdf.inc @@ -241,7 +241,7 @@ READ_LOCK_STATUS = TRUE # INF OpenPlatformPkg/Platforms/AMD/Styx/Drivers/StyxRngDxe/StyxRngDxe.inf -[FV.FVMAIN_COMPACT] +[FV.STYX_EFI] FvAlignment = 16 ERASE_POLARITY = 1 MEMORY_MAPPED = TRUE