From nobody Tue May 7 00:16:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40247+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40247+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557376277; cv=none; d=zoho.com; s=zohoarc; b=Om4Ji/gktK5YeJGyCKeuzx8l3oyTccdZ4Ujc55hGvuYwnhpmOAglJro8MWGVFsqskLP7FJl0kVo/8LjbdW5Qdqq1fn+Ct3CHKR5r9PSGzHzJmdKlkoWDb1gFXaRCJZ89Pbz6Oae9mBH5y31byEt1gAqglGn7ugPpjmp/ebyTXR0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557376277; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=cYqUarGzZSomtsAJ1HgxnWKAQm/zDSx5+Z9pHOB5nR0=; b=FvivpnF/yqQDxjZ535MFcVVxsgXKxq/doavBX7PDo+f4+n5KzlI89O/0CrtAVNrMtB40OE4G9oHjyHW+Xg7WjNsp/VbTzFoVjiuqCip6bFtNqBVlrmgpPK5u1r0tKLj2VGrdjoW6B/MWh2tpKi/jYhY0EVb9Xk3EX3XncVfJuB0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40247+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 155737627787167.1251379185303; Wed, 8 May 2019 21:31:17 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Wed, 08 May 2019 21:31:17 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 May 2019 21:31:16 -0700 X-ExtLoop1: 1 X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.98.74]) by orsmga004.jf.intel.com with ESMTP; 08 May 2019 21:31:16 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian Subject: [edk2-devel] [Patch 01/16] Vlv2TbltDevicePkg/PlatformFlashAccessLib: Add error return Date: Wed, 8 May 2019 21:30:56 -0700 Message-Id: <20190509043111.15272-2-michael.d.kinney@intel.com> In-Reply-To: <20190509043111.15272-1-michael.d.kinney@intel.com> References: <20190509043111.15272-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557376277; bh=K9nZFGbULp5CbjlgGFBvlxHYP5KB+OhUSOFK7R2iClU=; h=Cc:Date:From:Reply-To:Subject:To; b=W5/lsqOg+ED7BIn04Q+LvYCcT+dZ52TIai488jshOJyxuu37j25yFiA9/ThrRapToN/ L90q/weYwN7HSnvqBzIoj9VYZXPPlSaWW9vKg8p6WEZ/y3pbC/hldSOnFygPwohX/iviH CpbD3VxRa+EjSeiGw2TIJ/Av89HTBGCYpZk= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" If the FLASH device cannot be erased or written, then the flag FlashError is set to TRUE. Add the missing logic to return an error if FlashError is TRUE. The missing logic was found from a GCC build that noticed a local variable was declared and assigned, but was not being used. Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Michael D Kinney Reviewed-by: Zailiang Sun --- .../Library/PlatformFlashAccessLib/PlatformFlashAccessLib.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessL= ib/PlatformFlashAccessLib.c b/Vlv2TbltDevicePkg/Feature/Capsule/Library/Pla= tformFlashAccessLib/PlatformFlashAccessLib.c index 052ccb891c..079c3ef2d6 100644 --- a/Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/Plat= formFlashAccessLib.c +++ b/Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/Plat= formFlashAccessLib.c @@ -1,7 +1,7 @@ /** @file Platform Flash Access library. =20 - Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -529,6 +529,10 @@ Done: Progress (EndPercentage); } =20 + if (FlashError) { + return EFI_WRITE_PROTECTED; + } + return EFI_SUCCESS; } =20 --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40247): https://edk2.groups.io/g/devel/message/40247 Mute This Topic: https://groups.io/mt/31551769/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 00:16:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40248+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40248+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557376278; cv=none; d=zoho.com; s=zohoarc; b=E0iZDFQCie1KWj8IErAESM7z9aO9sFNHCWDRyW5TOOEGCyP/KItA4tc+CLHLOgpwf8Jk5c/pYFOcAj8fSrOHJbYtnhFmG0fQNEdZTTUfc1ewVbZy4f2Q32LuLukPw9Hxw4J2gnrijVZiSpMnMwaL+SiH7xIpRFD/AkgVEqbtZrQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557376278; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=kLYr7603tm82LrVWSmQBdUQ0rN645nt+YUxNLJW3XrM=; b=Qr5OxtBHaek8VWuN7rT7xAz7vR+OukCr+EF5vQvecQLVJlTNztxyOP5b19crJrm1bRva3yjPPIwGs+qk+n9/E/xCMtAqhkxfDJls4s0Ju9sL3vDSWeDkgjlXNaPjttdNV7C5VD7g6ks983Ch8Ioo+qmdHEWlyaNjjgGqY86tRNQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40248+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557376278199719.5251233407648; Wed, 8 May 2019 21:31:18 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Wed, 08 May 2019 21:31:17 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 May 2019 21:31:16 -0700 X-ExtLoop1: 1 X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.98.74]) by orsmga004.jf.intel.com with ESMTP; 08 May 2019 21:31:16 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian Subject: [edk2-devel] [Patch 02/16] Vlv2TbltDevicePkg/AcpiPlatform: Change Size type to UINTN Date: Wed, 8 May 2019 21:30:57 -0700 Message-Id: <20190509043111.15272-3-michael.d.kinney@intel.com> In-Reply-To: <20190509043111.15272-1-michael.d.kinney@intel.com> References: <20190509043111.15272-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557376277; bh=KnZNtdKN2PvOyCuAoIStx9027VcVCOIXJ1hXVSKdyX0=; h=Cc:Date:From:Reply-To:Subject:To; b=bsIwR4GIC11OaiOSvAGov5on8e8vf2DQaDfvxOLpy7rkEjnVCgej79+G4E9XJ7InjwF l0BzsL8EnhbFG6KHizbZWTwDQGt+qg2VwsVrAcRZfKv1dKTOX+Pur++Nrbiinqi8sAWsP c3z44F2cXRbNLkPKkOEtts3mwXiLP0adrHQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Change the type of the local variable Size in the function AcpiPlatformEntryPoint() from UINT32 to UINTN. This local variable is passed into the function ReadSection() that returns a value of type UINTN. Using type UINT32 can potentially corrupt an adjacent local on the stack. Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Michael D Kinney Reviewed-by: Zailiang Sun --- Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c b/Vlv2TbltDevice= Pkg/AcpiPlatform/AcpiPlatform.c index 0bd375391e..5c03f66edb 100644 --- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c +++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c @@ -1,6 +1,6 @@ /** @file =20 - Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
=20 =20 SPDX-License-Identifier: BSD-2-Clause-Patent @@ -778,7 +778,7 @@ AcpiPlatformEntryPoint ( EFI_ACPI_COMMON_HEADER *CurrentTable; UINTN TableHandle; UINT32 FvStatus; - UINT32 Size; + UINTN Size; EFI_EVENT Event; EFI_ACPI_TABLE_VERSION TableVersion; UINTN VarSize; @@ -1223,7 +1223,7 @@ AcpiPlatformEntryPoint ( EFI_SECTION_RAW, Instance, (VOID **) &CurrentTable, - (UINTN *) &Size, + &Size, &FvStatus ); =20 --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40248): https://edk2.groups.io/g/devel/message/40248 Mute This Topic: https://groups.io/mt/31551770/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 00:16:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40249+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40249+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557376278; cv=none; d=zoho.com; s=zohoarc; b=f49YkxK+i3ZCtI5MtukfD4/PW0tVOSuxQ3d9hxhgQk9X6Exygf76x6E76k1Zhv1uSQmiNM0a5zINnr9OjZdmiidMWm2/Tt0PyJXbYC9KbzbDnFpXyKjNYQYI7QQdYvEYnWoNzUwy0LklHI77PsREhekhA7e/i12QhvrxVUpJLaQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557376278; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=CxxR+1T70yFZiD3e/aPfDemV3W2ZlTM4vPyGt8LaBLs=; b=hgG+NCvDFMlmRpfAxZL001TaYutz1CIfhpSjjrWWf/FmRVqT9FUr31FkW1wUf5won8Dy8k0fnMOvanUnu/XoGNWcuf4SslXz/a/NBj1LebjX7s2RyjnpHDm7m70sOXHhFv6CCIK5dVUFKrLYh4FBW1fqV1omH00s2QTQfk4klCg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40249+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557376278332915.3382929599624; Wed, 8 May 2019 21:31:18 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Wed, 08 May 2019 21:31:17 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 May 2019 21:31:16 -0700 X-ExtLoop1: 1 X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.98.74]) by orsmga004.jf.intel.com with ESMTP; 08 May 2019 21:31:16 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian Subject: [edk2-devel] [Patch 03/16] Vlv2TbltDevicePkg/AcpiPlatform: Add variable protocols to depex Date: Wed, 8 May 2019 21:30:58 -0700 Message-Id: <20190509043111.15272-4-michael.d.kinney@intel.com> In-Reply-To: <20190509043111.15272-1-michael.d.kinney@intel.com> References: <20190509043111.15272-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557376277; bh=Zrxl0w5oW0kcFEaqu+eBl/GIf7y/xJqoSkJprzM/vrU=; h=Cc:Date:From:Reply-To:Subject:To; b=uT6iyb0jxgmwwgjb/siwo8KEQIpl5B88gdxfyRifi2Aq7BGGxr9cUuEuVRnnP/+5NRL nwA1oLnPTzt4zoAHes6Sv2s65kLprB9L16R+ytPs4kcKCVxs9pkQjFV67HbNdug1zvtvH pMQIZtsdmV+yfOAtRyNiqcBOm/gC/MeDDEY= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Add the arch protocols gEfiVariableArchProtocolGuid and gEfiVariableWriteArchProtocolGuid to the dependency expression for the AcpiPlatform module to guarantee that the variables that AcpiPlatform depends upon are set before they are used by this module. Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Michael D Kinney Reviewed-by: Zailiang Sun --- Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf b/Vlv2TbltDevi= cePkg/AcpiPlatform/AcpiPlatform.inf index 8422985764..c59920db03 100644 --- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf +++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf @@ -1,10 +1,12 @@ # # -# Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved -# = =20 +# Copyright (c) 1999 - 2019, Intel Corporation. All rights reserved +# + # SPDX-License-Identifier: BSD-2-Clause-Patent =20 -# = =20 +# + # # # Module Name: @@ -79,6 +81,8 @@ [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiTableStorageFile =20 [Depex] + gEfiVariableArchProtocolGuid AND + gEfiVariableWriteArchProtocolGuid AND gEfiAcpiSupportProtocolGuid AND gEfiMpServiceProtocolGuid AND gEfiCpuIoProtocolGuid --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40249): https://edk2.groups.io/g/devel/message/40249 Mute This Topic: https://groups.io/mt/31551772/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 00:16:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40250+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40250+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557376279; cv=none; d=zoho.com; s=zohoarc; b=QXEUMWUDjxpG8TAwzGcxldMKOaUb6a1k8hoKKUET1N0MwF9HKIq14BK0x3YZOiKG2XeZfKGgzP0OqZQxXqZCbgtv+lEU9GaKuH1Dn2XyY249YMrPZ3YM2XALjSQ5MzGXLQLtKedcGXpkoaQA7vTccKvJ6RhsaGyvbTglOKHDmqI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557376279; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=uSabKJn9dZXVEFDZCFMWWKP5SHx2faXHmggdUl7BP2k=; b=AZbjj8bmwXhN7oqlwYGoJSY1fCYbC0tyw1Upg5XloELBVpbSyZWqp9VnnbfnMI/oGYCGbpoQPze9xpUgmLLu+O2pbyb1btQopTlhFz//T+QuLq6zGyNhq8iOY30MXZXtjQqkvUs6/lwLO6/OnapPsUwKFeeDix0LUMBHUIJn04Y= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40250+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557376279042951.2873641249602; Wed, 8 May 2019 21:31:19 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Wed, 08 May 2019 21:31:17 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 May 2019 21:31:16 -0700 X-ExtLoop1: 1 X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.98.74]) by orsmga004.jf.intel.com with ESMTP; 08 May 2019 21:31:16 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian Subject: [edk2-devel] [Patch 04/16] Vlv2TbltDevicePkg/PpmPolicy: Fix call to MP Services Protocol Date: Wed, 8 May 2019 21:30:59 -0700 Message-Id: <20190509043111.15272-5-michael.d.kinney@intel.com> In-Reply-To: <20190509043111.15272-1-michael.d.kinney@intel.com> References: <20190509043111.15272-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557376278; bh=F2WjeGYXWPmLrx2xSgtHTbvnBk4JrbwX/LDV/aWaaV0=; h=Cc:Date:From:Reply-To:Subject:To; b=tRHeVj43HLcGN/qH2LctR9Knm0kOJUlfkuZbu43SV3KAMouNX4UYDpFnrNdAxnN8U2c kH/oJkSjkGeX26VCFkKFvWXY6gSUL8wvlhgKy+m4esy1OgmpZs4ULNawu+dtoGnsaHiYE mPkNa2YXI59ZlilFxNT1bE4mWbQrqt543uE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The NumberOfEnabledProcessors parameter to the MP Services Protocol service GetNumberOfProcessors() is not optional and is not allowed to be NULL. Add the CpuEnabledCount local variable and pass it into GetNumberOfProcessors(). Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Michael D Kinney Reviewed-by: Zailiang Sun --- Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c b/Vlv2TbltDevicePkg/Pp= mPolicy/PpmPolicy.c index 28de8457ce..3583e324e6 100644 --- a/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c +++ b/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c @@ -1,5 +1,5 @@ /**=20 - Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 =20 @@ -40,6 +40,7 @@ PpmPolicyEntry( EFI_HANDLE Handle; EFI_STATUS Status; UINTN CpuCount; + UINTN CpuEnabledCount; UINT8 CPUMobileFeature; =20 PCH_STEPPING Stepping; @@ -63,7 +64,7 @@ PpmPolicyEntry( // // Get processor count from MP service. // - Status =3D MpService->GetNumberOfProcessors (MpService, &CpuCount, NULL); + Status =3D MpService->GetNumberOfProcessors (MpService, &CpuCount, &CpuE= nabledCount); ASSERT_EFI_ERROR (Status); =20 // --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40250): https://edk2.groups.io/g/devel/message/40250 Mute This Topic: https://groups.io/mt/31551773/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 00:16:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40251+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40251+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557376279; cv=none; d=zoho.com; s=zohoarc; b=V8g5IU1QECU9b5Vm0QLwjq7I/isWxSfvZn1TFvgC8upVANW1IdbzIKea/5T1jZMf5iHz+g+US2EEswRkmHgcSe8VixpRAPn1OaLu+WR15DxG4tYzki3uFp6V2yKTlm58qg/+VDI80NJjOSBhvaSB916E9ZH5oSu9h21Q6E77vZI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557376279; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=GKBNWc3e/EqYijq1e6SViAN4iGxmP4itEUIB4Zrd4zI=; b=OwgVvOE5NeWjr4BQ4kLFIIX5MwRqll81lSo5Fjx8UsQDWkspGSJjdpWpC2OSujJz3e76ojAiB7FTZsfAfFjXaSvifDqtsYX0z1c8meVa5jHX2my94uYMmPrgidybok4Y80KFybWcv8NOLXfcjSRVDuCbDPwiG5NgRvgsAv2iE9g= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40251+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557376279601725.4093166577221; Wed, 8 May 2019 21:31:19 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by groups.io with SMTP; Wed, 08 May 2019 21:31:17 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 May 2019 21:31:16 -0700 X-ExtLoop1: 1 X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.98.74]) by orsmga004.jf.intel.com with ESMTP; 08 May 2019 21:31:16 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Michael D Kinney , Zailiang Sun , Yi Qian Subject: [edk2-devel] [Patch 05/16] Vlv2TbltDevicePkg/SmBiosMiscDxe: Fix GCC build issue Date: Wed, 8 May 2019 21:31:00 -0700 Message-Id: <20190509043111.15272-6-michael.d.kinney@intel.com> In-Reply-To: <20190509043111.15272-1-michael.d.kinney@intel.com> References: <20190509043111.15272-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557376278; bh=bKhfksC/eL1BjYG24QNg7DkmxMWgP7wG4S5aNDun20g=; h=Cc:Date:From:Reply-To:Subject:To; b=FVzy0j9BJrZc+WAy9Tp6dus7ZodQdk6EViik+ixHGCfNU8r6hpytmasbAOYdvPRD/c1 MVuKwdif5yPUeRqQlY+IJnsyG/5+I/Y0Z4cFAVk+wVAG05lAryi7clT8w0RT4h/VvfDEq CYXztbGgr1EYFOhfXEjXk4lTKzd2eqLoFaw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Michael D Kinney Fix loop comparison for end of languages. Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Michael D Kinney Reviewed-by: Zailiang Sun --- .../MiscNumberOfInstallableLanguagesFunction.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguag= esFunction.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLangu= agesFunction.c index 9fff8d8850..4a96a2c465 100644 --- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunct= ion.c +++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunct= ion.c @@ -1,10 +1,12 @@ /*++ =20 -Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.
- = =20 +Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.
+ + SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 + + =20 =20 Module Name: @@ -68,7 +70,7 @@ CurrentLanguageMatch ( // Find the best matching RFC 4646 language, compute the offset. // CompareLength =3D AsciiStrLen (BestLanguage); - for (MatchLang =3D Languages, (*Offset) =3D 0; MatchLang !=3D '\0'; (*= Offset)++) { + for (MatchLang =3D Languages, (*Offset) =3D 0; *MatchLang !=3D '\0'; (= *Offset)++) { // // Seek to the end of current match language. // --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40251): https://edk2.groups.io/g/devel/message/40251 Mute This Topic: https://groups.io/mt/31551774/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 00:16:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40252+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40252+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557376279; cv=none; d=zoho.com; s=zohoarc; b=aNb1C/v46nh5LeEMoS3DM9tAr8aV0J6VbyMFpadNVKuaxbDHPCXMsaC/hJVH5DyEF8IlbFExSGszuucx8UCIoExp8VmkdxNvH25lQXgCTqSKIGSRltOJykya0ck8S2TFPm88CwJ6bPIq6TVPW40T+81d6mvpSb56/0htwgRdBwE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557376279; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=BdA1haW9RdOIetZUsF7DFm/83B20z/s80tiEp5WJAd4=; b=Cl9YX7yzl5NU7ThtoDkPRprUybo/KcLoxTAphkWfI0inQ47E71tlaVmejcN2+Ixi9DpKlGUsW82vbA22UZmWFRvRU+tbSB7AQRUfT9cOvlTfYWdhR3JTLjZKpC4TrE2CHb4p85VWKCjavOh7Z3Rxuw6q1xWcx0UywTKO3of3Ud0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40252+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557376279122130.639933190977; Wed, 8 May 2019 21:31:19 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Wed, 08 May 2019 21:31:17 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 May 2019 21:31:16 -0700 X-ExtLoop1: 1 X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.98.74]) by orsmga004.jf.intel.com with ESMTP; 08 May 2019 21:31:16 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian Subject: [edk2-devel] [Patch 06/16] Vlv2TbltDevicePkg: Find UEFI Shell using gUefiShellFileGuid Date: Wed, 8 May 2019 21:31:01 -0700 Message-Id: <20190509043111.15272-7-michael.d.kinney@intel.com> In-Reply-To: <20190509043111.15272-1-michael.d.kinney@intel.com> References: <20190509043111.15272-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557376278; bh=geYAr9lnKhtoYC5UbNVE20bZhS2sKtGOLrkAop0GGGk=; h=Cc:Date:From:Reply-To:Subject:To; b=hVUucoyescC+klEYciYXxu9tGhIRPcWmBpBYKGowHcn2ea4DUppRU+ebMk2TRe6Vzdu +xWbX1mg6K37AeKjpjhJbX/D+hDkODtHdTWwXzVmPr4YpyuVp7jnqGryJrzhSm4AJx9qf 5WTHSYlsb9CFRfGXG/jmnk2/Vpc7MxKP6qY= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Remove use of PCD PcdShellFile from the IntelFrameworkModulePkg and instead use gUefiShellFileGuid=20 to find the UEFI Shell in an FV. Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Michael D Kinney Reviewed-by: Zailiang Sun --- Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c | 4 ++-- .../Library/PlatformBdsLib/PlatformBdsLib.inf | 10 ++++++---- .../Library/GenericBdsLib/BdsBoot.c | 8 ++++---- .../Library/GenericBdsLib/GenericBdsLib.inf | 5 +++-- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c b/Vlv2T= bltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c index 0f0e15c64a..e86c6b3e2e 100644 --- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c +++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c @@ -1356,7 +1356,7 @@ PlatformBdsLibEnumerateAllBootOption ( =20 Status =3D Fv->ReadFile ( Fv, - PcdGetPtr(PcdShellFile), + &gUefiShellFileGuid, NULL, &Size, &Type, @@ -1528,7 +1528,7 @@ PlatformBdsLibEnumerateAllBootOption ( =20 Status =3D Fv->ReadFile ( Fv, - PcdGetPtr(PcdShellFile), + &gUefiShellFileGuid, NULL, &Size, &Type, diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf b/= Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf index 5831569fae..d3bef0fa39 100644 --- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf +++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf @@ -1,11 +1,13 @@ #/** @file # Component name for module PlatformBootManagerLib # -# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved.
-# = =20 +# Copyright (c) 2008 - 2019, Intel Corporation. All rights reserved.
+# + # SPDX-License-Identifier: BSD-2-Clause-Patent =20 -# = =20 +# + # # # @@ -97,6 +99,7 @@ [Guids] gEfiNormalSetupGuid gEfiPartTypeSystemPartGuid gEfiEndOfDxeEventGroupGuid + gUefiShellFileGuid =20 [Pcd] gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiRsa2048Sha256TestPublicKeyFil= eGuid @@ -111,7 +114,6 @@ [Pcd] gPlatformModuleTokenSpaceGuid.PcdFlashFvShellSize gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile gPlatformModuleTokenSpaceGuid.PcdIFWISigBaseAddress gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn diff --git a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/Gen= ericBdsLib/BdsBoot.c b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/L= ibrary/GenericBdsLib/BdsBoot.c index b875041880..3034853695 100644 --- a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBds= Lib/BdsBoot.c +++ b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBds= Lib/BdsBoot.c @@ -1,7 +1,7 @@ /** @file BDS Lib functions which relate with create or process the boot option. =20 -Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -2342,7 +2342,7 @@ BdsLibBootViaBootOption ( // // If the boot option point to Internal FV shell, make sure it is valid // - Status =3D BdsLibUpdateFvFileDevicePath (&DevicePath, PcdGetPtr(PcdShe= llFile)); + Status =3D BdsLibUpdateFvFileDevicePath (&DevicePath, &gUefiShellFileG= uid); if (!EFI_ERROR(Status)) { if (Option->DevicePath !=3D NULL) { FreePool(Option->DevicePath); @@ -3544,7 +3544,7 @@ BdsLibEnumerateAllBootOption ( =20 Status =3D Fv->ReadFile ( Fv, - PcdGetPtr(PcdShellFile), + &gUefiShellFileGuid, NULL, &Size, &Type, @@ -3629,7 +3629,7 @@ BdsLibBuildOptionFromShell ( // // Build the shell device path // - EfiInitializeFwVolDevicepathNode (&ShellNode, PcdGetPtr(PcdShellFile)); + EfiInitializeFwVolDevicepathNode (&ShellNode, &gUefiShellFileGuid); =20 DevicePath =3D AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOC= OL *) &ShellNode); =20 diff --git a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/Gen= ericBdsLib/GenericBdsLib.inf b/Vlv2TbltDevicePkg/Override/IntelFrameworkMod= ulePkg/Library/GenericBdsLib/GenericBdsLib.inf index a978b5cbfa..e3c8a6fa27 100644 --- a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBds= Lib/GenericBdsLib.inf +++ b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBds= Lib/GenericBdsLib.inf @@ -6,7 +6,7 @@ # 2) BDS boot device connect interface; # 3) BDS Misc interfaces for mainting boot variable, ouput string, etc. # =20 -# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # =20 ## @@ -43,6 +43,7 @@ [Packages] MdeModulePkg/MdeModulePkg.dec IntelFrameworkPkg/IntelFrameworkPkg.dec IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec + ShellPkg/ShellPkg.dec =20 [LibraryClasses] DevicePathLib @@ -98,6 +99,7 @@ [Guids] ## SOMETIMES_CONSUMES ## Variable:L"LegacyDevOrder" gEfiLegacyDevOrderVariableGuid gEdkiiStatusCodeDataTypeVariableGuid ## SOMETIMES_CONSUMES ## G= UID + gUefiShellFileGuid =20 [Protocols] gEfiSimpleFileSystemProtocolGuid ## SOMETIMES_CONSUMES @@ -131,7 +133,6 @@ [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderLoad ## SOMETIMES= _CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderStart ## SOMETIMES= _CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable ## CONSUMES - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdTestKeyUsed ## C= ONSUMES =20 # --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40252): https://edk2.groups.io/g/devel/message/40252 Mute This Topic: https://groups.io/mt/31551775/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 00:16:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40253+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40253+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557376280; cv=none; d=zoho.com; s=zohoarc; b=g05Po1bxHQMe2N7NiSbOGqyBbrTmD4UT2YvS7+pVAc6b8B3n7xDTHrv8HsvW9QJYssQxADcP0SSqQIZcQNMmgqwdgeaS7S3uLondY8IPgK2Z63+hoQ5UEtTZuoPfe+8QwFg7XtwKVpgwwmbtmqZy9tewADzMki6r1NqFKhb1Sos= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557376280; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=nOpHdZVumZYe8wHvv7fQCLpkZnAfeony309+nGT59tc=; b=a7RAllmnujihja3GBIrAAKHG1I9GLelSbw1LomyUIQWw3ChTX7fKkQMDvwX3D0rxKNnXMOAYIH4AHCAE/EWqIdM1wlAjxCOB3ew7V1QjCLmDRYP5L7Je/iygVvuvvk/leVlUup4N6uP/Pov1uLTRnwwWVJknq0il/rXt472wp7E= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40253+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557376280190577.7909686158159; Wed, 8 May 2019 21:31:20 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Wed, 08 May 2019 21:31:17 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 May 2019 21:31:16 -0700 X-ExtLoop1: 1 X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.98.74]) by orsmga004.jf.intel.com with ESMTP; 08 May 2019 21:31:16 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian Subject: [edk2-devel] [Patch 07/16] Vlv2TbltDevicePkg: Build full UEFI Shell from sources Date: Wed, 8 May 2019 21:31:02 -0700 Message-Id: <20190509043111.15272-8-michael.d.kinney@intel.com> In-Reply-To: <20190509043111.15272-1-michael.d.kinney@intel.com> References: <20190509043111.15272-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557376279; bh=sJ8sY8y8/6jE1QeFCB0Oh/CPmJq3mTaHtKdEfhyl9xg=; h=Cc:Date:From:Reply-To:Subject:To; b=JkwyUx9rsQjJSkyBHR2CCH0vxqIiIUUzYklRtnCsO7OyFh+HS1iIxlP4b0Eu8Q9HNcj 3pucY+EhhrhnZRglArfmK2KTg0dOxGJxF7oAJ64POjBHQLM0ltXx0tA3tqsctwsDoMpT0 GKKz5Ez2ZwoLKRGgjzRzRRKriq75y0HtZes= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Update DSC files to build full UEFI Shell from sources. Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Michael D Kinney Reviewed-by: Zailiang Sun --- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 20 ++++++++++++++++++-- Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 22 ++++++++++++++++++---- Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 22 ++++++++++++++++++---- 3 files changed, 54 insertions(+), 10 deletions(-) diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/Pl= atformPkgGccX64.dsc index 4a10840c5c..eb1a732683 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -274,7 +274,6 @@ [LibraryClasses.common] !if $(RC_BINARY_RELEASE) =3D=3D TRUE I2cLib|Vlv2TbltDevicePkg/Library/I2CLib/I2CLibNull.inf !endif - ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf @@ -1378,7 +1377,24 @@ [Components.X64] MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf - ShellPkg/Application/Shell/Shell.inf + ShellPkg/Application/Shell/Shell.inf { + + ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellComman= dLib.inf + NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Comm= andsLib.inf + NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1Comm= andsLib.inf + NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3Comm= andsLib.inf + NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Co= mmandsLib.inf + NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comm= andsLib.inf + NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1= CommandsLib.inf + NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1= CommandsLib.inf + HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandlePar= singLib.inf + PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf + BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcf= gCommandLib.inf + + gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE + gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 + } !if $(SATA_ENABLE) =3D=3D TRUE $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/SataController.inf !endif diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/Plat= formPkgIA32.dsc index a99a5dfd5a..d1144db9d9 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -274,10 +274,7 @@ [LibraryClasses.common] !if $(RC_BINARY_RELEASE) =3D=3D TRUE I2cLib|Vlv2TbltDevicePkg/Library/I2CLib/I2CLibNull.inf !endif - ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf - ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib= .inf - HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsing= Lib.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf !if $(FTPM_ENABLE) =3D=3D TRUE || $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE @@ -1368,7 +1365,24 @@ [Components.IA32] MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf - ShellPkg/Application/Shell/Shell.inf + ShellPkg/Application/Shell/Shell.inf { + + ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellComman= dLib.inf + NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Comm= andsLib.inf + NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1Comm= andsLib.inf + NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3Comm= andsLib.inf + NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Co= mmandsLib.inf + NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comm= andsLib.inf + NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1= CommandsLib.inf + NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1= CommandsLib.inf + HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandlePar= singLib.inf + PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf + BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcf= gCommandLib.inf + + gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE + gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 + } !if $(SATA_ENABLE) =3D=3D TRUE $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/SataController.inf !endif diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/Platf= ormPkgX64.dsc index 0fac892bd5..1784554160 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -274,10 +274,7 @@ [LibraryClasses.common] !if $(RC_BINARY_RELEASE) =3D=3D TRUE I2cLib|Vlv2TbltDevicePkg/Library/I2CLib/I2CLibNull.inf !endif - ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf - ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib= .inf - HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsing= Lib.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf !if $(FTPM_ENABLE) =3D=3D TRUE || $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE @@ -1380,7 +1377,24 @@ [Components.X64] MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf - ShellPkg/Application/Shell/Shell.inf + ShellPkg/Application/Shell/Shell.inf { + + ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellComman= dLib.inf + NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Comm= andsLib.inf + NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1Comm= andsLib.inf + NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3Comm= andsLib.inf + NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Co= mmandsLib.inf + NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comm= andsLib.inf + NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1= CommandsLib.inf + NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1= CommandsLib.inf + HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandlePar= singLib.inf + PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf + BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcf= gCommandLib.inf + + gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE + gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 + } !if $(SATA_ENABLE) =3D=3D TRUE $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/SataController.inf !endif --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40253): https://edk2.groups.io/g/devel/message/40253 Mute This Topic: https://groups.io/mt/31551776/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 00:16:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40254+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40254+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557376279; cv=none; d=zoho.com; s=zohoarc; b=EbqiO+qSHGAPdjXCDVTiqDFbuvGSFUWE4Hs2tX+MJkR7HIarze5murKVtHqM8fUMpUeTtmg65/eynAbxPN5NuRq8UTw0HUM5Oig9LHDQ7UGy9SRf1eimT27zTqx4OQo5C7D5QDCnsjt7930EFly+WKB66GX7lgo46+GUMtZEuCE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557376279; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=/fWYN9icw2QIgVztsAxA3b6MAvf7fnYqQRPn9ZAPG+A=; b=DmVEL0vXl8lOJfr17AYQ3f1Z9GDLsBfNZlg40owcJezaUSad9NszEY6Y7/kct0rHd+Kf6IwhIeNMQrS2yqddyDpAREegPn6Te0s3gFEYjzuFmWQ5u5EBLtdn2QaI7C42GpgeFqdISXHaZ+ChKVp3Zeyc3ZamJ7c/Yy2L2XUPQaM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40254+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557376279495674.7306802550987; Wed, 8 May 2019 21:31:19 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Wed, 08 May 2019 21:31:18 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 May 2019 21:31:17 -0700 X-ExtLoop1: 1 X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.98.74]) by orsmga004.jf.intel.com with ESMTP; 08 May 2019 21:31:16 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian Subject: [edk2-devel] [Patch 08/16] Vlv2TbltDevicePkg: Use CpuDxe from UefiCpuPkg Date: Wed, 8 May 2019 21:31:03 -0700 Message-Id: <20190509043111.15272-9-michael.d.kinney@intel.com> In-Reply-To: <20190509043111.15272-1-michael.d.kinney@intel.com> References: <20190509043111.15272-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557376278; bh=BL3L+b85XiZB6wQ1j2B6shG/wSGLrlxRt8FwiKFOGZU=; h=Cc:Date:From:Reply-To:Subject:To; b=RCgjIIrCecwxOHPVRsZCyWqER4+Sxz0xh0dPKwtKrjrvn9FMwa5PrnQDT8R6zYy8rmi FIJB+C8MARqOyxf9C7rqTsmskEZG5q0iG7UALtrO4uZcoKns5PnKqYDRqHCce3RRiJ/mw FWTnLisA2Si2jTAkIx1CXV7xejOE8Iv9LRU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Use CpuDxe module from UefiCPuPkg instead of pre-built binary module MpCpu. Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Michael D Kinney Reviewed-by: Zailiang Sun --- Vlv2TbltDevicePkg/PlatformPkg.fdf | 2 +- Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 2 +- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 8 ++++++-- Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 7 +++++-- Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 10 ++++++++-- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/Platform= Pkg.fdf index be05fa136b..c725cdcf31 100644 --- a/Vlv2TbltDevicePkg/PlatformPkg.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf @@ -458,7 +458,7 @@ [FV.FVMAIN] INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerR= untimeDxe.inf INF MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRout= erSmm.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/MpCpu.inf +INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF $(PLATFORM_PACKAGE)/Metronome/Metronome.inf INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf !if $(ARCH) =3D=3D IA32 diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/Platf= ormPkgGcc.fdf index d3c7409c4b..349fbb2887 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf @@ -414,7 +414,7 @@ [FV.FVMAIN] INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerR= untimeDxe.inf INF MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRout= erSmm.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf -INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/MpCpu.inf +INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF $(PLATFORM_PACKAGE)/Metronome/Metronome.inf INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf !if $(ARCH) =3D=3D IA32 diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/Pl= atformPkgGccX64.dsc index eb1a732683..44a5806153 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -199,7 +199,8 @@ [LibraryClasses.common] # MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf - CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/C= puExceptionHandlerLibNull.inf + CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuE= xceptionHandlerLib.inf + MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf =20 # # ICH @@ -316,7 +317,8 @@ [LibraryClasses.IA32.PEIM, LibraryClasses.IA32.PEI_CORE= , LibraryClasses.IA32.SEC ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExt= ractGuidedSectionLib.inf MultiPlatformLib|$(PLATFORM_PACKAGE)/Library/MultiPlatformLib/MultiPlatf= ormLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf - + CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf + MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf =20 !if $(PERFORMANCE_ENABLE) =3D=3D TRUE PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.= inf @@ -1087,6 +1089,7 @@ [Components.X64] PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryA= llocationLib.inf HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf + CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Sec= PeiCpuExceptionHandlerLib.inf !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgen= tLib.inf !endif @@ -1304,6 +1307,7 @@ [Components.X64] # MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf + UefiCpuPkg/CpuDxe/CpuDxe.inf UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/Plat= formPkgIA32.dsc index d1144db9d9..bff0fe21af 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -199,7 +199,8 @@ [LibraryClasses.common] # MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf - CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/C= puExceptionHandlerLibNull.inf + CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuE= xceptionHandlerLib.inf + MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf =20 # # ICH @@ -316,7 +317,8 @@ [LibraryClasses.IA32.PEIM, LibraryClasses.IA32.PEI_CORE= , LibraryClasses.IA32.SEC ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExt= ractGuidedSectionLib.inf MultiPlatformLib|$(PLATFORM_PACKAGE)/Library/MultiPlatformLib/MultiPlatf= ormLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf - + CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf + MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf =20 !if $(PERFORMANCE_ENABLE) =3D=3D TRUE PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.= inf @@ -1292,6 +1294,7 @@ [Components.IA32] # MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf + UefiCpuPkg/CpuDxe/CpuDxe.inf UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/Platf= ormPkgX64.dsc index 1784554160..7630b48ea6 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -199,7 +199,8 @@ [LibraryClasses.common] # MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf - CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/C= puExceptionHandlerLibNull.inf + CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuE= xceptionHandlerLib.inf + MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf =20 # # ICH @@ -275,6 +276,8 @@ [LibraryClasses.common] I2cLib|Vlv2TbltDevicePkg/Library/I2CLib/I2CLibNull.inf !endif ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf + ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib= .inf + HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsing= Lib.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf !if $(FTPM_ENABLE) =3D=3D TRUE || $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE @@ -316,7 +319,8 @@ [LibraryClasses.IA32.PEIM, LibraryClasses.IA32.PEI_CORE= , LibraryClasses.IA32.SEC ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExt= ractGuidedSectionLib.inf MultiPlatformLib|$(PLATFORM_PACKAGE)/Library/MultiPlatformLib/MultiPlatf= ormLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf - + CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf + MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf =20 !if $(PERFORMANCE_ENABLE) =3D=3D TRUE PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.= inf @@ -1087,6 +1091,7 @@ [Components.X64] PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryA= llocationLib.inf HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf + CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Sec= PeiCpuExceptionHandlerLib.inf !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgen= tLib.inf !endif @@ -1304,6 +1309,7 @@ [Components.X64] # MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf + UefiCpuPkg/CpuDxe/CpuDxe.inf UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40254): https://edk2.groups.io/g/devel/message/40254 Mute This Topic: https://groups.io/mt/31551777/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 00:16:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40255+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40255+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557376279; cv=none; d=zoho.com; s=zohoarc; b=GR9TaEJhSB2feqeNClKpAqepjyTMSWYXBYmLS7WRb+8nRZ2UMRZSFkqCDFpzFB8FdXUzXnHuZCFhXpBMsNGUaaSnNF5+EajxiN4js4UROK71SVdGhCUtlyepMpJkagbRmDX3GDLZXDdb9tNBZMebBVRxjE5RrGu/CGVY6O2ONm4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557376279; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=hBhN7yTFQ6vTyN8RHf5IJwyK3Z5qdaD4Oxrw8JGo3fk=; b=QccyG9m958fnvZxuTuELG6Atr1LM3TU/LdwSR7rtHMbwgPPsW7Ham0iEz2tVaGbJN+zIDKau+H5GwU4WATK4H2iSRhNStwLs3yRe916wmL2vTo73Ubo9IGQt2CuOhosoQAve7pCqmRMUH+3+Cir4sDAD0ejvDTcEgYBd87b/zc8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40255+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557376279470905.8411868183844; Wed, 8 May 2019 21:31:19 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Wed, 08 May 2019 21:31:18 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 May 2019 21:31:17 -0700 X-ExtLoop1: 1 X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.98.74]) by orsmga004.jf.intel.com with ESMTP; 08 May 2019 21:31:16 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian Subject: [edk2-devel] [Patch 09/16] Vlv2TbltDevicePkg: Add PchInitSmm module Date: Wed, 8 May 2019 21:31:04 -0700 Message-Id: <20190509043111.15272-10-michael.d.kinney@intel.com> In-Reply-To: <20190509043111.15272-1-michael.d.kinney@intel.com> References: <20190509043111.15272-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557376278; bh=K0GIxukEQOsZPgwXuypYzLW/Rwx0dzzLFct/6j8fSig=; h=Cc:Date:From:Reply-To:Subject:To; b=ZChO6dS0CwfsDnV54Mu9WWUaG1S8QLFWoOSOu3pf01R6oJMlWjWLRfRg2C0s2JdzelE TkVxHlmq88UGkfSJhbf7/nJHlZP8YUsIyoGmqE0NMPNnq/JgsBBe24kYnbdjBk9ManvnZ 0icwTtMUhf3ohnDd1wZAHtIUqwEFJtsGHvs= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Add the PcdInitSmm module that should not have been removed. This module performs actions at Exit Boot Services to place devices in an OS compatible state. Wothout this module, so versions of Linux are not bootable. Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Michael D Kinney Reviewed-by: Zailiang Sun --- Vlv2TbltDevicePkg/PlatformPkg.fdf | 1 + Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 1 + Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 3 +++ Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 2 ++ Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 2 ++ 5 files changed, 9 insertions(+) diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/Platform= Pkg.fdf index c725cdcf31..098602b9d8 100644 --- a/Vlv2TbltDevicePkg/PlatformPkg.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf @@ -517,6 +517,7 @@ [FV.FVMAIN] =20 !if $(MINNOW2_FSP_BUILD) =3D=3D FALSE INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchInitDxe.inf +INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchInitSmm.inf !endif INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchSmiDispatcher.inf !if $(PCIESC_ENABLE) =3D=3D TRUE diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/Platf= ormPkgGcc.fdf index 349fbb2887..40385794a3 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf @@ -473,6 +473,7 @@ [FV.FVMAIN] =20 !if $(MINNOW2_FSP_BUILD) =3D=3D FALSE INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchInitDxe.inf +INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchInitSmm.inf !endif INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/$(DXE_ARCHITECTURE)/PchSmiDispatcher.inf !if $(PCIESC_ENABLE) =3D=3D TRUE diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/Pl= atformPkgGccX64.dsc index 44a5806153..b9faf558b7 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -1193,6 +1193,8 @@ [Components.X64] gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043 } + $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchInitSmm.inf + $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchSmiDispatcher.inf =20 !if $(PCIESC_ENABLE) =3D=3D TRUE @@ -1449,6 +1451,7 @@ [Components.X64] } =20 =20 + !if $(NETWORK_ENABLE) =3D=3D TRUE !if $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE NetworkPkg/IScsiDxe/IScsiDxe.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/Plat= formPkgIA32.dsc index bff0fe21af..2324794841 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -1180,6 +1180,8 @@ [Components.IA32] gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043 } + $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchInitSmm.inf + $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchSmiDispatcher.inf =20 !if $(PCIESC_ENABLE) =3D=3D TRUE diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/Platf= ormPkgX64.dsc index 7630b48ea6..10d44d5652 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -1195,6 +1195,8 @@ [Components.X64] gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043 } + $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchInitSmm.inf + $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/PchSmiDispatcher.inf =20 !if $(PCIESC_ENABLE) =3D=3D TRUE --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40255): https://edk2.groups.io/g/devel/message/40255 Mute This Topic: https://groups.io/mt/31551778/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 00:16:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40256+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40256+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557376279; cv=none; d=zoho.com; s=zohoarc; b=by2VR7mfEqjqUNtdjyx2zYGpwiAEyTaiH/WZlPVvDlgxnC/jK75tFxphVOQV500ePko/RWY+9VH5whNkxDhqbPdW/WQC4SMc09UrS8IMvYLC1vWpGlAQlvGOMDaeao0syhVdIhP8uLmOkbiUx/jONsOOycXBUOlmbF3tv+DWGzU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557376279; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=g5aiP8g7CMVgSIx6lJL2Upzxh8rDB0Pzr6Hpjj1sUrk=; b=kC0ha8YHDk0Ry4tGF1hrd3+BN+BzfYkWSC/SUqAPPIZtuT2dDnrvmY8fmfKF24UyzBngVRu+4LUxBuCfZuwyz0Cq3nSmBcyDdjLFqyMxLFOKyzebzXFQ3/BSIip30W0pHg3tKfVhj2scOnFEEGDUJM7RJmkczsZYZ+QgAAgxAKM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40256+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557376279760445.4934841811564; Wed, 8 May 2019 21:31:19 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Wed, 08 May 2019 21:31:18 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 May 2019 21:31:17 -0700 X-ExtLoop1: 1 X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.98.74]) by orsmga004.jf.intel.com with ESMTP; 08 May 2019 21:31:16 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian Subject: [edk2-devel] [Patch 10/16] Vlv2TbltDevicePkg: Always enable QuietBoot to produce BGRT Date: Wed, 8 May 2019 21:31:05 -0700 Message-Id: <20190509043111.15272-11-michael.d.kinney@intel.com> In-Reply-To: <20190509043111.15272-1-michael.d.kinney@intel.com> References: <20190509043111.15272-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557376279; bh=S1CUilhp+rkKY5XjCPbtpIVwIZGEeVk9dcWuz/b0ceA=; h=Cc:Date:From:Reply-To:Subject:To; b=Y4O1VGq1klYbfLLNvV43y+4O0tx4H2Ope2gD48yeaIr06i87AgY+ln8hrM7H7Uzcl2U 5a4htD8IrBhttbE0PY/w4nuL1z64RxEtWIe0M/YsfDxjZIpgWaM1dAUSRxg0R2pN9WFRL nteDd8RWyVTo90ga5G869lJEZdc+KEZ75wA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Michael D Kinney Reviewed-by: Zailiang Sun --- .../Library/PlatformBdsLib/BdsPlatform.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c b/Vlv2T= bltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c index e86c6b3e2e..4d5997d6e9 100644 --- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c +++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c @@ -1,6 +1,6 @@ /** @file =20 - Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
= =20 SPDX-License-Identifier: BSD-2-Clause-Patent = =20 @@ -1702,6 +1702,8 @@ PlatformBdsPolicyBehavior ( EsrtManagement =3D NULL; } =20 + DEBUG ((DEBUG_INFO, "BDS: BootMode=3D%02x\n", BootMode)); + switch (BootMode) { =20 case BOOT_WITH_MINIMAL_CONFIGURATION: @@ -1778,9 +1780,8 @@ PlatformBdsPolicyBehavior ( goto FULL_CONFIGURATION; } =20 - if (SystemConfiguration.QuietBoot) { - EnableQuietBoot (PcdGetPtr(PcdLogoFile)); - } else { + EnableQuietBoot (PcdGetPtr(PcdLogoFile)); + if (!SystemConfiguration.QuietBoot) { PlatformBdsDiagnostics (IGNORE, FALSE, BaseMemoryTest); } =20 @@ -1864,8 +1865,7 @@ PlatformBdsPolicyBehavior ( // Boot with the specific configuration // PlatformBdsConnectConsole (gPlatformConsole); - PlatformBdsDiagnostics (EXTENSIVE, FALSE, BaseMemoryTest); - EnableQuietBoot (PcdGetPtr(PcdLogoFile)); + PlatformBdsDiagnostics (EXTENSIVE, TRUE, BaseMemoryTest); =20 DEBUG((DEBUG_INFO, "ProcessCapsules Before EndOfDxe......\n")); ProcessCapsules (); @@ -1968,10 +1968,9 @@ FULL_CONFIGURATION: // Perform some platform specific connect sequence // PlatformBdsConnectSequence (); - if (SystemConfiguration.QuietBoot) { - EnableQuietBoot (PcdGetPtr(PcdLogoFile)); - } else { - PlatformBdsDiagnostics (IGNORE, FALSE, BaseMemoryTest); + EnableQuietBoot (PcdGetPtr(PcdLogoFile)); + if (!SystemConfiguration.QuietBoot) { + PlatformBdsDiagnostics (IGNORE, FALSE, BaseMemoryTest); } =20 // --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40256): https://edk2.groups.io/g/devel/message/40256 Mute This Topic: https://groups.io/mt/31551779/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 00:16:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40257+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40257+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557376280; cv=none; d=zoho.com; s=zohoarc; b=hN2O8mEfZ+4LpzQWVVjKwqPUooD5X8WXbIdU11ANPbntutxXKnpx/vE6I/QiqGCN9kn2Zo/7iTd0LoMmdfSSmqU+2zKbR/QGE95A0kuk+GoS6PgnzX0/zkmFmeIOsBIZb2+hXr44isvs0t+5XAqfuPamDMVvDXvTCm+So9ZHqs4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557376280; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=hQUDcBVycZl24EVr6AkeLGIfyFIBe7XMPGiYKaSaS5U=; b=nR5MySC6QXApq6SUO2+9Odr+nnU7N3lP5NssH4VEba4JhaT7Jb901Z2IaPsMT07kLBAdZ3TICun19p4sImlfU2rZg+rMULSuIpTpgqeN37my6MYROuHgXRFIlbY7R+jLIMTSjurfTpV6GJJMo/x+quRvLEG5PKrHs2O+ZpbTIJU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40257+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557376280327774.9666453494269; Wed, 8 May 2019 21:31:20 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Wed, 08 May 2019 21:31:18 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 May 2019 21:31:17 -0700 X-ExtLoop1: 1 X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.98.74]) by orsmga004.jf.intel.com with ESMTP; 08 May 2019 21:31:17 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian Subject: [edk2-devel] [Patch 11/16] Vlv2TbltDevicePkg/Stitch/Gcc: Update default setting binary Date: Wed, 8 May 2019 21:31:06 -0700 Message-Id: <20190509043111.15272-12-michael.d.kinney@intel.com> In-Reply-To: <20190509043111.15272-1-michael.d.kinney@intel.com> References: <20190509043111.15272-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557376279; bh=aU54ewNyPYAl9EFfNgf1FBvOMuPd+DcxCA56Hs8lBbQ=; h=Cc:Date:From:Reply-To:Subject:To; b=caeiGB0Soz/GqXrnc+jafKCYT5WedLXNZRYYJ/84DwiVEZfFy95Ng260LFhPQYK4RJC hghjw4ToUE3Vfyzki2pAkJn5Bxtlcv+mYWj8dm6NVYGG3ljupBFHKgW4flnbltnoi24Su vZse4o/8smZbawysiCLxE1+CXQBiU9w0x5U= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Update the binary file that contains the default configuration settings. This file is generated using FCE.exe during a Windows build and this binary file needs to be updated when there are changes to the configuration setting layout or configuration setting default values. Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Michael D Kinney Reviewed-by: Zailiang Sun --- Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 7 ++++--- .../Stitch/Gcc/NvStorageVariable.bin | Bin 253952 -> 253952 bytes 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/Platf= ormPkgGcc.fdf index 40385794a3..1ba6124a69 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf @@ -119,15 +119,15 @@ [FD.Vlv] FV =3D MICROCODE_FV $(FLASH_REGION_VPD_OFFSET)|$(FLASH_REGION_VPD_SIZE) gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|gEfiMdeModule= PkgTokenSpaceGuid.PcdFlashNvStorageVariableSize -FILE =3D $(WORKSPACE)/Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageVariable.bin +FILE =3D Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageVariable.bin =20 $(FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_OFFSET)|$(FLASH_REGION_N= VSTORAGE_SUBREGION_NV_FTW_WORKING_SIZE) gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|gEfiMdeModu= lePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize -FILE =3D $(WORKSPACE)/Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageFtwWorking.bin +FILE =3D Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageFtwWorking.bin =20 $(FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET)|$(FLASH_REGION_NVS= TORAGE_SUBREGION_NV_FTW_SPARE_SIZE) gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|gEfiMdeModule= PkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize -FILE =3D $(WORKSPACE)/Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageFtwSpare.bin +FILE =3D Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageFtwSpare.bin =20 !if $(MINNOW2_FSP_BUILD) =3D=3D TRUE =20 @@ -633,6 +633,7 @@ [FV.FVMAIN] INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf !endif =20 + # # SMBIOS # diff --git a/Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageVariable.bin b/Vlv2TbltD= evicePkg/Stitch/Gcc/NvStorageVariable.bin index 6aa2bb5aa530caf0a4a7744a398b16076a9e957f..7f8688b099f1e70491f16161a98= c7b53c6b7a412 100644 GIT binary patch delta 127 zcmZoTz~69ye?o_@9s>hI0uuv+yZV&bexjPbOU(8cGMw0I?a2_pV8Rg3;LPC9;K$&` z;K|_5V6?fJv65->ItjJS5sVAiHWzR&;o1Cyy@Hw52xv;mWJ!sslVv4EfC{u2=3DWf0! eQNTR;r0ART*X#fBK --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40257): https://edk2.groups.io/g/devel/message/40257 Mute This Topic: https://groups.io/mt/31551780/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 00:16:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40258+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40258+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557376279; cv=none; d=zoho.com; s=zohoarc; b=TRx9QTLAxfLIxuAmjt65OTbGsI6NCmGOzDtK//yZsxiyQqUO1E4qSwrFH7ELvG0Mbdu6cJZ1/8NQ+1Sh6+UHdJiWTMMGgojq5Yhema+GBPwc5+QwGgKxGQgPr+f8e+0MhvWmAC0a7SCqOcv4s/izvO14gvQHEXIFD2vFvpTiE+U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557376279; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=T03Cateufj7zkusnxP5KWDcJd+yE+5IYPyH6CI08GT0=; b=bOAEum0sv5xFXLVWqqmnThAqTklHXr75i4uZcU3eP6IQoYRHovD6+eh2RQu+dO3XGQMOFvQCygHS5Rs5DuuVUl99fZn3p8aBPq9E5e9HyIBhJFbCdjip1ISz32dgM3psuOwUT3HXSfMMXCq88QKa7iOdqJbhTrU6w0nVFOot7VI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40258+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557376279868123.59644779358234; Wed, 8 May 2019 21:31:19 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Wed, 08 May 2019 21:31:18 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 May 2019 21:31:17 -0700 X-ExtLoop1: 1 X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.98.74]) by orsmga004.jf.intel.com with ESMTP; 08 May 2019 21:31:17 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian Subject: [edk2-devel] [Patch 12/16] Vlv2TbltDevicePkg: Remove directory assumptions from build scripts Date: Wed, 8 May 2019 21:31:07 -0700 Message-Id: <20190509043111.15272-13-michael.d.kinney@intel.com> In-Reply-To: <20190509043111.15272-1-michael.d.kinney@intel.com> References: <20190509043111.15272-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557376279; bh=81puqiQ9Jbr7AVTNnWwofbDEvqWwnHMnquouPBfnvAc=; h=Cc:Date:From:Reply-To:Subject:To; b=riJ1CR1v5aI151zzStz4tGZvZZAnGvAiscpJvnu+l7TGF8sv9INIZDY5ynI5utKDV4v u8IDi/346vwoNbtssMPhbq1v1IBjCLGQUS3GOpSdQ91DPxV5hpxLWqN4N5+XbfJUknPoI 2SdPeMzVIhZICz5YNQihfkNyFi4Nf75oMjs= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" In preparation for moving Vlv2TbltDevicePkg to the edk2-platforms repository, the batch scripts used to build this platform are updated to not make any assumptions about the directory location of Vlv2TbltDevicePkg. Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Michael D Kinney Reviewed-by: Zailiang Sun --- Vlv2TbltDevicePkg/.gitignore | 2 + Vlv2TbltDevicePkg/Build_IFWI.bat | 31 +++- Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat | 23 ++- Vlv2TbltDevicePkg/bldX64.bat | 216 ------------------------ Vlv2TbltDevicePkg/bld_vlv.bat | 129 ++++++++------ Vlv2TbltDevicePkg/bld_vlv.sh | 3 +- 6 files changed, 124 insertions(+), 280 deletions(-) delete mode 100644 Vlv2TbltDevicePkg/bldX64.bat diff --git a/Vlv2TbltDevicePkg/.gitignore b/Vlv2TbltDevicePkg/.gitignore index b4699122b8..c7698262ad 100644 --- a/Vlv2TbltDevicePkg/.gitignore +++ b/Vlv2TbltDevicePkg/.gitignore @@ -1,3 +1,5 @@ AutoPlatformCFG.txt Stitch/Stitching.log Stitch/MNW*.bin +Stitch/MNW*.rom +Stitch/MNW*.rom.orig diff --git a/Vlv2TbltDevicePkg/Build_IFWI.bat b/Vlv2TbltDevicePkg/Build_IFW= I.bat index 9a3063397e..887206703a 100644 --- a/Vlv2TbltDevicePkg/Build_IFWI.bat +++ b/Vlv2TbltDevicePkg/Build_IFWI.bat @@ -1,7 +1,7 @@ @REM @file @REM Windows batch file to build BIOS ROM @REM -@REM Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+@REM Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
@REM SPDX-License-Identifier: BSD-2-Clause-Patent @REM =20 @@ -18,11 +18,26 @@ set exitCode=3D0 set "Build_Flags=3D " set "Stitch_Flags=3D " set Arch=3DX64 -set WORKSPACE=3D%CD% -set CORE_PATH=3D%WORKSPACE%\edk2 -set PLATFORM_PATH=3D%WORKSPACE%\edk2 set PLATFORM_PACKAGE=3DVlv2TbltDevicePkg =20 +set PLATFORM_PATH=3D%WORKSPACE% +if not exist %PLATFORM_PATH%\%PLATFORM_PACKAGE% ( + if defined PACKAGES_PATH ( + for %%i IN (%PACKAGES_PATH%) DO ( + if exist %%~fi\%PLATFORM_PACKAGE% ( + set PLATFORM_PATH=3D%%~fi + goto PlatformPackageFound + ) + ) + ) else ( + echo. + echo !!! ERROR !!! Cannot find %PLATFORM_PACKAGE% !!! + echo. + goto Exit + ) +) +:PlatformPackageFound + :: Parse Optional arguments :OptLoop if /i "%~1"=3D=3D"/?" goto Usage @@ -125,11 +140,11 @@ if %ERRORLEVEL% NEQ 0 ( echo. echo Finished Building BIOS. @REM Set BIOS_ID environment variable here. -call %CORE_PATH%\Conf\BiosId.bat +call %WORKSPACE%\Conf\BiosId.bat echo BIOS_ID=3D%BIOS_ID% =20 :: Set the Board_Id, Build_Type, Version_Major, and Version_Minor environm= ent variables -find /v "#" %CORE_PATH%\Conf\BiosId.env > ver_strings +find /v "#" %WORKSPACE%\Conf\BiosId.env > ver_strings for /f "tokens=3D1,3" %%i in (ver_strings) do set %%i=3D%%j del /f/q ver_strings >nul set BIOS_Name=3D%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MI= NOR%.ROM @@ -137,10 +152,10 @@ set BIOS_Name=3D%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSI= ON_MAJOR%_%VERSION_MINOR%.ROM :: Start Integration process echo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D echo Build_IFWI: Calling IFWI Stitching Script... -pushd %CORE_PATH%\%PLATFORM_PACKAGE%\Stitch +pushd %PLATFORM_PATH%\%PLATFORM_PACKAGE%\Stitch =20 :: IFWIStitch.bat [/nG] [/nM] [/nB] [/B BIOS.rom] [/C StitchConfig] [/S = IFWISuffix] - call IFWIStitch.bat %Stitch_Flags% /B ..\..\%BIOS_Name% %IFWI_Suffix% + call IFWIStitch.bat %Stitch_Flags% /B %BIOS_Name% %IFWI_Suffix% =20 @echo off popd diff --git a/Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat b/Vlv2TbltDevicePkg/St= itch/IFWIStitch.bat index 7c3ebbd1c6..200ca05a23 100644 --- a/Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat +++ b/Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat @@ -1,7 +1,7 @@ @REM @file @REM Windows batch file to build BIOS ROM @REM -@REM Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<= BR> +@REM Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<= BR> @REM=20 @REM SPDX-License-Identifier: BSD-2-Clause-Patent @REM @@ -9,6 +9,25 @@ @echo off SetLocal EnableDelayedExpansion EnableExtensions =20 +set PLATFORM_BIN_PACKAGE=3D%WORKSPACE%\Vlv2SocBinPkg +if not exist %PLATFORM_BIN_PACKAGE% ( + if defined PACKAGES_PATH ( + for %%i IN (%PACKAGES_PATH%) DO ( + if exist %%~fi\Vlv2SocBinPkg ( + set PLATFORM_BIN_PACKAGE=3D%%~fi\Vlv2SocBinPkg + goto PlatformBinPackageFound + ) + ) + ) else ( + echo. + echo !!! ERROR !!! Cannot find %PLATFORM_NAME% !!! + echo. + goto BldFail + ) +) +:PlatformBinPackageFound + + :: Set script defaults set exitCode=3D0 set BackupRom=3D1 @@ -185,7 +204,7 @@ for %%i in (%BIOS_Names%) do ( echo Generating IFWI... %BIOS_ID%.bin echo. =20 - copy /b/y !IFWI_HEADER_FILE! + ..\..\..\silicon\Vlv2SocBinPkg\SEC\!SEC= _VERSION!\VLV_SEC_REGION.bin + ..\..\..\silicon\Vlv2SocBinPkg\SEC\!SEC_VERS= ION!\Vacant.bin + !BIOS_Rom! %BIOS_ID%.bin + copy /b/y !IFWI_HEADER_FILE! + %PLATFORM_BIN_PACKAGE%\SEC\!SEC_VERSION= !\VLV_SEC_REGION.bin + %PLATFORM_BIN_PACKAGE%\SEC\!SEC_VERSION!\Vacant.bin = + !BIOS_Rom! %BIOS_ID%.bin echo. echo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D ) diff --git a/Vlv2TbltDevicePkg/bldX64.bat b/Vlv2TbltDevicePkg/bldX64.bat deleted file mode 100644 index 50dc5b1f07..0000000000 --- a/Vlv2TbltDevicePkg/bldX64.bat +++ /dev/null @@ -1,216 +0,0 @@ -@REM @file -@REM Windows batch file to build BIOS ROM -@REM -@REM Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
-@REM SPDX-License-Identifier: BSD-2-Clause-Patent -@REM - -@echo off -@echo. -@time /t - -@if exist %WORKSPACE%\edk2.log del %WORKSPACE%\edk2.log -@if exist %WORKSPACE%\unitool.log del %WORKSPACE%\unitool.log -@if exist %WORKSPACE%\Conf\build_rule.txt del %WORKSPACE%\Conf\build_rule.= txt -@if exist %WORKSPACE%\Conf\FrameworkDatabase.db del %WORKSPACE%\Conf\Frame= workDatabase.db -@if exist %WORKSPACE%\Conf\target.txt del %WORKSPACE%\Conf\target.txt -@if exist %WORKSPACE%\Conf\tools_def.txt del %WORKSPACE%\Conf\tools_def.txt -@if exist conf\.cache rmdir /q /s conf\.cache - -@set target=3DDEBUG - -@if /i "%1" =3D=3D "release" set TARGET=3DRELEASE -@if /i "%2" =3D=3D "release" set TARGET=3DRELEASE -@if /i "%3" =3D=3D "release" set TARGET=3DRELEASE -@if /i "%4" =3D=3D "release" set TARGET=3DRELEASE -@if /i "%5" =3D=3D "release" set TARGET=3DRELEASE - -@set PlatformType=3DNO_PLATFORM -@set config_file=3D.\Vlv2TbltDevicePkg\PlatformPkgConfig.dsc -@set EVN_debug_file=3D.\Vlv2TbltDevicePkg\BiosIdx64D.env -@set EVN_release_file=3D.\Vlv2TbltDevicePkg\BiosIdx64R.env -@set auto_config_inc=3D.\Vlv2TbltDevicePkg\AutoPlatformCFG.txt - -@if "%1" =3D=3D "MNW2" ( - set %PlatformType% =3D MNW2 - @echo Setting Baley Bay platform configration and BIOS ID ... - findstr /b /v BOARD_ID %EVN_debug_file% > newfile.env - echo BOARD_ID =3D MNW2MAX >> newfile.env - type newfile.env > %EVN_debug_file% - findstr /b /v BOARD_ID %EVN_release_file% > newfile.env - echo BOARD_ID =3D MNW2MAX >> newfile.env - type newfile.env > %EVN_release_file% - echo DEFINE ENBDT_PF_BUILD =3D TRUE >> %auto_config_inc% - echo DEFINE X64_CONFIG =3D TRUE >> %auto_config_inc% - goto PLATFORM_SETTING_DONE -) =20 - -@if "%PlatformType%" =3D=3D "NO_PLATFORM" ( - goto BldFail -) - -rem clearup the temp file -:PLATFORM_SETTING_DONE -@DEL NEWFILE.ENV -@DEL NEWFILE.CFG - -@REM Define platform specific environment variables. -@REM -@set PLATFORM_PACKAGE=3DVlv2TbltDevicePkg -@set SCRIPT_ERROR=3D0 - -@REM Set basic environment. -@echo. -@echo Run edksetup.bat batch file. -@echo. -@del Conf\build_rule.txt -@REM @del Conf\tools_def.txt -@call edksetup.bat - - -@echo. -@echo Set the VS2008 environment. -@echo. -@if defined VS90COMNTOOLS ( - if not defined VSINSTALLDIR call "%VS90COMNTOOLS%\vsvars32.bat" - if /I "%VS90COMNTOOLS%" =3D=3D "C:\Program Files\Microsoft Visual Studio= 9.0\Common7\Tools\" ( - set TOOL_CHAIN_TAG=3DVS2008 - ) else ( - set TOOL_CHAIN_TAG=3DVS2008x86 - ) -) else ( - echo. - echo !!! ERROR !!! VS2008 not installed correctly. VS90COMNTOOLS not def= ined. !!! - echo. - set SCRIPT_ERROR=3D1 - goto :BldEnd -) - -@echo. -@echo Set build environment. -@echo. -@if not exist Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG% ( - mkdir Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG% -) - - -@REM Set clean build option -@set CLEAN_BUILD_OPTION=3D-e - -@findstr /V "ACTIVE_PLATFORM TARGET TARGET_ARCH TOOL_CHAIN_TAG BUILD_RULE_= CONF" Conf\target.txt > Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\= target.txt - -@echo ACTIVE_PLATFORM =3D %PLATFORM_PACKAGE%/PlatformPkgX64.dsc >> Bui= ld\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\target.txt -@echo TARGET =3D %TARGET% >> Bui= ld\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\target.txt -@echo TARGET_ARCH =3D IA32 X64 >> Bui= ld\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\target.txt -@echo TOOL_CHAIN_TAG =3D %TOOL_CHAIN_TAG% >> Bui= ld\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\target.txt -@echo BUILD_RULE_CONF =3D Conf/build_rule.txt >> Bui= ld\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\target.txt -@move /Y Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\target.txt Conf - - - -@echo. -@echo Create BiosIdx64. -@echo. -@if not exist Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\X64 ( - mkdir Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\X64 -) - -@if "%TARGET%" =3D=3D "DEBUG" ( - set BIOS_ID_FILE=3DBiosIdx64D.env - -) else ( - set BIOS_ID_FILE=3DBiosIdx64R.env - -) - - -GenBiosId.exe -i %PLATFORM_PACKAGE%\%BIOS_ID_FILE% -o Build\%PLATFORM_PACK= AGE%\%TARGET%_%TOOL_CHAIN_TAG%\X64\BiosId.bin -@if %ERRORLEVEL% NEQ 0 goto BldFail - -@echo off -echo Copy reference code ASL files. - - -@if /i "/s" =3D=3D "%1" goto BldSilent -@if /i "/s" =3D=3D "%2" goto BldSilent -@if /i "/s" =3D=3D "%3" goto BldSilent -@if /i "/s" =3D=3D "%4" goto BldSilent -@if /i "/s" =3D=3D "%5" goto BldSilent - -build -n %NUMBER_OF_PROCESSORS% -@if %ERRORLEVEL% NEQ 0 goto BldFail - -@If %SCRIPT_ERROR% EQU 1 goto BldFail -@goto BldSuccess - -:BldSilent - -build -n %NUMBER_OF_PROCESSORS% 1>>EDK2.log 2>&1 -@if %ERRORLEVEL% NEQ 0 goto BldFail - - -@If %SCRIPT_ERROR% EQU 1 goto BldFail - -:BldSuccess -@echo off -del Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\FV\VlvX64.beforecon= fig.fd 1>>EDK2.log 2>&1 -del Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\FV\HiiDefaultData.t= xt 1>>EDK2.log 2>&1 -copy /y Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\FV\Vlv.fd B= uild\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\FV\VlvX64.beforeconfig.fd= 1>>EDK2.log 2>&1 - -@echo. -@echo Extract setup default value from VFR (Build\%PLATFORM_PACKAGE%\%TARG= ET%_%TOOL_CHAIN_TAG%\FV\HiiDefaultData.txt) -@echo. -fce read -i Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\FV\VlvX64.b= eforeconfig.fd > Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\FV\HiiD= efaultData.txt - - -@echo Update FD with default Hii value successfully! (both 'Setup' and 'Se= tupDefault') -@echo. -fce mirror -i Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\FV\VlvX64= .beforeconfig.fd -o Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\FV\V= lvX64.fd Setup SetupDefault 1>>EDK2.log 2>&1 - -@echo off -del Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\FV\Vlv.fd -del Vlv2TbltDevicePkg\RomImage\bios.rom -if not exist Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\ROM goto G= en8MImage -del /q /f Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\ROM\* -rd /Q Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\ROM -:Gen8MImage - -copy /b Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\FV\VlvX64.fd Vl= v2TbltDevicePkg\RomImage\bios.rom - -pushd Vlv2TbltDevicePkg\RomImage\ -@if "%TARGET%" =3D=3D "DEBUG" ( - call signbiosX64_debug.bat -) else ( - call signbiosX64_release.bat -) - -call ftoolbuild.bat -call ftoolbuild_sec_enable.bat -popd - -@echo off -mkdir Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\ROM -move Vlv2TbltDevicePkg\RomImage\SPI_Image\* Build\%PLATFORM_PACKAGE%\%TARG= ET%_%TOOL_CHAIN_TAG%\ROM\ > NUL - -call GenBIOS.bat X64 - -@echo on - -@echo TARGET: %TARGET% -@echo TOOL_CHAIN_TAG: %TOOL_CHAIN_TAG% -@echo BIOS location: Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_= TAG%\FV -@echo SPI Images location: Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_= TAG%\ROM -@echo. -@echo The EDKII BIOS build has successfully completed! -@echo. -@goto BldEnd - -:BldFail -@echo. -@echo The EDKII BIOS Build has failed! -@echo. -exit /b 1 - -:BldEnd -@time /t -exit /b 0 diff --git a/Vlv2TbltDevicePkg/bld_vlv.bat b/Vlv2TbltDevicePkg/bld_vlv.bat index c5314833c0..dcc8b1a95a 100644 --- a/Vlv2TbltDevicePkg/bld_vlv.bat +++ b/Vlv2TbltDevicePkg/bld_vlv.bat @@ -1,7 +1,7 @@ @REM @file @REM Windows batch file to build BIOS ROM @REM -@REM Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+@REM Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
@REM SPDX-License-Identifier: BSD-2-Clause-Patent @REM =20 @@ -15,25 +15,60 @@ echo. ::********************************************************************** :: Initial Setup ::********************************************************************** -set WORKSPACE=3D%CD% if %WORKSPACE:~-1%=3D=3D\ set WORKSPACE=3D%WORKSPACE:~0,-1% set /a build_threads=3D1 set "Build_Flags=3D " set exitCode=3D0 set Arch=3DX64 set Source=3D0 -set CORE_PATH=3D%WORKSPACE%\edk2 -set PLATFORM_PATH=3D%WORKSPACE%\edk2 -cd ./edk2 +set PLATFORM_NAME=3DVlv2TbltDevicePkg + +set CORE_PATH=3D%WORKSPACE% +if not exist %CORE_PATH%\edksetup.bat ( + if defined PACKAGES_PATH ( + for %%i IN (%PACKAGES_PATH%) DO ( + if exist %%~fi\edksetup.bat ( + set CORE_PATH=3D%%~fi + goto CorePathFound + ) + ) + ) else ( + echo. + echo !!! ERROR !!! Cannot find edksetup.bat !!! + echo. + goto BldFail + ) +) +:CorePathFound + +set PLATFORM_PACKAGE=3D%WORKSPACE%\%PLATFORM_NAME% +if not exist %PLATFORM_PACKAGE% ( + if defined PACKAGES_PATH ( + for %%i IN (%PACKAGES_PATH%) DO ( + if exist %%~fi\%PLATFORM_NAME% ( + set PLATFORM_PACKAGE=3D%%~fi\%PLATFORM_NAME% + goto PlatformPackageFound + ) + ) + ) else ( + echo. + echo !!! ERROR !!! Cannot find %PLATFORM_NAME% !!! + echo. + goto BldFail + ) +) +:PlatformPackageFound + +cd %CORE_PATH% =20 :: Clean up previous build files. -if exist %CORE_PATH%\edk2.log del %CORE_PATH%\edk2.log -if exist %CORE_PATH%\unitool.log del %CORE_PATH%\unitool.log -if exist %CORE_PATH%\Conf\target.txt del %CORE_PATH%\Conf\target.txt -if exist %CORE_PATH%\Conf\tools_def.txt del %CORE_PATH%\Conf\tools_def.txt -if exist %CORE_PATH%\Conf\build_rule.txt del %CORE_PATH%\Conf\build_rule.t= xt -if exist %CORE_PATH%\Conf\FrameworkDatabase.db del %CORE_PATH%\Conf\Framew= orkDatabase.db -if exist conf\.cache rmdir /q/s conf\.cache +if exist %WORKSPACE%\edk2.log del %WORKSPACE%\edk2.log +if exist %WORKSPACE%\unitool.log del %WORKSPACE%\unitool.log +if exist %WORKSPACE%\Conf\target.txt del %WORKSPACE%\Conf\target.txt +if exist %WORKSPACE%\Conf\tools_def.txt del %WORKSPACE%\Conf\tools_def.txt +if exist %WORKSPACE%\Conf\build_rule.txt del %WORKSPACE%\Conf\build_rule.t= xt +if exist %WORKSPACE%\Conf\FrameworkDatabase.db del %WORKSPACE%\Conf\Framew= orkDatabase.db +if exist %WORKSPACE%\Conf\.cache rmdir /q/s %WORKSPACE%\Conf\.cache =20 :: Setup EDK environment. Edksetup puts new copies of target.txt, tools_de= f.txt, build_rule.txt in WorkSpace\Conf :: Also run edksetup as soon as possible to avoid it from changing environ= ment variables we're overriding @@ -41,8 +76,6 @@ call %CORE_PATH%\edksetup.bat Rebuild @echo off =20 :: Define platform specific environment variables. -set PLATFORM_NAME=3DVlv2TbltDevicePkg -set PLATFORM_PACKAGE=3D%PLATFORM_PATH%\Vlv2TbltDevicePkg set config_file=3D%PLATFORM_PACKAGE%\PlatformPkgConfig.dsc set auto_config_inc=3D%PLATFORM_PACKAGE%\AutoPlatformCFG.txt =20 @@ -82,9 +115,9 @@ if /i "%~1" =3D=3D "/c" ( del /f/s/q build > nul rmdir /s/q build ) - if exist conf\.cache ( - del /f/s/q conf\.cache > nul - rmdir /s/q conf\.cache + if exist %WORKSPACE%\Conf\.cache ( + del /f/s/q %WORKSPACE%\Conf\.cache > nul + rmdir /s/q %WORKSPACE%\Conf\.cache ) echo. shift @@ -107,17 +140,17 @@ if "%~1"=3D=3D"" goto Usage =20 ::Remove the values for Platform_Type and Build_Target from BiosIdX.env an= d stage in Conf\ if "%Arch%"=3D=3D"IA32" ( - findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdR.env > = Conf\BiosId.env + findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdR.env > = %WORKSPACE%\Conf\BiosId.env echo DEFINE X64_CONFIG =3D FALSE >> %auto_config_inc% ) else if "%Arch%"=3D=3D"X64" ( - findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdx64R.env= > Conf\BiosId.env + findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdx64R.env= > %WORKSPACE%\Conf\BiosId.env echo DEFINE X64_CONFIG =3D TRUE >> %auto_config_inc% ) =20 :: -- Build flags settings for each Platform -- echo Setting %1 platform configuration and BIOS ID... if /i "%~1" =3D=3D "MNW2" ( - echo BOARD_ID =3D MNW2MAX >> Conf\BiosId.env + echo BOARD_ID =3D MNW2MAX >> %WORKSPACE%\Conf\BiosId.env echo DEFINE ENBDT_PF_BUILD =3D TRUE >> %auto_config_inc% =20 ) else ( @@ -128,10 +161,10 @@ set Platform_Type=3D%~1 =20 if /i "%~2" =3D=3D "RELEASE" ( set target=3DRELEASE - echo BUILD_TYPE =3D R >> Conf\BiosId.env + echo BUILD_TYPE =3D R >> %WORKSPACE%\Conf\BiosId.env ) else ( set target=3DDEBUG - echo BUILD_TYPE =3D D >> Conf\BiosId.env + echo BUILD_TYPE =3D D >> %WORKSPACE%\Conf\BiosId.env ) =20 ::********************************************************************** @@ -181,43 +214,40 @@ if defined VS140COMNTOOLS ( ) =20 echo Ensuring correct build directory is present for GenBiosId... -set BUILD_PATH=3DBuild\%PLATFORM_NAME%\%TARGET%_%TOOL_CHAIN_TAG% +set BUILD_PATH=3D%WORKSPACE%\Build\%PLATFORM_NAME%\%TARGET%_%TOOL_CHAIN_TA= G% =20 echo Modifing Conf files for this build... :: Remove lines with these tags from target.txt -findstr /V "TARGET TARGET_ARCH TOOL_CHAIN_TAG BUILD_RULE_CONF ACTIVE_P= LATFORM MAX_CONCURRENT_THREAD_NUMBER" Conf\target.txt > Conf\target.txt.tmp +findstr /V "TARGET TARGET_ARCH TOOL_CHAIN_TAG BUILD_RULE_CONF ACTIVE_P= LATFORM MAX_CONCURRENT_THREAD_NUMBER" %WORKSPACE%\Conf\target.txt > %WORKS= PACE%\Conf\target.txt.tmp =20 -echo TARGET =3D %TARGET% >> Conf= \target.txt.tmp +echo TARGET =3D %TARGET% >> %WOR= KSPACE%\Conf\target.txt.tmp if "%Arch%"=3D=3D"IA32" ( - echo TARGET_ARCH =3D IA32 >> Con= f\target.txt.tmp + echo TARGET_ARCH =3D IA32 >> %WO= RKSPACE%\Conf\target.txt.tmp ) else if "%Arch%"=3D=3D"X64" ( - echo TARGET_ARCH =3D IA32 X64 >> Conf= \target.txt.tmp + echo TARGET_ARCH =3D IA32 X64 >> %WOR= KSPACE%\Conf\target.txt.tmp ) -echo TOOL_CHAIN_TAG =3D %TOOL_CHAIN_TAG% = >> Conf\target.txt.tmp -echo BUILD_RULE_CONF =3D Conf/build_rule.txt = >> Conf\target.txt.tmp +echo TOOL_CHAIN_TAG =3D %TOOL_CHAIN_TAG% = >> %WORKSPACE%\Conf\target.txt.tmp +echo BUILD_RULE_CONF =3D Conf/build_rule.txt = >> %WORKSPACE%\Conf\target.txt.tmp if %Source% =3D=3D 0 ( - echo ACTIVE_PLATFORM =3D %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc = >> Conf\target.txt.tmp + echo ACTIVE_PLATFORM =3D %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc = >> %WORKSPACE%\Conf\target.txt.tmp ) else ( - echo ACTIVE_PLATFORM =3D %PLATFORM_PACKAGE%/PlatformPkg%Arch%Source.dsc = >> Conf\target.txt.tmp + echo ACTIVE_PLATFORM =3D %PLATFORM_PACKAGE%/PlatformPkg%Arch%Source.dsc = >> %WORKSPACE%\Conf\target.txt.tmp ) -echo MAX_CONCURRENT_THREAD_NUMBER =3D %build_threads% = >> Conf\target.txt.tmp +echo MAX_CONCURRENT_THREAD_NUMBER =3D %build_threads% = >> %WORKSPACE%\Conf\target.txt.tmp =20 -move /Y Conf\target.txt.tmp Conf\target.txt >nul +move /Y %WORKSPACE%\Conf\target.txt.tmp %WORKSPACE%\Conf\target.txt >nul =20 ::********************************************************************** :: Build BIOS ::********************************************************************** =20 echo Creating BiosId... -pushd %PLATFORM_PACKAGE% -if not exist %WORKSPACE%\%BUILD_PATH%\IA32 mkdir %WORKSPACE%\%BUILD_PATH%= \IA32 - GenBiosId.exe -i %CORE_PATH%\Conf\BiosId.env -o %WORKSPACE%\%BUILD_PATH%= \IA32\BiosId.bin -ob %CORE_PATH%\Conf\BiosId.bat +if not exist %BUILD_PATH%\IA32 mkdir %BUILD_PATH%\IA32 +%PLATFORM_PACKAGE%\GenBiosId.exe -i %WORKSPACE%\Conf\BiosId.env -o %BUILD_= PATH%\IA32\BiosId.bin -ob %WORKSPACE%\Conf\BiosId.bat if "%Arch%"=3D=3D"X64" ( - if not exist %WORKSPACE%\%BUILD_PATH%\X64 mkdir %WORKSPACE%\%BUILD_PAT= H%\X64 - GenBiosId.exe -i %CORE_PATH%\Conf\BiosId.env -o %WORKSPACE%\%BUILD_PATH= %\X64\BiosId.bin -ob %CORE_PATH%\Conf\BiosId.bat + if not exist %BUILD_PATH%\X64 mkdir %BUILD_PATH%\X64 + %PLATFORM_PACKAGE%\GenBiosId.exe -i %WORKSPACE%\Conf\BiosId.env -o %BUI= LD_PATH%\X64\BiosId.bin -ob %WORKSPACE%\Conf\BiosId.bat ) -popd - =20 if %ERRORLEVEL% NEQ 0 goto BldFail =20 @@ -235,23 +265,23 @@ echo Running fce... =20 pushd %PLATFORM_PACKAGE% :: Extract Hii data from build and store in HiiDefaultData.txt -fce read -i %WORKSPACE%\%BUILD_PATH%\FV\Vlv.fd > %WORKSPACE%\%BUILD_PATH%\= FV\HiiDefaultData.txt +%PLATFORM_PACKAGE%\fce read -i %BUILD_PATH%\FV\Vlv.fd > %BUILD_PATH%\FV\Hi= iDefaultData.txt =20 :: save changes to VlvXXX.fd -fce update -i %WORKSPACE%\%BUILD_PATH%\FV\Vlv.fd -s %WORKSPACE%\%BUILD_PAT= H%\FV\HiiDefaultData.txt -o %WORKSPACE%\%BUILD_PATH%\FV\Vlv%Arch%.fd +%PLATFORM_PACKAGE%\fce update -i %BUILD_PATH%\FV\Vlv.fd -s %BUILD_PATH%\FV= \HiiDefaultData.txt -o %BUILD_PATH%\FV\Vlv%Arch%.fd popd =20 if %ERRORLEVEL% NEQ 0 goto BldFail ::echo FD successfully updated with default Hii values. =20 :: Set the Board_Id, Build_Type, Version_Major, and Version_Minor environm= ent variables -find /v "#" Conf\BiosId.env > ver_strings +find /v "#" %WORKSPACE%\Conf\BiosId.env > ver_strings for /f "tokens=3D1,3" %%i in (ver_strings) do set %%i=3D%%j del /f/q ver_strings >nul =20 set BIOS_Name=3D%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MI= NOR%.ROM -copy /y/b %WORKSPACE%\%BUILD_PATH%\FV\Vlv%Arch%.fd %PLATFORM_PATH%\%BIOS_= Name% >nul -copy /y/b %WORKSPACE%\%BUILD_PATH%\FV\Vlv%Arch%.fd %WORKSPACE%\%BUILD_PAT= H%\FV\Vlv.ROM >nul +copy /y/b %BUILD_PATH%\FV\Vlv%Arch%.fd %PLATFORM_PACKAGE%\Stitch\%BIOS_Na= me% >nul +copy /y/b %BUILD_PATH%\FV\Vlv%Arch%.fd %BUILD_PATH%\FV\Vlv.ROM >nul =20 echo. echo Build location: %BUILD_PATH% @@ -261,13 +291,8 @@ echo -------------------- The EDKII BIOS build has suc= cessfully completed. ----- echo. =20 @REM build capsule here -@REMif "%openssl_path%" =3D=3D "" ( -@REM echo -- Error: OPENSSL_PATH not set. Capule and Recovery images = not generated. -@REM set exitCode=3D1 -@REM goto Exit -@REM -@REM echo > %BUILD_PATH%\FV\SYSTEMFIRMWAREUPDATECARGO.Fv -@REM build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc +echo > %BUILD_PATH%\FV\SYSTEMFIRMWAREUPDATECARGO.Fv +build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc =20 goto Exit =20 diff --git a/Vlv2TbltDevicePkg/bld_vlv.sh b/Vlv2TbltDevicePkg/bld_vlv.sh index 51d3acacb4..ec3a325db7 100755 --- a/Vlv2TbltDevicePkg/bld_vlv.sh +++ b/Vlv2TbltDevicePkg/bld_vlv.sh @@ -242,9 +242,8 @@ VERSION_MINOR=3D$(grep '^VERSION_MINOR' Conf/BiosId.env= | cut -d ' ' -f 3 | cut -c BOARD_ID=3D$(grep '^BOARD_ID' Conf/BiosId.env | cut -d ' ' -f 3 | cut -c 1= -7) BIOS_Name=3D"$BOARD_ID"_"$Arch"_"$BUILD_TYPE"_"$VERSION_MAJOR"_"$VERSION_M= INOR".ROM BIOS_ID=3D"$BOARD_ID"_"$Arch"_"$BUILD_TYPE"_"$VERSION_MAJOR"_"$VERSION_MIN= OR"_GCC.bin -cp -f $BUILD_PATH/FV/VLV.fd $WORKSPACE/$BIOS_Name SEC_VERSION=3D1.0.2.1060v5 -cat $IFWI_HEADER_FILE ./Vlv2MiscBinariesPkg/SEC/$SEC_VERSION/VLV_SEC_REGIO= N.bin ./Vlv2MiscBinariesPkg/SEC/$SEC_VERSION/Vacant.bin $BIOS_Name > ./$PLA= TFORM_PACKAGE/Stitch/$BIOS_ID +cat $IFWI_HEADER_FILE ../Vlv2Binaries/Vlv2SocBinPkg/SEC/$SEC_VERSION/VLV_S= EC_REGION.bin ../Vlv2Binaries/Vlv2SocBinPkg/SEC/$SEC_VERSION/Vacant.bin $BU= ILD_PATH/FV/VLV.fd > ./$PLATFORM_PACKAGE/Stitch/$BIOS_ID =20 =20 echo Skip "Running BIOS_Signing ..." --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40258): https://edk2.groups.io/g/devel/message/40258 Mute This Topic: https://groups.io/mt/31551781/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 00:16:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40259+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40259+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557376279; cv=none; d=zoho.com; s=zohoarc; b=N58+YwGNKu6+n7iQFv8z2bx+6omOIoDdOxpnvwAy+s1oqa+ygdtZuJeNkcIj9tvoywp2/43+4lcJUi5jQvdBOnqYbDCSjb4osO4Y+LaeHVgC3RcCzopMODMAY2EdzEX0fCGfWZXFItc8l41LZu4tFNZ6qlTiaBVXJPj10ZdRHR0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557376279; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=ZH9mdrd3eHITZEz/y2ZrXw87yA4ae08ePVK/ddUyiRY=; b=Kgrl/XE3mI3D2z0P3N6mfpChdTr5pgADVgEo9zmtJ9QD9btjNkLGzWp0FxLyvTRNtPvWLbtZBMFsm85ThT7ztM55xLrYsxRfic0M5WDZhe644s68kxB2ExWa8WyFl/qFnYZWBaGUZ8OZ4W4H1Dc96HbSFWul2l06c1HiRr0I98Q= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40259+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557376279837318.2447262961002; Wed, 8 May 2019 21:31:19 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Wed, 08 May 2019 21:31:18 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 May 2019 21:31:17 -0700 X-ExtLoop1: 1 X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.98.74]) by orsmga004.jf.intel.com with ESMTP; 08 May 2019 21:31:17 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian Subject: [edk2-devel] [Patch 13/16] Vlv2TbltDevicePkg/Capsule: Do not clear UEFI varstore Date: Wed, 8 May 2019 21:31:08 -0700 Message-Id: <20190509043111.15272-14-michael.d.kinney@intel.com> In-Reply-To: <20190509043111.15272-1-michael.d.kinney@intel.com> References: <20190509043111.15272-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557376279; bh=JL4tO4h3w++mQCT884OMvWtOgE2GAIvL5L5yyQQsjRM=; h=Cc:Date:From:Reply-To:Subject:To; b=vceQjrsUNdQ3EcAqezdbuA0f5zFDYKJDWoPJD92l2rmcdFF0Gfs06hO2CwlvVyNO9JB dJsrdJ1QmvPq9kI7eMUoKNGcjPEe7sJk1Plj7ek8HYF5+a7TXtiSV1LcUtzgYOq0eaxEI xMwcJlv0jT8qhmlLKGWIhkr05z0/w5xaucU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Preserve the UEFI Variable store when a capsule update is performed. UEFI Variables are used to store firmware version information for the sample devices (Red, Green, Blue). Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Michael D Kinney Reviewed-by: Zailiang Sun --- .../Feature/Capsule/Library/FmpDeviceLib/FmpDeviceLib.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/Library/FmpDeviceLib/FmpDevi= ceLib.c b/Vlv2TbltDevicePkg/Feature/Capsule/Library/FmpDeviceLib/FmpDeviceL= ib.c index 3d5649164b..a863d69381 100644 --- a/Vlv2TbltDevicePkg/Feature/Capsule/Library/FmpDeviceLib/FmpDeviceLib.c +++ b/Vlv2TbltDevicePkg/Feature/Capsule/Library/FmpDeviceLib/FmpDeviceLib.c @@ -1,8 +1,8 @@ /** =20 -Copyright (c) 2016, Microsoft Corporation +Copyright (c) 2016, Microsoft Corporation. All rights reserved. +Copyright (c) 2019, Intel Corporation. All rights reserved. =20 -All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -36,8 +36,7 @@ UPDATE_CONFIG_DATA mUpdateConfigData[] =3D { { PlatformFirmwareTypeSystemFirmware, FlashAddressTypeRelativeAddress, 0= x000C0000, 0x00050000, 0x000C0000 }, { PlatformFirmwareTypeSystemFirmware, FlashAddressTypeRelativeAddress, 0= x00110000, 0x00210000, 0x00110000 }, { PlatformFirmwareTypeSystemFirmware, FlashAddressTypeRelativeAddress, 0= x00320000, 0x00070000, 0x00320000 }, - { PlatformFirmwareTypeSystemFirmware, FlashAddressTypeRelativeAddress, 0= x00390000, 0x00070000, 0x00390000 }, - { PlatformFirmwareTypeNvRam, FlashAddressTypeRelativeAddress, 0= x00040000, 0x00080000, 0x00040000 } + { PlatformFirmwareTypeSystemFirmware, FlashAddressTypeRelativeAddress, 0= x00390000, 0x00070000, 0x00390000 } }; =20 /** --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40259): https://edk2.groups.io/g/devel/message/40259 Mute This Topic: https://groups.io/mt/31551782/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 00:16:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40260+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40260+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557376280; cv=none; d=zoho.com; s=zohoarc; b=eZo7dIOFc79/UzvWRrTILETnFyPHzS13b5Sl7F2ksqnQv4qtWD3OxLds59Bl2RaCgmNuPMZ0uD7LGeiFXJJlmzDWn+f+J9iSk5nFSEujBaetX5oYv6ZBEMNP026pql6M2GrQ4PNXpmZ3/gHRDdWYqk9tEeoQf2GEWyNTT0EsrFM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557376280; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=h27aQnqbuPt3x7L+L0q66v/60rk99RmkAwpebNJlOqI=; b=e21U5OCGlckiRVdxP+xmq8WZu4AbMvoIKoldBJGZpGUWkNjWtL1oOz4MqiW+jzNk0CkKDCGoybZWGqFY8YW2Kns9N3Y0QXsMlMAwXS+GUQ06sIWBTs7oV0virvNjbwVrTlENyRczQpb0tAN85Bx+jXQTd+zG0CUM71jVSJfSfBk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40260+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557376280528501.4423509008768; Wed, 8 May 2019 21:31:20 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Wed, 08 May 2019 21:31:18 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 May 2019 21:31:17 -0700 X-ExtLoop1: 1 X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.98.74]) by orsmga004.jf.intel.com with ESMTP; 08 May 2019 21:31:17 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian Subject: [edk2-devel] [Patch 14/16] Vlv2TbltDevicePkg/Capsule: Remove path to openssl tools Date: Wed, 8 May 2019 21:31:09 -0700 Message-Id: <20190509043111.15272-15-michael.d.kinney@intel.com> In-Reply-To: <20190509043111.15272-1-michael.d.kinney@intel.com> References: <20190509043111.15272-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557376279; bh=LoTN4sMeMXQERatOX+HLm//OyjB0au82ScyXvHNXumQ=; h=Cc:Date:From:Reply-To:Subject:To; b=fD4dBNFaFFudAULHMCsIMFXudOokRL0bLNm5w9zvCokQjRFjpIRnenqObjzsyXzpmBw 1NSVyaF4+X9Js4XPk00/Zhc8gHleUYkqJy2cShl3ct75C5kIv7XMV/Sm/Pfr42An2QQeC 7Z4X5DyhjaTunfYobFMxpofJByt1AJR7nCw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Remove path to openssl tools from batch scripts. Instead, the path to the openssl tools must be included in PATH for a build to complete. Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Michael D Kinney Reviewed-by: Zailiang Sun --- .../Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.bat | 2 -- .../Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.bat | 2 -- .../Feature/Capsule/GenerateCapsule/GenCapsuleSampleColor.bat | 2 -- 3 files changed, 6 deletions(-) diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMi= nnowMax.bat b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleM= innowMax.bat index 80f9be7fb8..50ebb160ee 100644 --- a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax= .bat +++ b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax= .bat @@ -69,7 +69,6 @@ if exist "NewCert.pem" ( --lsv %FMP_CAPSULE_LSV% ^ --capflag PersistAcrossReset ^ --capflag InitiateReset ^ - --signing-tool-path=3Dc:\OpenSSL-Win32\bin ^ --signer-private-cert=3DNewCert.pem ^ --other-public-cert=3DNewSub.pub.pem ^ --trusted-public-cert=3DNewRoot.pub.pem ^ @@ -106,7 +105,6 @@ call GenerateCapsule ^ --lsv %FMP_CAPSULE_LSV% ^ --capflag PersistAcrossReset ^ --capflag InitiateReset ^ - --signing-tool-path=3Dc:\OpenSSL-Win32\bin ^ --signer-private-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Si= gn\TestCert.pem ^ --other-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign= \TestSub.pub.pem ^ --trusted-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Si= gn\TestRoot.pub.pem ^ diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMi= nnowMaxRelease.bat b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC= apsuleMinnowMaxRelease.bat index c6c78f0285..9d08c86717 100644 --- a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax= Release.bat +++ b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax= Release.bat @@ -69,7 +69,6 @@ if exist "NewCert.pem" ( --lsv %FMP_CAPSULE_LSV% ^ --capflag PersistAcrossReset ^ --capflag InitiateReset ^ - --signing-tool-path=3Dc:\OpenSSL-Win32\bin ^ --signer-private-cert=3DNewCert.pem ^ --other-public-cert=3DNewSub.pub.pem ^ --trusted-public-cert=3DNewRoot.pub.pem ^ @@ -106,7 +105,6 @@ call GenerateCapsule ^ --lsv %FMP_CAPSULE_LSV% ^ --capflag PersistAcrossReset ^ --capflag InitiateReset ^ - --signing-tool-path=3Dc:\OpenSSL-Win32\bin ^ --signer-private-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Si= gn\TestCert.pem ^ --other-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign= \TestSub.pub.pem ^ --trusted-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Si= gn\TestRoot.pub.pem ^ diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleSa= mpleColor.bat b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsul= eSampleColor.bat index ba4bc0f081..3e9f94c530 100644 --- a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleSampleCol= or.bat +++ b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleSampleCol= or.bat @@ -73,7 +73,6 @@ if exist "NewCert.pem" ( --lsv %FMP_CAPSULE_LSV% ^ --capflag PersistAcrossReset ^ --capflag InitiateReset ^ - --signing-tool-path=3Dc:\OpenSSL-Win32\bin ^ --signer-private-cert=3DNewCert.pem ^ --other-public-cert=3DNewSub.pub.pem ^ --trusted-public-cert=3DNewRoot.pub.pem ^ @@ -110,7 +109,6 @@ call GenerateCapsule ^ --lsv %FMP_CAPSULE_LSV% ^ --capflag PersistAcrossReset ^ --capflag InitiateReset ^ - --signing-tool-path=3Dc:\OpenSSL-Win32\bin ^ --signer-private-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Si= gn\TestCert.pem ^ --other-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign= \TestSub.pub.pem ^ --trusted-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Si= gn\TestRoot.pub.pem ^ --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40260): https://edk2.groups.io/g/devel/message/40260 Mute This Topic: https://groups.io/mt/31551783/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 00:16:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40261+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40261+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557376280; cv=none; d=zoho.com; s=zohoarc; b=ffvvDzSTmQx7eRxFZqFe+3eJ/9c6t9Ar4FwOoFtdimiLLFxOYwqGixcDJ6Prem1KGeqbQwtTaVXBH4oyBMVzqABBGaSL2haUNSDWNEz2vQzuEjJM4+8l8pS4/zqbclvjogDxiOAbsPshzQu1V2lVfqSpVAR61drwR9NmzgGTYKo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557376280; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=FEYXi6sg75zfUmgj8HSgSmRV8FbwkYnD3VHc0f17ZfM=; b=nvw39BVE1fK1vaIDVoORKpYiLR59UBtXbqU2e9CaJECJK1iaT2LPe7N963Qv4AsaZAObdqPyvdbQISYnT+/L3pWVba11JnA5yrPjedd0B7Rv1fsoosLKzxUMCUOBDM3YblPZ3XDxMhppyQFYlto2syhiKHFo9kXs5heVSfXu2OE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40261+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557376280557600.0893908609315; Wed, 8 May 2019 21:31:20 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by groups.io with SMTP; Wed, 08 May 2019 21:31:18 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 May 2019 21:31:17 -0700 X-ExtLoop1: 1 X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.98.74]) by orsmga004.jf.intel.com with ESMTP; 08 May 2019 21:31:17 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian Subject: [edk2-devel] [Patch 15/16] Vlv2TbltDevicePkg/Capsule: Add Linux/LVFS generation scripts Date: Wed, 8 May 2019 21:31:10 -0700 Message-Id: <20190509043111.15272-16-michael.d.kinney@intel.com> In-Reply-To: <20190509043111.15272-1-michael.d.kinney@intel.com> References: <20190509043111.15272-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557376280; bh=SHRyPUXg+tiwHW4JDEV+rKpoq6wcjO1PY/7rERB/fgk=; h=Cc:Date:From:Reply-To:Subject:To; b=eW+VWFnRjIv5gZW95Tvl9xJP+V0Aq2dl6Rqqf9LcNhqx9cYye3Wl0rnsZp3kvRm31rT jHLPwnBK0xIT0FXhZpgr1a6JNyulyH6p8YNEO/7QOACJF7Fxc7JeKTwlLdy89/FRN+oEP ZhhobO2QXJ+LUMHIK9jNUmMSTm92sFtC27U= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Add batch scripts to generate the LVFS compatible capsule update driver. Add DSC/FDF files to build capsules and invoke post build shell scripts for Linux build environments. Make versions consistent. Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Michael D Kinney Reviewed-by: Zailiang Sun --- .../Capsule/GenerateCapsule/GenCapsuleAll.bat | 12 +- .../Capsule/GenerateCapsule/GenCapsuleAll.sh | 28 ++++ .../GenerateCapsule/GenCapsuleMinnowMax.bat | 4 +- .../GenerateCapsule/GenCapsuleMinnowMax.sh | 65 ++++++++ .../GenCapsuleMinnowMaxRelease.bat | 4 +- .../GenCapsuleMinnowMaxRelease.sh | 65 ++++++++ .../GenerateCapsule/GenCapsuleSampleColor.sh | 70 +++++++++ .../Feature/Capsule/GenerateCapsule/Lvfs.ddf | 14 ++ .../LvfsGenCapsuleMinnowMax.bat | 139 +++++++++++++++++ .../LvfsGenCapsuleMinnowMaxRelease.bat | 139 +++++++++++++++++ .../LvfsGenCapsuleSampleColor.bat | 145 ++++++++++++++++++ .../GenerateCapsule/template.metainfo.xml | 27 ++++ Vlv2TbltDevicePkg/PlatformCapsuleGcc.dsc | 38 +++++ 13 files changed, 743 insertions(+), 7 deletions(-) create mode 100644 Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCa= psuleAll.sh create mode 100644 Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCa= psuleMinnowMax.sh create mode 100644 Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCa= psuleMinnowMaxRelease.sh create mode 100644 Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCa= psuleSampleColor.sh create mode 100644 Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Lvfs.= ddf create mode 100644 Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsG= enCapsuleMinnowMax.bat create mode 100644 Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsG= enCapsuleMinnowMaxRelease.bat create mode 100644 Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsG= enCapsuleSampleColor.bat create mode 100644 Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/templ= ate.metainfo.xml create mode 100644 Vlv2TbltDevicePkg/PlatformCapsuleGcc.dsc diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAl= l.bat b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.bat index 187797e284..8f589565fa 100644 --- a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.bat +++ b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.bat @@ -24,6 +24,12 @@ copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\RELEASE_VS2015x= 86\X64\CapsuleApp.efi %W =20 call GenCapsuleMinnowMax.bat call GenCapsuleMinnowMaxRelease.bat -call GenCapsuleSampleColor.bat Blue 149DA854-7D19-4FAA-A91E-862EA1324BE6 -call GenCapsuleSampleColor.bat Green 79179BFD-704D-4C90-9E02-0AB8D968C18A -call GenCapsuleSampleColor.bat Red 72E2945A-00DA-448E-9AA7-075AD840F9D4 +call GenCapsuleSampleColor.bat Blue 149da854-7d19-4faa-a91e-862ea1324be6 +call GenCapsuleSampleColor.bat Green 79179bfd-704d-4c90-9e02-0ab8d968c18a +call GenCapsuleSampleColor.bat Red 72e2945a-00da-448e-9aa7-075ad840f9d4 + +call LvfsGenCapsuleMinnowMax.bat +call LvfsGenCapsuleMinnowMaxRelease.bat +call LvfsGenCapsuleSampleColor.bat Blue 149da854-7d19-4faa-a91e-862ea1324= be6 +call LvfsGenCapsuleSampleColor.bat Green 79179bfd-704d-4c90-9e02-0ab8d968c= 18a +call LvfsGenCapsuleSampleColor.bat Red 72e2945a-00da-448e-9aa7-075ad840f= 9d4 diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAl= l.sh b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh new file mode 100644 index 0000000000..040024553a --- /dev/null +++ b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh @@ -0,0 +1,28 @@ +# @file +# Linux script file to generate UEFI capsules for system firmware and +# firmware for sample devices +# +# Copyright (c) 2018, Intel Corporation. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# + +cd $(dirname $0) + +rm -R $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules +mkdir $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules +mkdir $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/SampleDevelopment +mkdir $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert +mkdir $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert +cp $WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_GCC49/X64/CapsuleApp.efi $WORK= SPACE/Build/Vlv2TbltDevicePkg/Capsules/SampleDevelopment/CapsuleApp.efi +cp $WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_GCC49/X64/CapsuleApp.efi $WO= RKSPACE/Build/Vlv2TbltDevicePkg/Capsules/SampleDevelopment/CapsuleAppReleas= e.efi +cp $WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_GCC49/X64/CapsuleApp.efi $WORK= SPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert/CapsuleApp.efi +cp $WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_GCC49/X64/CapsuleApp.efi $WO= RKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert/CapsuleAppRelease.efi +cp $WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_GCC49/X64/CapsuleApp.efi $WORK= SPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert/CapsuleApp.efi +cp $WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_GCC49/X64/CapsuleApp.efi $WO= RKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert/CapsuleAppRelease.efi + +. GenCapsuleMinnowMax.sh +. GenCapsuleMinnowMaxRelease.sh +. GenCapsuleSampleColor.sh Blue 149DA854-7D19-4FAA-A91E-862EA1324BE6 +. GenCapsuleSampleColor.sh Green 79179BFD-704D-4C90-9E02-0AB8D968C18A +. GenCapsuleSampleColor.sh Red 72E2945A-00DA-448E-9AA7-075AD840F9D4 diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMi= nnowMax.bat b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleM= innowMax.bat index 50ebb160ee..6e4afd201e 100644 --- a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax= .bat +++ b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax= .bat @@ -11,8 +11,8 @@ setlocal set FMP_CAPSULE_VENDOR=3DIntel set FMP_CAPSULE_GUID=3D4096267B-DA0A-42EB-B5EB-FEF31D207CB4 set FMP_CAPSULE_FILE=3DMinnowMax.cap -set FMP_CAPSULE_VERSION=3D0x00000009 -set FMP_CAPSULE_STRING=3D0.0.0.9 +set FMP_CAPSULE_VERSION=3D0x0000000C +set FMP_CAPSULE_STRING=3D0.0.0.12 set FMP_CAPSULE_NAME=3D"Intel MinnowMax DEBUG UEFI %FMP_CAPSULE_STRING%" set FMP_CAPSULE_LSV=3D0x00000000 set FMP_CAPSULE_KEY=3DSAMPLE_DEVELOPMENT.pfx diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMi= nnowMax.sh b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMi= nnowMax.sh new file mode 100644 index 0000000000..4fb963c93c --- /dev/null +++ b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax= .sh @@ -0,0 +1,65 @@ +# @file +# Linux script file to generate UEFI capsules for system firmware +# +# Copyright (c) 2018, Intel Corporation. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# + +FMP_CAPSULE_VENDOR=3DIntel +FMP_CAPSULE_GUID=3D4096267B-DA0A-42EB-B5EB-FEF31D207CB4 +FMP_CAPSULE_FILE=3DMinnowMax.cap +FMP_CAPSULE_VERSION=3D0x0000000C +FMP_CAPSULE_STRING=3D0.0.0.12 +FMP_CAPSULE_NAME=3D"Intel MinnowMax DEBUG UEFI $FMP_CAPSULE_STRING" +FMP_CAPSULE_LSV=3D0x00000000 +FMP_CAPSULE_PAYLOAD=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_GCC49/FV/Vl= v.ROM + +if [ ! -e "$FMP_CAPSULE_PAYLOAD" ] ; then + return +fi + +if [ -e NewCert.pem ]; then + # + # Sign capsule using OpenSSL with a new certificate + # + GenerateCapsule \ + --encode \ + -v \ + --guid $FMP_CAPSULE_GUID \ + --fw-version $FMP_CAPSULE_VERSION \ + --lsv $FMP_CAPSULE_LSV \ + --capflag PersistAcrossReset \ + --capflag InitiateReset \ + --signer-private-cert=3DNewCert.pem \ + --other-public-cert=3DNewSub.pub.pem \ + --trusted-public-cert=3DNewRoot.pub.pem \ + -o $FMP_CAPSULE_FILE \ + $FMP_CAPSULE_PAYLOAD + + cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert + + rm $FMP_CAPSULE_FILE +fi + +# +# Sign capsule using OpenSSL with EDK II Test Certificate +# +GenerateCapsule \ + --encode \ + -v \ + --guid $FMP_CAPSULE_GUID \ + --fw-version $FMP_CAPSULE_VERSION \ + --lsv $FMP_CAPSULE_LSV \ + --capflag PersistAcrossReset \ + --capflag InitiateReset \ + --signer-private-cert=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sig= n/TestCert.pem \ + --other-public-cert=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/= TestSub.pub.pem \ + --trusted-public-cert=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sig= n/TestRoot.pub.pem \ + -o $FMP_CAPSULE_FILE \ + $FMP_CAPSULE_PAYLOAD + +cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert + +rm $FMP_CAPSULE_FILE + diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMi= nnowMaxRelease.bat b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC= apsuleMinnowMaxRelease.bat index 9d08c86717..43c609e4b2 100644 --- a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax= Release.bat +++ b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax= Release.bat @@ -11,8 +11,8 @@ setlocal set FMP_CAPSULE_VENDOR=3DIntel set FMP_CAPSULE_GUID=3D4096267B-DA0A-42EB-B5EB-FEF31D207CB4 set FMP_CAPSULE_FILE=3DMinnowMaxRelease.cap -set FMP_CAPSULE_VERSION=3D0x00000009 -set FMP_CAPSULE_STRING=3D0.0.0.9 +set FMP_CAPSULE_VERSION=3D0x0000000C +set FMP_CAPSULE_STRING=3D0.0.0.12 set FMP_CAPSULE_NAME=3D"Intel MinnowMax RELEASE UEFI %FMP_CAPSULE_STRING%" set FMP_CAPSULE_LSV=3D0x00000000 set FMP_CAPSULE_KEY=3DSAMPLE_DEVELOPMENT.pfx diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMi= nnowMaxRelease.sh b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCa= psuleMinnowMaxRelease.sh new file mode 100644 index 0000000000..29d46dad1e --- /dev/null +++ b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax= Release.sh @@ -0,0 +1,65 @@ +# @file +# Linux script file to generate UEFI capsules for system firmware +# +# Copyright (c) 2018, Intel Corporation. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# + +FMP_CAPSULE_VENDOR=3DIntel +FMP_CAPSULE_GUID=3D4096267B-DA0A-42EB-B5EB-FEF31D207CB4 +FMP_CAPSULE_FILE=3DMinnowMaxRelease.cap +FMP_CAPSULE_VERSION=3D0x0000000C +FMP_CAPSULE_STRING=3D0.0.0.12 +FMP_CAPSULE_NAME=3D"Intel MinnowMax RELEASE UEFI $FMP_CAPSULE_STRING" +FMP_CAPSULE_LSV=3D0x00000000 +FMP_CAPSULE_PAYLOAD=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_GCC49/FV/= Vlv.ROM + +if [ ! -e "$FMP_CAPSULE_PAYLOAD" ] ; then + return +fi + +if [ -e NewCert.pem ]; then + # + # Sign capsule using OpenSSL with a new certificate + # + GenerateCapsule \ + --encode \ + -v \ + --guid $FMP_CAPSULE_GUID \ + --fw-version $FMP_CAPSULE_VERSION \ + --lsv $FMP_CAPSULE_LSV \ + --capflag PersistAcrossReset \ + --capflag InitiateReset \ + --signer-private-cert=3DNewCert.pem \ + --other-public-cert=3DNewSub.pub.pem \ + --trusted-public-cert=3DNewRoot.pub.pem \ + -o $FMP_CAPSULE_FILE \ + $FMP_CAPSULE_PAYLOAD + + cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert + + rm $FMP_CAPSULE_FILE +fi + +# +# Sign capsule using OpenSSL with EDK II Test Certificate +# +GenerateCapsule \ + --encode \ + -v \ + --guid $FMP_CAPSULE_GUID \ + --fw-version $FMP_CAPSULE_VERSION \ + --lsv $FMP_CAPSULE_LSV \ + --capflag PersistAcrossReset \ + --capflag InitiateReset \ + --signer-private-cert=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sig= n/TestCert.pem \ + --other-public-cert=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/= TestSub.pub.pem \ + --trusted-public-cert=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sig= n/TestRoot.pub.pem \ + -o $FMP_CAPSULE_FILE \ + $FMP_CAPSULE_PAYLOAD + +cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert + +rm $FMP_CAPSULE_FILE + diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleSa= mpleColor.sh b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsule= SampleColor.sh new file mode 100644 index 0000000000..a1c6f28cde --- /dev/null +++ b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleSampleCol= or.sh @@ -0,0 +1,70 @@ +# @file +# Linux script file to generate UEFI capsules for a sample device +# +# Copyright (c) 2018, Intel Corporation. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# + +COLOR=3D$1 + +FMP_CAPSULE_VENDOR=3DIntel +FMP_CAPSULE_GUID=3D$2 +FMP_CAPSULE_FILE=3D$COLOR.cap +FMP_CAPSULE_VERSION=3D0x00000010 +FMP_CAPSULE_STRING=3D0.0.0.16 +FMP_CAPSULE_NAME=3D"$COLOR Progress Bar $FMP_CAPSULE_STRING" +FMP_CAPSULE_LSV=3D0x00000000 +FMP_CAPSULE_PAYLOAD=3DPayload.bin + +echo "$COLOR Progress Bar" > $FMP_CAPSULE_PAYLOAD + +if [ ! -e "$FMP_CAPSULE_PAYLOAD" ] ; then + return +fi + +if [ -e NewCert.pem ]; then + # + # Sign capsule using OpenSSL with a new certificate + # + GenerateCapsule \ + --encode \ + -v \ + --guid $FMP_CAPSULE_GUID \ + --fw-version $FMP_CAPSULE_VERSION \ + --lsv $FMP_CAPSULE_LSV \ + --capflag PersistAcrossReset \ + --capflag InitiateReset \ + --signer-private-cert=3DNewCert.pem \ + --other-public-cert=3DNewSub.pub.pem \ + --trusted-public-cert=3DNewRoot.pub.pem \ + -o $FMP_CAPSULE_FILE \ + $FMP_CAPSULE_PAYLOAD + + cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert + + rm $FMP_CAPSULE_FILE +fi + +# +# Sign capsule using OpenSSL with EDK II Test Certificate +# +GenerateCapsule \ + --encode \ + -v \ + --guid $FMP_CAPSULE_GUID \ + --fw-version $FMP_CAPSULE_VERSION \ + --lsv $FMP_CAPSULE_LSV \ + --capflag PersistAcrossReset \ + --capflag InitiateReset \ + --signer-private-cert=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sig= n/TestCert.pem \ + --other-public-cert=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/= TestSub.pub.pem \ + --trusted-public-cert=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sig= n/TestRoot.pub.pem \ + -o $FMP_CAPSULE_FILE \ + $FMP_CAPSULE_PAYLOAD + +cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert + +rm $FMP_CAPSULE_FILE + +rm $FMP_CAPSULE_PAYLOAD diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Lvfs.ddf b/V= lv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Lvfs.ddf new file mode 100644 index 0000000000..f2c925a6dd --- /dev/null +++ b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Lvfs.ddf @@ -0,0 +1,14 @@ +.OPTION EXPLICIT ; Generate errors on variable typos + +.Set CabinetNameTemplate=3Dfirmware.cab ; The name of the file +.set DiskDirectoryTemplate=3DCDROM ; All cabinets go in a single directory +.Set Cabinet=3Don ; +.Set Compress=3Don ; +.Set DiskDirectory1=3D. +.Set MaxDiskSize=3D99999744 ; multiple of 512 + +;*** Files to zip ; +; +firmware.bin +firmware.metainfo.xml +;*** diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsGenCapsu= leMinnowMax.bat b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsGen= CapsuleMinnowMax.bat new file mode 100644 index 0000000000..dd8274a1cc --- /dev/null +++ b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsGenCapsuleMinno= wMax.bat @@ -0,0 +1,139 @@ +@REM @file +@REM Windows batch file to generate UEFI capsules for system firmware +@REM +@REM Copyright (c) 2018, Intel Corporation. All rights reserved.
+@REM +@REM SPDX-License-Identifier: BSD-2-Clause-Patent +@REM + +@echo off +setlocal + +set FMP_CAPSULE_VENDOR=3DIntel +set FMP_CAPSULE_GUID=3D4096267b-da0a-42eb-b5eb-fef31d207cb4 +set FMP_CAPSULE_BASE_NAME=3DMinnowMax +set FMP_CAPSULE_FILE=3D%FMP_CAPSULE_BASE_NAME%.cap +set FMP_CAPSULE_VERSION=3D0x0000000C +set FMP_CAPSULE_VERSION_DECIMAL=3D12 +set FMP_CAPSULE_STRING=3D0.0.0.12 +set FMP_CAPSULE_NAME=3D"Intel %FMP_CAPSULE_BASE_NAME% DEBUG UEFI %FMP_CAPS= ULE_STRING%" +set FMP_CAPSULE_LSV=3D0x00000000 +set FMP_CAPSULE_KEY=3DSAMPLE_DEVELOPMENT.pfx +set FMP_CAPSULE_PAYLOAD=3D%WORKSPACE%\Build\Vlv2TbltDevicePkg\DEBUG_VS2015= x86\FV\Vlv.ROM +set WINDOWS_CAPSULE_KEY=3DSAMPLE_DEVELOPMENT.pfx + +if not exist "%FMP_CAPSULE_PAYLOAD%" exit /b + +if exist "%FMP_CAPSULE_KEY%" ( + REM + REM Sign capsule using signtool + REM + call GenerateCapsule ^ + --encode ^ + -v ^ + --guid %FMP_CAPSULE_GUID% ^ + --fw-version %FMP_CAPSULE_VERSION% ^ + --lsv %FMP_CAPSULE_LSV% ^ + --capflag PersistAcrossReset ^ + --capflag InitiateReset ^ + --signing-tool-path=3D"c:\Program Files (x86)\Windows Kits\8.1\bin\x86= " ^ + --pfx-file %FMP_CAPSULE_KEY% ^ + -o %FMP_CAPSULE_FILE% ^ + %FMP_CAPSULE_PAYLOAD% + + copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\Sam= pleDevelopment + + copy %FMP_CAPSULE_FILE% firmware.bin + copy template.metainfo.xml firmware.metainfo.xml + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_GU= ID', '%FMP_CAPSULE_GUID%' | Out-File firmware.metainfo.xml -encoding ASCII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_BA= SE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File firmware.metainfo.xml -encod= ing ASCII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_VE= RSION_DECIMAL', '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metainf= o.xml -encoding ASCII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_ST= RING', '%FMP_CAPSULE_STRING%' | Out-File firmware.metainfo.xml -encoding AS= CII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_DA= TE', '%date%' | Out-File firmware.metainfo.xml -encoding ASCII" + makecab /f Lvfs.ddf + copy firmware.cab %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert\= %FMP_CAPSULE_BASE_NAME%-%FMP_CAPSULE_STRING%.cab + + erase firmware.cab + erase setup.inf + erase setup.rpt + + erase firmware.metainfo.xml + erase firmware.bin + erase %FMP_CAPSULE_FILE% +) + +if exist "NewCert.pem" ( + REM + REM Sign capsule using OpenSSL with a new certificate + REM + call GenerateCapsule ^ + --encode ^ + -v ^ + --guid %FMP_CAPSULE_GUID% ^ + --fw-version %FMP_CAPSULE_VERSION% ^ + --lsv %FMP_CAPSULE_LSV% ^ + --capflag PersistAcrossReset ^ + --capflag InitiateReset ^ + --signer-private-cert=3DNewCert.pem ^ + --other-public-cert=3DNewSub.pub.pem ^ + --trusted-public-cert=3DNewRoot.pub.pem ^ + -o %FMP_CAPSULE_FILE% ^ + %FMP_CAPSULE_PAYLOAD% + + copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\New= Cert + + copy %FMP_CAPSULE_FILE% firmware.bin + copy template.metainfo.xml firmware.metainfo.xml + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_GU= ID', '%FMP_CAPSULE_GUID%' | Out-File firmware.metainfo.xml -encoding ASCII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_BA= SE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File firmware.metainfo.xml -encod= ing ASCII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_VE= RSION_DECIMAL', '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metainf= o.xml -encoding ASCII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_ST= RING', '%FMP_CAPSULE_STRING%' | Out-File firmware.metainfo.xml -encoding AS= CII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_DA= TE', '%date%' | Out-File firmware.metainfo.xml -encoding ASCII" + makecab /f Lvfs.ddf + copy firmware.cab %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert\= %FMP_CAPSULE_BASE_NAME%-%FMP_CAPSULE_STRING%.cab + + erase firmware.cab + erase setup.inf + erase setup.rpt + + erase firmware.metainfo.xml + erase firmware.bin + erase %FMP_CAPSULE_FILE% +) + +REM +REM Sign capsule using OpenSSL with EDK II Test Certificate +REM +call GenerateCapsule ^ + --encode ^ + -v ^ + --guid %FMP_CAPSULE_GUID% ^ + --fw-version %FMP_CAPSULE_VERSION% ^ + --lsv %FMP_CAPSULE_LSV% ^ + --capflag PersistAcrossReset ^ + --capflag InitiateReset ^ + --signer-private-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Si= gn\TestCert.pem ^ + --other-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign= \TestSub.pub.pem ^ + --trusted-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Si= gn\TestRoot.pub.pem ^ + -o %FMP_CAPSULE_FILE% ^ + %FMP_CAPSULE_PAYLOAD% + +copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestC= ert + +copy %FMP_CAPSULE_FILE% firmware.bin +copy template.metainfo.xml firmware.metainfo.xml +powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_GUID= ', '%FMP_CAPSULE_GUID%' | Out-File firmware.metainfo.xml -encoding ASCII" +powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_BASE= _NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File firmware.metainfo.xml -encodin= g ASCII" +powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_VERS= ION_DECIMAL', '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metainfo.= xml -encoding ASCII" +powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_STRI= NG', '%FMP_CAPSULE_STRING%' | Out-File firmware.metainfo.xml -encoding ASCI= I" +powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_DATE= ', '%date%' | Out-File firmware.metainfo.xml -encoding ASCII" +makecab /f Lvfs.ddf +copy firmware.cab %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert\%F= MP_CAPSULE_BASE_NAME%-%FMP_CAPSULE_STRING%.cab + +erase firmware.cab +erase setup.inf +erase setup.rpt + +erase firmware.metainfo.xml +erase firmware.bin +erase %FMP_CAPSULE_FILE% diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsGenCapsu= leMinnowMaxRelease.bat b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/= LvfsGenCapsuleMinnowMaxRelease.bat new file mode 100644 index 0000000000..2b68a98f98 --- /dev/null +++ b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsGenCapsuleMinno= wMaxRelease.bat @@ -0,0 +1,139 @@ +@REM @file +@REM Windows batch file to generate UEFI capsules for system firmware +@REM +@REM Copyright (c) 2018, Intel Corporation. All rights reserved.
+@REM +@REM SPDX-License-Identifier: BSD-2-Clause-Patent +@REM + +@echo off +setlocal + +set FMP_CAPSULE_VENDOR=3DIntel +set FMP_CAPSULE_GUID=3D4096267b-da0a-42eb-b5eb-fef31d207cb4 +set FMP_CAPSULE_BASE_NAME=3DMinnowMaxRelease +set FMP_CAPSULE_FILE=3D%FMP_CAPSULE_BASE_NAME%.cap +set FMP_CAPSULE_VERSION=3D0x0000000C +set FMP_CAPSULE_VERSION_DECIMAL=3D12 +set FMP_CAPSULE_STRING=3D0.0.0.12 +set FMP_CAPSULE_NAME=3D"Intel %FMP_CAPSULE_BASE_NAME% RELEASE UEFI %FMP_CA= PSULE_STRING%" +set FMP_CAPSULE_LSV=3D0x00000000 +set FMP_CAPSULE_KEY=3DSAMPLE_DEVELOPMENT.pfx +set FMP_CAPSULE_PAYLOAD=3D%WORKSPACE%\Build\Vlv2TbltDevicePkg\RELEASE_VS20= 15x86\FV\Vlv.ROM +set WINDOWS_CAPSULE_KEY=3DSAMPLE_DEVELOPMENT.pfx + +if not exist "%FMP_CAPSULE_PAYLOAD%" exit /b + +if exist "%FMP_CAPSULE_KEY%" ( + REM + REM Sign capsule using signtool + REM + call GenerateCapsule ^ + --encode ^ + -v ^ + --guid %FMP_CAPSULE_GUID% ^ + --fw-version %FMP_CAPSULE_VERSION% ^ + --lsv %FMP_CAPSULE_LSV% ^ + --capflag PersistAcrossReset ^ + --capflag InitiateReset ^ + --signing-tool-path=3D"c:\Program Files (x86)\Windows Kits\8.1\bin\x86= " ^ + --pfx-file %FMP_CAPSULE_KEY% ^ + -o %FMP_CAPSULE_FILE% ^ + %FMP_CAPSULE_PAYLOAD% + + copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\Sam= pleDevelopment + + copy %FMP_CAPSULE_FILE% firmware.bin + copy template.metainfo.xml firmware.metainfo.xml + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_GU= ID', '%FMP_CAPSULE_GUID%' | Out-File firmware.metainfo.xml -encoding ASCII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_BA= SE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File firmware.metainfo.xml -encod= ing ASCII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_VE= RSION_DECIMAL', '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metainf= o.xml -encoding ASCII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_ST= RING', '%FMP_CAPSULE_STRING%' | Out-File firmware.metainfo.xml -encoding AS= CII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_DA= TE', '%date%' | Out-File firmware.metainfo.xml -encoding ASCII" + makecab /f Lvfs.ddf + copy firmware.cab %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert\= %FMP_CAPSULE_BASE_NAME%-%FMP_CAPSULE_STRING%.cab + + erase firmware.cab + erase setup.inf + erase setup.rpt + + erase firmware.metainfo.xml + erase firmware.bin + erase %FMP_CAPSULE_FILE% +) + +if exist "NewCert.pem" ( + REM + REM Sign capsule using OpenSSL with a new certificate + REM + call GenerateCapsule ^ + --encode ^ + -v ^ + --guid %FMP_CAPSULE_GUID% ^ + --fw-version %FMP_CAPSULE_VERSION% ^ + --lsv %FMP_CAPSULE_LSV% ^ + --capflag PersistAcrossReset ^ + --capflag InitiateReset ^ + --signer-private-cert=3DNewCert.pem ^ + --other-public-cert=3DNewSub.pub.pem ^ + --trusted-public-cert=3DNewRoot.pub.pem ^ + -o %FMP_CAPSULE_FILE% ^ + %FMP_CAPSULE_PAYLOAD% + + copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\New= Cert + + copy %FMP_CAPSULE_FILE% firmware.bin + copy template.metainfo.xml firmware.metainfo.xml + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_GU= ID', '%FMP_CAPSULE_GUID%' | Out-File firmware.metainfo.xml -encoding ASCII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_BA= SE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File firmware.metainfo.xml -encod= ing ASCII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_VE= RSION_DECIMAL', '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metainf= o.xml -encoding ASCII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_ST= RING', '%FMP_CAPSULE_STRING%' | Out-File firmware.metainfo.xml -encoding AS= CII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_DA= TE', '%date%' | Out-File firmware.metainfo.xml -encoding ASCII" + makecab /f Lvfs.ddf + copy firmware.cab %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert\= %FMP_CAPSULE_BASE_NAME%-%FMP_CAPSULE_STRING%.cab + + erase firmware.cab + erase setup.inf + erase setup.rpt + + erase firmware.metainfo.xml + erase firmware.bin + erase %FMP_CAPSULE_FILE% +) + +REM +REM Sign capsule using OpenSSL with EDK II Test Certificate +REM +call GenerateCapsule ^ + --encode ^ + -v ^ + --guid %FMP_CAPSULE_GUID% ^ + --fw-version %FMP_CAPSULE_VERSION% ^ + --lsv %FMP_CAPSULE_LSV% ^ + --capflag PersistAcrossReset ^ + --capflag InitiateReset ^ + --signer-private-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Si= gn\TestCert.pem ^ + --other-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign= \TestSub.pub.pem ^ + --trusted-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Si= gn\TestRoot.pub.pem ^ + -o %FMP_CAPSULE_FILE% ^ + %FMP_CAPSULE_PAYLOAD% + +copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestC= ert + +copy %FMP_CAPSULE_FILE% firmware.bin +copy template.metainfo.xml firmware.metainfo.xml +powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_GUID= ', '%FMP_CAPSULE_GUID%' | Out-File firmware.metainfo.xml -encoding ASCII" +powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_BASE= _NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File firmware.metainfo.xml -encodin= g ASCII" +powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_VERS= ION_DECIMAL', '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metainfo.= xml -encoding ASCII" +powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_STRI= NG', '%FMP_CAPSULE_STRING%' | Out-File firmware.metainfo.xml -encoding ASCI= I" +powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_DATE= ', '%date%' | Out-File firmware.metainfo.xml -encoding ASCII" +makecab /f Lvfs.ddf +copy firmware.cab %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert\%F= MP_CAPSULE_BASE_NAME%-%FMP_CAPSULE_STRING%.cab + +erase firmware.cab +erase setup.inf +erase setup.rpt + +erase firmware.metainfo.xml +erase firmware.bin +erase %FMP_CAPSULE_FILE% diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsGenCapsu= leSampleColor.bat b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsG= enCapsuleSampleColor.bat new file mode 100644 index 0000000000..1dbbe7341d --- /dev/null +++ b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsGenCapsuleSampl= eColor.bat @@ -0,0 +1,145 @@ +@REM @file +@REM Windows batch file to generate UEFI capsules for a sample device +@REM +@REM Copyright (c) 2018, Intel Corporation. All rights reserved.
+@REM +@REM SPDX-License-Identifier: BSD-2-Clause-Patent +@REM + +@echo off +setlocal + +set COLOR=3D%1 + +set FMP_CAPSULE_VENDOR=3DIntel +set FMP_CAPSULE_GUID=3D%2 +set FMP_CAPSULE_BASE_NAME=3D%COLOR% +set FMP_CAPSULE_FILE=3D%FMP_CAPSULE_BASE_NAME%.cap +set FMP_CAPSULE_VERSION=3D0x00000010 +set FMP_CAPSULE_VERSION_DECIMAL=3D16 +set FMP_CAPSULE_STRING=3D0.0.0.16 +set FMP_CAPSULE_NAME=3D"%FMP_CAPSULE_BASE_NAME% Progress Bar %FMP_CAPSULE_= STRING%" +set FMP_CAPSULE_LSV=3D0x00000000 +set FMP_CAPSULE_KEY=3DSAMPLE_DEVELOPMENT.pfx +set FMP_CAPSULE_PAYLOAD=3DPayload.bin +set WINDOWS_CAPSULE_KEY=3DSAMPLE_DEVELOPMENT.pfx + +echo "%COLOR% Progress Bar" > %FMP_CAPSULE_PAYLOAD% + +if not exist "%FMP_CAPSULE_PAYLOAD%" exit + +if exist "%FMP_CAPSULE_KEY%" ( + REM + REM Sign capsule using signtool + REM + call GenerateCapsule ^ + --encode ^ + -v ^ + --guid %FMP_CAPSULE_GUID% ^ + --fw-version %FMP_CAPSULE_VERSION% ^ + --lsv %FMP_CAPSULE_LSV% ^ + --capflag PersistAcrossReset ^ + --capflag InitiateReset ^ + --signing-tool-path=3D"c:\Program Files (x86)\Windows Kits\8.1\bin\x86= " ^ + --pfx-file %FMP_CAPSULE_KEY% ^ + -o %FMP_CAPSULE_FILE% ^ + %FMP_CAPSULE_PAYLOAD% + + copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\Sam= pleDevelopment + + copy %FMP_CAPSULE_FILE% firmware.bin + copy template.metainfo.xml firmware.metainfo.xml + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_GU= ID', '%FMP_CAPSULE_GUID%' | Out-File firmware.metainfo.xml -encoding ASCII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_BA= SE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File firmware.metainfo.xml -encod= ing ASCII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_VE= RSION_DECIMAL', '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metainf= o.xml -encoding ASCII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_ST= RING', '%FMP_CAPSULE_STRING%' | Out-File firmware.metainfo.xml -encoding AS= CII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_DA= TE', '%date%' | Out-File firmware.metainfo.xml -encoding ASCII" + makecab /f Lvfs.ddf + copy firmware.cab %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert\= %FMP_CAPSULE_BASE_NAME%-%FMP_CAPSULE_STRING%.cab + + erase firmware.cab + erase setup.inf + erase setup.rpt + + erase firmware.metainfo.xml + erase firmware.bin + erase %FMP_CAPSULE_FILE% +) + +if exist "NewCert.pem" ( + REM + REM Sign capsule using OpenSSL with a new certificate + REM + call GenerateCapsule ^ + --encode ^ + -v ^ + --guid %FMP_CAPSULE_GUID% ^ + --fw-version %FMP_CAPSULE_VERSION% ^ + --lsv %FMP_CAPSULE_LSV% ^ + --capflag PersistAcrossReset ^ + --capflag InitiateReset ^ + --signer-private-cert=3DNewCert.pem ^ + --other-public-cert=3DNewSub.pub.pem ^ + --trusted-public-cert=3DNewRoot.pub.pem ^ + -o %FMP_CAPSULE_FILE% ^ + %FMP_CAPSULE_PAYLOAD% + + copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\New= Cert + + copy %FMP_CAPSULE_FILE% firmware.bin + copy template.metainfo.xml firmware.metainfo.xml + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_GU= ID', '%FMP_CAPSULE_GUID%' | Out-File firmware.metainfo.xml -encoding ASCII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_BA= SE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File firmware.metainfo.xml -encod= ing ASCII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_VE= RSION_DECIMAL', '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metainf= o.xml -encoding ASCII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_ST= RING', '%FMP_CAPSULE_STRING%' | Out-File firmware.metainfo.xml -encoding AS= CII" + powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_DA= TE', '%date%' | Out-File firmware.metainfo.xml -encoding ASCII" + makecab /f Lvfs.ddf + copy firmware.cab %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert\= %FMP_CAPSULE_BASE_NAME%-%FMP_CAPSULE_STRING%.cab + + erase firmware.cab + erase setup.inf + erase setup.rpt + + erase firmware.metainfo.xml + erase firmware.bin + erase %FMP_CAPSULE_FILE% +) + +REM +REM Sign capsule using OpenSSL with EDK II Test Certificate +REM +call GenerateCapsule ^ + --encode ^ + -v ^ + --guid %FMP_CAPSULE_GUID% ^ + --fw-version %FMP_CAPSULE_VERSION% ^ + --lsv %FMP_CAPSULE_LSV% ^ + --capflag PersistAcrossReset ^ + --capflag InitiateReset ^ + --signer-private-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Si= gn\TestCert.pem ^ + --other-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign= \TestSub.pub.pem ^ + --trusted-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Si= gn\TestRoot.pub.pem ^ + -o %FMP_CAPSULE_FILE% ^ + %FMP_CAPSULE_PAYLOAD% + +copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestC= ert + +copy %FMP_CAPSULE_FILE% firmware.bin +copy template.metainfo.xml firmware.metainfo.xml +powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_GUID= ', '%FMP_CAPSULE_GUID%' | Out-File firmware.metainfo.xml -encoding ASCII" +powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_BASE= _NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File firmware.metainfo.xml -encodin= g ASCII" +powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_VERS= ION_DECIMAL', '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metainfo.= xml -encoding ASCII" +powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_STRI= NG', '%FMP_CAPSULE_STRING%' | Out-File firmware.metainfo.xml -encoding ASCI= I" +powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_DATE= ', '%date%' | Out-File firmware.metainfo.xml -encoding ASCII" +makecab /f Lvfs.ddf +copy firmware.cab %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert\%F= MP_CAPSULE_BASE_NAME%-%FMP_CAPSULE_STRING%.cab + +erase firmware.cab +erase setup.inf +erase setup.rpt + +erase firmware.metainfo.xml +erase firmware.bin +erase %FMP_CAPSULE_FILE% + +erase %FMP_CAPSULE_PAYLOAD% diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/template.met= ainfo.xml b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/template.meta= info.xml new file mode 100644 index 0000000000..5d550c1f48 --- /dev/null +++ b/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/template.metainfo.x= ml @@ -0,0 +1,27 @@ + + + com.intel.FMP_CAPSULE_BASE_NAME.firmware + FMP_CAPSULE_BASE_NAME + System firmware for the FMP_CAPSULE_BASE_NAME + + Description of System firmware for the FMP_CAPSULE_BASE_NAME + + + FMP_CAPSULE_GUID + + http://www.tianocore.org + CC0-1.0 + BSD + Tianocore + + + + Build FMP_CAPSULE_STRING + + + + + + + + diff --git a/Vlv2TbltDevicePkg/PlatformCapsuleGcc.dsc b/Vlv2TbltDevicePkg/P= latformCapsuleGcc.dsc new file mode 100644 index 0000000000..1856ac349b --- /dev/null +++ b/Vlv2TbltDevicePkg/PlatformCapsuleGcc.dsc @@ -0,0 +1,38 @@ +#/** @file +# Platform capsule description. +# +# Copyright (c) 2016, Intel Corporation. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +#**/ + +[Defines] + PLATFORM_NAME =3D Vlv2TbltDevicePkg + PLATFORM_GUID =3D EE87F258-6ECC-4415-B1D8-23771BEE26E7 + PLATFORM_VERSION =3D 0.1 + FLASH_DEFINITION =3D Vlv2TbltDevicePkg/PlatformCapsuleGcc.= fdf + OUTPUT_DIRECTORY =3D Build/Vlv2TbltDevicePkg + SUPPORTED_ARCHITECTURES =3D IA32|X64 + BUILD_TARGETS =3D DEBUG|RELEASE + SKUID_IDENTIFIER =3D DEFAULT + POSTBUILD =3D Vlv2TbltDevicePkg/Feature/Capsule/Gen= erateCapsule/GenCapsuleAll.sh + +##########################################################################= ######################### +# +# Components Section - list of the modules and components that will be pro= cessed by compilation +# tools and the EDK II tools to generate PE32/PE32+/C= off image files. +# +# Note: The EDK II DSC file is not used to specify how compiled binary ima= ges get placed +# into firmware volume images. This section is just a list of module= s to compile from +# source into UEFI-compliant binaries. +# It is the FDF file that contains information on combining binary f= iles into firmware +# volume images, whose concept is beyond UEFI and is described in PI= specification. +# Binary modules do not need to be listed in this section, as they s= hould be +# specified in the FDF file. For example: Shell binary, FAT binary (= Fat.efi), +# Logo (Logo.bmp), and etc. +# There may also be modules listed in this section that are not requ= ired in the FDF file, +# When a module listed here is excluded from FDF file, then UEFI-com= pliant binary will be +# generated for it, but the binary will not be put into any firmware= volume. +# +##########################################################################= ######################### --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40261): https://edk2.groups.io/g/devel/message/40261 Mute This Topic: https://groups.io/mt/31551784/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 00:16:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40262+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40262+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557376280; cv=none; d=zoho.com; s=zohoarc; b=C83ChYLpzB3GNmvlgBHOW8f9bnVppR6SDnsF94ILpfASYlV/KWAmOx1KYyyQkq4KZwvNQrCgu7tNY9KuQoUieXZCgOblGSBEYf9dyCV/NHtxY4kmoiCfjRuCHpnv2VzG8QLYnOkvL1d3/Q4GPIBR0zKFSYh3K/UD9AsEFrN9ZsQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557376280; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=j7Mnu7QMkb7c/Kz7o0H0ic+xnfNfy71byJLb4dBSeu8=; b=F16uzvMGYt8JBTKgfk5dGyFTX6FMV5wML6lni/qmD776hI6bX5udVSjB6ZiT5SjKKKnDkF/mZv+kMHtL/AKqrTmocexaUFHV+iGWjDzyX7mr37jFJfNOe0k2zb9rnGiJP3TKQlHphUOGjwmTzm4K3RLelIbN/mDOG3gCjlpGllA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40262+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557376280611347.03138404505967; Wed, 8 May 2019 21:31:20 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Wed, 08 May 2019 21:31:18 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 May 2019 21:31:17 -0700 X-ExtLoop1: 1 X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.98.74]) by orsmga004.jf.intel.com with ESMTP; 08 May 2019 21:31:17 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian Subject: [edk2-devel] [Patch 16/16] Vlv2TbltDevicePkg: Update Readme.md Date: Wed, 8 May 2019 21:31:11 -0700 Message-Id: <20190509043111.15272-17-michael.d.kinney@intel.com> In-Reply-To: <20190509043111.15272-1-michael.d.kinney@intel.com> References: <20190509043111.15272-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557376279; bh=kx9AjQc/4uEMmINPZPiUc0GtjhRi9+pjlsLTTmaT4Vk=; h=Cc:Date:From:Reply-To:Subject:To; b=EqbNLPu77QMC9CvomhqE+u/nogeDoF6XB38KAYn1ZKDi09cfi00RNQCkPQ1gCsSy8eS hihN5aYG0OcLYePaKt39guSNwbdluKJ6/ECDYAHXYkKYxm+Tyj5Nq+RwP8n8EeeL2TNi+ H6Td0FPRR/TTZ+F3GpNBXgzHqhm1T+hvNJY= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Michael D Kinney --- Vlv2TbltDevicePkg/Readme.md | 232 +++++++++++++++++++++++++++++------- 1 file changed, 190 insertions(+), 42 deletions(-) diff --git a/Vlv2TbltDevicePkg/Readme.md b/Vlv2TbltDevicePkg/Readme.md index 139aa4ea61..647d0ba361 100644 --- a/Vlv2TbltDevicePkg/Readme.md +++ b/Vlv2TbltDevicePkg/Readme.md @@ -1,39 +1,18 @@ # **EDK II firmware for Minnowboard Max/Turbot which is based on Intel Val= leyview2 SoC (Byatrail platform)** =20 ---------- - - -## **How to Create a Full Source Tree for Minnowboard Max/Turbot under Win= dows** -### Pre-requisites +# Windows Pre-requisites =20 * GIT client: Available from https://git-scm.com/downloads =20 -### Download Source Code -* Create a new directory C:\WORKSPACE as an EDK II work space. - -* GIT clone operations required to pull the EDK II source tree and the edk= 2-non-osi repository. Run below command in git bash or windows command line. - - - cd C:\WORKSPACE - - git clone https://github.com/tianocore/edk2.git - - git clone https://github.com/tianocore/edk2-non-osi.git - =20 - Note: The EDK II [Multiple Workspace](https://github.com/tianocore/tia= nocore.github.io/wiki/Multiple_Workspace) -feature is used by this project. - =20 -* Follow the instructions found in the file "OpenSSL-HOWTO.txt" in your wo= rk space (e.g. "C:\WORKSPACE\edk2\CryptoPkg\Library\OpensslLib\OpenSSL-HOWT= O.txt") to install the Openssl source code. - -## **Windows Build Instructions** - -### Pre-requisites Tools - * Microsoft Visual Studio. - Visual Studio 2015 recommended and is used in the examples below. Visu= al Studio 2013 is also supported. - =20 + * WINDDK - Download Microsoft Windows Driver Development Kit 3790.1830 and instal= l it to C:\WINDDK\3790.1830. - =20 -* Python 2.7 - - Available from http://www.python.org. Install Python to C:\Python27, a= nd add the path "C:\Python27" to system environment variable **PYTHON_HOME*= *. + +* Python 3 + - https://www.python.org/downloads/ =20 * Install iASL - Install the iasl compiler by downloading iasl-win-20160527.zip from t= he following @@ -42,34 +21,203 @@ feature is used by this project. (create the folder "C:\ASL" if it does not exist). =20 * Install the NASM* assembly language compiler - - Download NASM* 2.12.02 binaries from=20 + - Download NASM* 2.12.02 binaries from http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/win64/nasm-2.12.02-wi= n64.zip and place the unzipped content ("nasm.exe") into the directory "C:\NASM" on your loca= l hard drive (create the folder "C:\NASM" if it does not exist). Add the path "C:\NA= SM\" to system environment variable **NASM_PREFIX**. =20 * Install Openssl - - Download a pre-compiled Openssl Windows binary from=20 - https://wiki.openssl.org/index.php/Binaries. Search for a Windows binar= y in the list=20 - of "Third Party OpenSSL Related Binary Distributions". Go to the third = party site to=20 - download the latest version. Download and extract to C:\Openssl, add th= e path of openssl.exe=20 + - Download a pre-compiled Openssl Windows binary from + https://wiki.openssl.org/index.php/Binaries. Search for a Windows binar= y in the list + of "Third Party OpenSSL Related Binary Distributions". Go to the third = party site to + download the latest version. Download and extract to C:\Openssl, add th= e path of openssl.exe ("C:\openssl") to system environment variable **OPENSSL_PATH**. =20 +# Download and Build MinnowMax using Windows/Visual Studio =20 +Run the script below from an empty directory. The script clones the EDK II +repository from GitHub and downloads and unzips the binary support files f= or the +MinnowBoard MAX. It then sets up the environment for EDK II builds and bu= ilds +the MinnowBoard MAX firmware and generates UEFI Capsules that can be used = to +update the MinnowBoard MAX firmware and three sample devices. =20 -### Build Commands - * cd C:\WORKSPACE\edk2\Vlv2TbltDevicePkg +``` +git clone --recurse-submodules https://github.com/tianocore/edk2.git =20 - * To build 64-bit release version image: Build_IFWI.bat MNW2 Release +powershell "& {[Net.ServicePointManager]::SecurityProtocol =3D [Net.Securi= tyProtocolType]::Tls12; Invoke-WebRequest -Uri "https://indy.fulgan.com/SSL= /openssl-1.0.2r-x64_86-win64.zip -OutFile openssl-1.0.2r-x64_86-win64.zip"}" +powershell Expand-Archive openssl-1.0.2r-x64_86-win64.zip =20 - * To build 64-bit debug version image: Build_IFWI.bat MNW2 Debug - =20 - * To build 32-bit release version image: Build_IFWI.bat /IA32 MNW2 Relea= se +powershell "& {[Net.ServicePointManager]::SecurityProtocol =3D [Net.Securi= tyProtocolType]::Tls12; Invoke-WebRequest -Uri "https://firmware.intel.com/= sites/default/files/MinnowBoardMax-Development190216.zip -OutFile MinnowBoa= rdMax-Development190216.zip"}" +powershell Expand-Archive MinnowBoardMax-Development190216.zip +sleep 1 +rename MinnowBoardMax-Development190216 Vlv2Binaries +cd Vlv2Binaries +powershell Expand-Archive Vlv2SocBinPkg.zip . +sleep 1 +cd .. =20 - * To build 32-bit debug version image: Build_IFWI.bat /IA32 MNW2 Debug +powershell "& {[Net.ServicePointManager]::SecurityProtocol =3D [Net.Securi= tyProtocolType]::Tls12; Invoke-WebRequest -Uri "https://www.nasm.us/pub/nas= m/releasebuilds/2.13.03/win64/nasm-2.13.03-win64.zip -OutFile nasm-2.13.03-= win64.zip"}" +powershell Expand-Archive nasm-2.13.03-win64.zip . =20 -### Output -* After the build process successfully completes, the 8MB firmware binary = image will -be located in the following location on your local hard drive: -"C:\WORKSPACE\edk2\Vlv2TbltDevicePkg\Stitch\" +mkdir Conf =20 +set WORKSPACE=3D%CD% +set EDK_TOOLS_PATH=3D%WORKSPACE%\edk2\BaseTools +set EDK_TOOLS_BIN=3D%EDK_TOOLS_PATH%\BinWrappers\WindowsLike +set PACKAGES_PATH=3D%WORKSPACE%\edk2;%WORKSPACE%\Vlv2Binaries +path=3D%path%;%EDK_TOOLS_PATH%\Bin\Win32;%WORKSPACE%\openssl-1.0.2r-x64_86= -win64 +set NASM_PREFIX=3D%WORKSPACE%\nasm-2.13.03\ =20 +cd %WORKSPACE%\edk2 + +call edkSetup.bat Rebuild + +cd Vlv2TbltDevicePkg + +Build_IFWI.bat /m /y MNW2 Debug +``` + +Once all the code and tools are downloaded and installed, only the followi= ng +commands are required to setup the environment. Run these from the same +directory used to install the source and binaries. + +``` +set WORKSPACE=3D%CD% +set EDK_TOOLS_PATH=3D%WORKSPACE%\edk2\BaseTools +set EDK_TOOLS_BIN=3D%EDK_TOOLS_PATH%\BinWrappers\WindowsLike +set PACKAGES_PATH=3D%WORKSPACE%\edk2;%WORKSPACE%\Vlv2Binaries +path=3D%path%;%EDK_TOOLS_PATH%\Bin\Win32;%WORKSPACE%\openssl-1.0.2r-x64_86= -win64 +set NASM_PREFIX=3D%WORKSPACE%\nasm-2.13.03\ + +cd %WORKSPACE%\edk2 + +call edkSetup.bat Rebuild +``` + +Once the environment is setup, the MinnowBoard MAX firmware and capsules c= an be +rebuilt using the following commands. + +* Build Debug Image + +``` +cd Vlv2TbltDevicePkg +Build_IFWI.bat /m /y MNW2 Debug +``` + +* Build Release Image + +``` +cd Vlv2TbltDevicePkg +Build_IFWI.bat /m /y MNW2 Release +``` + +The generated firmware image is the newest `.bin` file in `edk2/Vlv2TbltDe= vicePkg/Stitch`. +The file is in the form `MNW2MAX1.X64.0084.D01..bin`. + +The CapsuleApp and generated UEFI Capsules are in `Build/Vlv2TbltDevicePkg= /Capsules` + +# Download and Build MinnowMax using Linux/GCC + +Run the script below from an empty directory. The script clones the EDK II +repository from GitHub and downloads and unzips the binary support files f= or the +MinnowBoard MAX. It then sets up the environment for EDK II builds and bu= ilds +the MinnowBoard MAX firmware and generates UEFI Capsules that can be used = to +update the MinnowBoard MAX firmware and three sample devices. + +``` +git clone --recurse-submodules https://github.com/tianocore/edk2.git + +mkdir Vlv2Binaries +cd Vlv2Binaries +wget https://firmware.intel.com/sites/default/files/MinnowBoardMax-Develop= ment190216.zip +unzip MinnowBoardMax-Development190216.zip +unzip Vlv2SocBinPkg.zip + +mkdir Conf + +export WORKSPACE=3D$PWD/edk2 +export PACKAGES_PATH=3D$PWD/Vlv2Binaries +export EDK_TOOLS_PATH=3D$WORKSPACE/BaseTools + +cd edk2 +cd Vlv2TbltDevicePkg +. Build_IFWI.sh MNW2 Debug +``` + +Once all the code is downloaded and installed, only the following commands= are +required to setup the environment. Run these from the same directory used= to +install the source and binaries. + +``` +export WORKSPACE=3D$PWD/edk2 +export PACKAGES_PATH=3D$PWD/Vlv2Binaries +export EDK_TOOLS_PATH=3D$WORKSPACE/BaseTools + +cd edk2 +cd Vlv2TbltDevicePkg +``` + +Once the environment is setup, the MinnowBoard MAX firmware and capsules c= an be +rebuilt using the following commands. + + +* Build Debug Image + +``` +cd Vlv2TbltDevicePkg +./Build_IFWI.sh MNW2 Debug +``` + +* Build Release Image + +``` +cd Vlv2TbltDevicePkg +./Build_IFWI.sh MNW2 Release +``` + +The generated firmware image is the `MNW2MAX_X64_D_0084_01_GCC.bin` file in +`edk2\Vlv2TbltDevicePkg\Stitch` + +The CapsuleApp and generated UEFI Capsules are in `Build\Vlv2TbltDevicePkg= \Capsules` + +# Use DediProg to update FLASH image on a MinnowBoard MAX Target + +# Update MinnowBoard MAX Firmware from UEFI Capsules + +* Copy the `Build/Vlv2TbltDevicePkg/Capsules` directory to a USB FLASH dri= ve +* Connect USB FLASH Drive to MinnowBoard MAX +* Boot MinnowBoard MAX to the Boot Manager +* Boot the `EFI Internal Shell` boot option +* Mount the USB FLASH Drive (usually `FS1`) +* Use `cd` command to go to `Capsules/TestCert` directory +* Run the following command to apply all four capsules + +``` +CapsuleApp.efi Red.cap Green.cap Blue.cap MinnowMax.cap +``` + +* The MinnowBoard MAX should reboot and the four capsules are applied in t= he + order listed. The progress bar matches the color name of the capsule. + MinnowMax.cap uses the color purple. Once all capsules are processed, t= he + MinnowBoard MAX should reboot again using the new firmware images. + +# Generate and Test a UX BitMap Capsule + +* Use bitmap editor to generate a BMP file. Recommend resolution of 600 w= ide + by 100 tell and either 24 or 32 bits per pixel. +* Save BMP file to USB FLASH drive +* Use CapsuleApp.efi to convert BMP file to a UX Capsule + +``` +CapsuleApp.efi -G MyImage.bmp -O MyImage.cap +``` + +* When updating firmware using capsules, add UX capsule to the list of cap= sules + passed into CapsuleApp.efi. + +``` +CapsuleApp.efi MyImage.cap Red.cap Green.cap Blue.cap MinnowMax.cap +``` + +* When the capsules are processed the UX bitmap image should be displayed = at the + bottom of the screen. --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40262): https://edk2.groups.io/g/devel/message/40262 Mute This Topic: https://groups.io/mt/31551785/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-