From patchwork Fri May 13 16:37:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 67792 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp360177qge; Fri, 13 May 2016 09:37:58 -0700 (PDT) X-Received: by 10.140.22.232 with SMTP id 95mr16513284qgn.24.1463157478526; Fri, 13 May 2016 09:37:58 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id b127si2176324qkg.198.2016.05.13.09.37.58; Fri, 13 May 2016 09:37:58 -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 EF51F6165B; Fri, 13 May 2016 16:37:57 +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 2630C6157E; Fri, 13 May 2016 16:37:52 +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 67FE86157E; Fri, 13 May 2016 16:37:50 +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 70F826157E for ; Fri, 13 May 2016 16:37:49 +0000 (UTC) Received: by mail-wm0-f51.google.com with SMTP id e201so29460285wme.0 for ; Fri, 13 May 2016 09:37:49 -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:in-reply-to :references; bh=9TnnxLCgBcvR3RjKCSAMDItS534lSYDPYXAmUYEMLIA=; b=C6UXYAxzPwoC2TcPC3B467ywcD7PnBN45kirQY8vLOnWV+6nAkZAFuRtNa92dv8tdT v1C9ubnH0OBrBsHIcPhAaGOiL6GDetDcQdjINUmuDysPhTGbRjMe3WB8bGPUZsx4jj21 8ULhtfHcj2DiSJzzvacYfPWGwq0tqWHXw5gcEyEGOpyQk1pJrdBx6MZZRa1d9J/K6zHU L+boV20dtcryjetx99H5EOe8Fu1HAxARXvVAqb3KjKnbAuXZUp4hAS1xyi30TRuU3tjB b9RvCjvsuGJj99E6CLM3vGUMzvS7iJVnynUGBln2s/4+ZX6FQFzPOMdqcgDQe4IogJsZ MbyA== X-Gm-Message-State: AOPr4FWV97r2OeeVeLcXR1Toxgmul/u0HaYjODlJuIa0ndJPNDCM8Pz6F+VjYwX8zjF4TM7eH9s= X-Received: by 10.195.11.34 with SMTP id ef2mr16576837wjd.101.1463157468571; Fri, 13 May 2016 09:37:48 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id e16sm4092904wmc.3.2016.05.13.09.37.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 May 2016 09:37:47 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Fri, 13 May 2016 18:37:08 +0200 Message-Id: <1463157431-22988-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1463157431-22988-1-git-send-email-ard.biesheuvel@linaro.org> References: <1463157431-22988-1-git-send-email-ard.biesheuvel@linaro.org> Cc: leo.duran@amd.com Subject: [Linaro-uefi] [PATCH 2/5] Platforms/AMD/Styx: add trusted fw binaries to STYX_EFI.fd build 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" Reorganize the STYX_EFI.fd build definitions for Overdrive and Cello so that it incorporates the trusted firmware image as well. This way, we can flash STYX_EFI.fd directly. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf | 11 +++++++---- Platforms/AMD/Styx/Common/Varstore.fdf.inc | 6 +++--- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 11 +++++++---- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf index 22d0dfc1f17b..dd0e6b0e01fe 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf @@ -25,13 +25,13 @@ ################################################################################ [FD.STYX_EFI] -BaseAddress = 0x8000E80000|gArmTokenSpaceGuid.PcdFdBaseAddress # The base address of the Firmware in NOR Flash. -Size = 0x00300000|gArmTokenSpaceGuid.PcdFdSize # The size in bytes of the FLASH Device +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 # This one is tricky, it must be: BlockSize * NumBlocks = Size BlockSize = 0x00001000 -NumBlocks = 0x300 +NumBlocks = 0x500 ################################################################################ # @@ -49,7 +49,10 @@ NumBlocks = 0x300 # ################################################################################ -0x00000000|0x00260000 +0x00000000|0x00200000 +FILE = OpenPlatformPkg/Platforms/AMD/Styx/CelloBoard/Binary/TrustedFirmware.bin + +0x00200000|0x00260000 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize FV = FVMAIN_COMPACT diff --git a/Platforms/AMD/Styx/Common/Varstore.fdf.inc b/Platforms/AMD/Styx/Common/Varstore.fdf.inc index 2456bb3eacba..1c48e994dafd 100644 --- a/Platforms/AMD/Styx/Common/Varstore.fdf.inc +++ b/Platforms/AMD/Styx/Common/Varstore.fdf.inc @@ -16,7 +16,7 @@ # ## -0x00260000|0x0000F000 +0x00460000|0x0000F000 gAmdStyxTokenSpaceGuid.PcdFlashNvStorageOriginalBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize DATA = { ## This is the EFI_FIRMWARE_VOLUME_HEADER @@ -53,7 +53,7 @@ DATA = { 0x5A, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } -0x0026F000|0x00001000 +0x0046F000|0x00001000 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize DATA = { # EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature = gEdkiiWorkingBlockSignatureGuid = @@ -66,5 +66,5 @@ DATA = { 0xE0, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } -0x00270000|0x00010000 +0x00470000|0x00010000 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf index 8f571307e048..30405551265f 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf @@ -25,13 +25,13 @@ ################################################################################ [FD.STYX_EFI] -BaseAddress = 0x8000E80000|gArmTokenSpaceGuid.PcdFdBaseAddress # The base address of the Firmware in NOR Flash. -Size = 0x00300000|gArmTokenSpaceGuid.PcdFdSize # The size in bytes of the FLASH Device +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 # This one is tricky, it must be: BlockSize * NumBlocks = Size BlockSize = 0x00001000 -NumBlocks = 0x300 +NumBlocks = 0x500 ################################################################################ # @@ -49,7 +49,10 @@ NumBlocks = 0x300 # ################################################################################ -0x00000000|0x00260000 +0x00000000|0x00200000 +FILE = OpenPlatformPkg/Platforms/AMD/Styx/OverdriveBoard/Binary/TrustedFirmware.bin + +0x00200000|0x00260000 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize FV = FVMAIN_COMPACT