From nobody Fri Apr 19 11:38:02 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+43495+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+43495+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785521; cv=none; d=zoho.com; s=zohoarc; b=VsElKKBJWui47yU+Xy7tb7Ge+klGAnbkmWslfnzTretfGV/gVVf9r5aZkQCrorJtvAoG66n6z/MXafz556frGxLV9syfBG0uOJh3HThjQtsirftZ63fVuSJAhSPZhKzGxiciKCeSET6R4GQ4mxohllxJX59q7NJT5T1TodW7/BQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785521; 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=lNkwGCTtJ5kLhc2VqnJF/d0vwXg4pvtPq/VS+NkDfDw=; b=G7dbCAaGZj2THBtd0z2/YP5I/NOBrdKx0gXaslOhr+/V9vrv9MfQd16osRldg/VJwIp17JYsQiWSjVulkKWqq+RqjR3DahK6ssB61xJ68EfqXHyZ9rFL1LFR2Mj3ewsh5UYPxc5RlNTUv4/TRs4FOHVdpBIE3cM9+zBpVE+L1qo= 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+43495+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 1562785521183121.60404439322053; Wed, 10 Jul 2019 12:05:21 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:20 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008141" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:18 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gary Lin , Zailiang Sun , Yi Qian Subject: [edk2-devel] [edk2-platforms Patch 01/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Add "set -e" to exit on error Date: Wed, 10 Jul 2019 12:04:49 -0700 Message-Id: <20190710190516.6012-2-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785520; bh=WPos+yIF5w6kKoyx/Ohxf8sF83WaMt2/yl2j9RPOFAs=; h=Cc:Date:From:Reply-To:Subject:To; b=EaiObGAh9c5duHcbLuBLegiscHepoW5/1JVuRn+VPCojya7zqGqpPKyCKyz1er7M7rB Q+l55nyUiqq5MkzMFTaPAT7rNKbaW/6fNDL13c0tNGRBtTNG3qApK8nWHzjQANam3H5tT z2me5RCJKuZUZKnrKyJ0pOvVL1WSJYzSL9w= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Gary Lin Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney Reviewed-by: Rebecca Cran --- Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh b/Platform/Inte= l/Vlv2TbltDevicePkg/Build_IFWI.sh index 4a11a1cba9..7063b7470d 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh @@ -19,6 +19,8 @@ function Usage ( ) { exit 0 } =20 +set -e + ## Assign initial values exitCode=3D0 Build_Flags=3D --=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 (#43495): https://edk2.groups.io/g/devel/message/43495 Mute This Topic: https://groups.io/mt/32419728/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 Fri Apr 19 11:38:02 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+43496+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+43496+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785521; cv=none; d=zoho.com; s=zohoarc; b=Fby9F1uYBTPPDgau6ikGwNTRqO2HMjOQF2Sm1tA6nW2BklvFGyDBLoE2P8x9Hr986fyPk+yzD1AOmUNT8STbof3BtNbgapn2+Xvj3DFYMKFikrFe0u/ECaUDE1gNN3zu1P7ehs/L4khQCxHMaFPdy78TXLwUYoWYCmRv1j3LUz8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785521; 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=ppfZxQxTvPsDl6DLzOeiZaUv9H5g888ylHj20gOeImw=; b=h9qeEyp6XX7MPiYB5lqa/usSW4LcAeZE/69WH4OWD6xZRT4X5O9qwHEigbsCij5RXY+FcQkLj0FDJGrLORJlTUESHjdXMOjPAnR5JP3DDiYfy8ICvH18cuFsk2Qbq7HZ3MNGc2TWeJfZorIcUUlctoLkepTNdldiog2ib2AKSWU= 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+43496+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 1562785521262880.5858048640912; Wed, 10 Jul 2019 12:05:21 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:20 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008144" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:19 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gary Lin , Zailiang Sun , Yi Qian Subject: [edk2-devel] [edk2-platforms Patch 02/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Change the root directory path Date: Wed, 10 Jul 2019 12:04:50 -0700 Message-Id: <20190710190516.6012-3-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785520; bh=ftDbdbGSnXtQtvsaNcGRzuSCMgkWT3HV4cGXeRMBI+Y=; h=Cc:Date:From:Reply-To:Subject:To; b=bAXRaRNAXv+R0g6ZSR50t2nP5GiM+mZ2xplUclDMuWMUan3EDF/VyrwlZBv/QX38JLV gwgaLjKgpkkOUL98VSyhUmoO1jI4sluv+p17qBG6ALIjZ5AlGzZyuXWOUj2ukOd2cyZlm FvAthEWh0bkhhVNDl703CSfFmLUZp5HshdU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Gary Lin Also make Build_IFWI.sh executable Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 =3D> 100755 Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI= .sh diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh b/Platform/Inte= l/Vlv2TbltDevicePkg/Build_IFWI.sh old mode 100644 new mode 100755 index 7063b7470d..2a22309f5f --- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh @@ -86,12 +86,12 @@ else fi =20 ## Go to root directory -cd .. +cd ../../.. =20 ## Build BIOS 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 BIOS build Script..." -./$PLATFORM_PACKAGE/bld_vlv.sh $Build_Flags $Platform_Type $Build_Target +./Platform/Intel/$PLATFORM_PACKAGE/bld_vlv.sh $Build_Flags $Platform_Type = $Build_Target =20 echo echo Finished Building BIOS. --=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 (#43496): https://edk2.groups.io/g/devel/message/43496 Mute This Topic: https://groups.io/mt/32419729/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 Fri Apr 19 11:38:02 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+43497+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+43497+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785521; cv=none; d=zoho.com; s=zohoarc; b=Rb3c+9WUu+10alq1qBTPMzNsaRdF0qmo1IPhe0CIW//w9J3vxYN3WrqHqVm7FpcqhoJZFxKMJJlQTbHhckJGkdHM2MudalRfkllMTGxPUO8j08hBrD/tDMC0EixSHB+iDTuhZdumuT11O8Hew2kgb376FV1fQmYHmiLOberRGR0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785521; 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=PZvUVpALgCWAfU3Ot41fMecTOFbplnuhvYR730sEdeI=; b=G2jS8E7BjFOfzj15sI00+Zdjnw4XlXDbxYP0oFWOXgTuL31kjqpqDYP7YTFwLFut5qhPPck6UNfHrDfqhwtplh5fIUeAyeVrxfM4D7O7+2YohH8SulBDcXaXGZMPNishNhh11tpeRiN/Dy1DMCWqvEBO4A0YsaDKMU/1akdzqoM= 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+43497+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 1562785521330203.70778875191456; Wed, 10 Jul 2019 12:05:21 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:20 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008148" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:19 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gary Lin , Zailiang Sun , Yi Qian Subject: [edk2-devel] [edk2-platforms Patch 03/28] Vlv2TbltDevicePkg/bld_vlv.sh: Fix the log name Date: Wed, 10 Jul 2019 12:04:51 -0700 Message-Id: <20190710190516.6012-4-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785520; bh=VN9WNx/b5WU5j+pwFz5nM2Uv1iR7k95alkXm/jpLGSQ=; h=Cc:Date:From:Reply-To:Subject:To; b=GMS3Y8Hzd86mJanYcwS6X0jE2J5OrI33EZiA31DpQOYSYCXPJnzghXEMQgj+Bj6/58a koHuWgKf2PQX4nE6yUGXpj3m9Chl8PqNn0lY/W/AbInueMTl4Tt/Iao+6B3jBT17p0KCv hrZebFbrsC5YLeWXYQ3aDIA0yM4j4TfLdyE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Gary Lin Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 =3D> 100755 Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/V= lv2TbltDevicePkg/bld_vlv.sh old mode 100644 new mode 100755 index 1eefa5de73..bca112db2b --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh @@ -89,7 +89,7 @@ for (( i=3D1; i<=3D$#; )) Build_Flags=3D"$Build_Flags --quiet" shift elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/L" ]; then - Build_Flags=3D"$Build_Flags -j EKD2.log" + Build_Flags=3D"$Build_Flags -j EDK2.log" shift elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/C" ]; then echo Removing previous build files ... --=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 (#43497): https://edk2.groups.io/g/devel/message/43497 Mute This Topic: https://groups.io/mt/32419730/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 Fri Apr 19 11:38:02 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+43498+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+43498+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785521; cv=none; d=zoho.com; s=zohoarc; b=ltErqb88YIj3zjJ3a5th/bWGNoojC5x2cjkttVZg6xo7RaWaD8RFv9QsvUayjZKmPgiQxvvsooP2uMqPjrHkNdkUhpEScG7P82PPT5zI3IY9+xR+dg1WywLEZXuJ7Giq+DAejAX/4tt6GvwxYpRMQQRTQ3+HiuIJXTgsxPpu6RQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785521; 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=cE6O51BGQcnQn2wUJQ23qCk43AFo3267Z5uLCdnztLE=; b=fcv4w5wN0AojThxqMwxd5HyZtR8MOz1G1zME9KPdOd3b0ndanmEwXbdQ9hJzFsNqCWmlos49tQYG/+Ti6Nx4Zks7fHHIDPhbHWGqGV3rtilvGZK1p2CvKd5XI6huk7J1scAugkJyTlLIUnQUwiO9s5YHugd4OePP+od5EHRwqik= 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+43498+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 1562785521708909.4582555767364; Wed, 10 Jul 2019 12:05:21 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:20 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008151" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:19 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gary Lin , Zailiang Sun , Yi Qian Subject: [edk2-devel] [edk2-platforms Patch 04/28] Vlv2TbltDevicePkg/bld_vlv.sh: Update the gcc version detection Date: Wed, 10 Jul 2019 12:04:52 -0700 Message-Id: <20190710190516.6012-5-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785521; bh=+NClqlvzOF8TKLmt2YVEuSkRBtvWbtHbnrXAO46/XpM=; h=Cc:Date:From:Reply-To:Subject:To; b=hoSpafIUHNoeFb2/+uJ520zUku6T7H/cwtC1ONxyQd8SKUpTzwgOlLkEwgPFxMnGgND 0LTdQC7im/+b3Iu9I9dUPaoqkvYaJRV/rtEt2xBwm3M1Qu0Zvu+ZKIv7xpz6ijShouYPy QcKeqmsBa41rYUqvSrWOejcltTug5eJtmAo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Gary Lin Borrow the logic from OvmfPkg/build.sh Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/V= lv2TbltDevicePkg/bld_vlv.sh index bca112db2b..d312063428 100755 --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh @@ -170,12 +170,19 @@ sed -i '/^MAX_CONCURRENT_THREAD_NUMBER/d' Conf/target= .txt =20 gcc_version=3D$(gcc -v 2>&1 | tail -1 | awk '{print $3}') case $gcc_version in - 4.9.*|4.1[0-9].*|5.*.*|6.*.*) - TARGET_TOOLS=3DGCC49 - ;; - *) - TARGET_TOOLS=3DGCC48 - ;; + [1-3].*|4.[0-7].*) + echo MNW2 requires GCC4.8 or later + exit 1 + ;; + 4.8.*) + TARGET_TOOLS=3DGCC48 + ;; + 4.9.*|6.[0-2].*) + TARGET_TOOLS=3DGCC49 + ;; + *) + TARGET_TOOLS=3DGCC5 + ;; esac =20 ACTIVE_PLATFORM=3D$PLATFORM_PACKAGE/PlatformPkgGcc"$Arch".dsc --=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 (#43498): https://edk2.groups.io/g/devel/message/43498 Mute This Topic: https://groups.io/mt/32419731/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 Fri Apr 19 11:38:02 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+43499+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+43499+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785521; cv=none; d=zoho.com; s=zohoarc; b=JQg+FmRZtCM2JdLmffsaG2tz+wk3y2pCf+HigymO8NaWposs7vSuHgaNsm5ul/I1aNwmV9kFag96g9CnBXbza5frd70kk/VHl+7oKrTQndv3J+7J7aPAsVsf+DA+RCNHxGoQNaeznlY4fWjKCYizEXf3ygb0auAhFKlt7qPlucg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785521; 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=yfg9tx7wLjXtceeKIuDgCJbs9wjTxiCWFP8DS0uDKR4=; b=gEIQg1JEqZgvZZDl2aIc/+5DDeKnomtjas/Ue865J/8dv8+BUAh7TDpjn3duB3jqWeV/w4dPepqOffeKWqFCGQrAOORn1kCuN+oaAX75s3xJ5OSJpYkJldKHAjkl+bTkXqqB5ZN2fYDIGi80u6CazNulI8CNrovM/ns6mBwOgxw= 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+43499+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 1562785521754197.92290348145264; Wed, 10 Jul 2019 12:05:21 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:20 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008155" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:19 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gary Lin , Zailiang Sun , Yi Qian Subject: [edk2-devel] [edk2-platforms Patch 05/28] Vlv2TbltDevicePkg/bld_vlv.sh: Remove ECP completely Date: Wed, 10 Jul 2019 12:04:53 -0700 Message-Id: <20190710190516.6012-6-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785521; bh=bT/pZLdZUk6Ad92Fm/ZG3MtNRH2nnJUHW5iyZyQ9YK4=; h=Cc:Date:From:Reply-To:Subject:To; b=RT58IAqvPyZpXRidblj1nZzcPdWEzAUPojpUY68xyInFTampKSpOOk8mx+dpnDBr2Xu wknq8thBw8w1cd41JdngWk38W3GLaWVrA/06ReBp1DbqMOPDvm5Z+jX/G5txfovyaR8Fs ZE/MBLIIB5fGpFQpJVqn14/JsEZFSlNx2yk= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Gary Lin Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/V= lv2TbltDevicePkg/bld_vlv.sh index d312063428..27772f47de 100755 --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh @@ -67,9 +67,6 @@ PLATFORM_PACKAGE=3DVlv2TbltDevicePkg config_file=3D$WORKSPACE/$PLATFORM_PACKAGE/PlatformPkgConfig.dsc auto_config_inc=3D$WORKSPACE/$PLATFORM_PACKAGE/AutoPlatformCFG.txt =20 -## default ECP (override with /ECP flag) -EDK_SOURCE=3D$WORKSPACE/EdkCompatibilityPkg - ## create new AutoPlatformCFG.txt file if [ -f "$auto_config_inc" ]; then rm $auto_config_inc --=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 (#43499): https://edk2.groups.io/g/devel/message/43499 Mute This Topic: https://groups.io/mt/32419732/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 Fri Apr 19 11:38:02 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+43503+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+43503+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785522; cv=none; d=zoho.com; s=zohoarc; b=lxAJUc61PX2eouVaB75LHQGIQ0iL8WzfNlcPCJhv9otlFUI14XZ8qzHClIminw0FevF9OQF7qNRbWH+PTpkUPQlglzOVq8veSyNQIz6eIX6wCQBEGHVOBr/hX07/WW9PC3QQFFUuNWeT7DOt1s94mAr3qCcx/5RkMBfneQ01OHQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785522; 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=GNwQ4GS8mDTTvASTxd2VCRbpPIrYDOt7x/NsH+Q2Eo0=; b=AeDCvXI5BX24vtwWUHR9zyscDkfvgMmli9VTcRr7tUh5s0nSOGKUlIoX4jhy9EMT5tdI6qZxxLffu1yXxNDdpdlo3Oh2TA+d7+UwOy7ImPkNhVBON5uSYoZdltXJWMVs+6SxJh7CzogNv3RuzUwH8JjtNqYV+QkwMzoOuqwPwek= 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+43503+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 1562785522497353.91270160167255; Wed, 10 Jul 2019 12:05:22 -0700 (PDT) Return-Path: X-Received: from mga02.intel.com (mga02.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:21 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008158" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:19 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gary Lin , Zailiang Sun , Yi Qian Subject: [edk2-devel] [edk2-platforms Patch 06/28] Vlv2TbltDevicePkg/bld_vlv.sh: Update the script to fit edk2-platforms Date: Wed, 10 Jul 2019 12:04:54 -0700 Message-Id: <20190710190516.6012-7-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785522; bh=yD5dr9siz8sspQadPEYYBj2JLx2FgikCEPAkJ3zZSuk=; h=Cc:Date:From:Reply-To:Subject:To; b=CCkpWbhtd4tkGSynkvtQL2jt28P/wntutqNx1BIxs4DBrMu4JZstsARtbawLYxKJvaC vIt41+jChjW8waHlIzEQimE/aad41Q/j4kNpR0iIcIqP9jtTvNx9r8Q73dm1D8YgUiMY/ w77FfDH8avEaHUmIhPU6bGm8SzJ+AW3S9wo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Gary Lin * Add "set -e" to exit immediately on error * Update the paths to fit the directory changes WORKSPACE +------edk2 (CORE) | +------edk2-platforms | | | +---Platform | | | | | +---Intel | | | | | +---Vlv2TbltDevicePkg (PLATFORM) | | | +---Silicon | | | +---Intel | | | +---Vlv2DeviceRefCodePkg (SILICON) | +------edk2-non-osi | +---Silicon | +---Intel | +---Vlv2SocBinPkg (BINARY) * Sync a part of bld_vlv.sh from the devel-MinnowBoardMax-UDK2017 branch to enable capsule building * Export TARGET and TOOL_CHAIN_TAG so that the GenerateCapsule scripts can use those variables Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 57 ++++++++++++--------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/V= lv2TbltDevicePkg/bld_vlv.sh index 27772f47de..0aa1edfb22 100755 --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh @@ -7,7 +7,7 @@ function Usage() { echo "******************************************************************= *********" echo "Build BIOS rom for VLV platforms." echo - echo "Usage: bld_vlv.bat PlatformType [Build Target]" + echo "Usage: bld_vlv.sh PlatformType [Build Target]" echo echo echo " Platform Types: MNW2" @@ -19,44 +19,52 @@ function Usage() { exit 0 } =20 +set -e =20 +cd .. echo -e $(date) ##********************************************************************** ## Initial Setup ##********************************************************************** -#WORKSPACE=3D$(pwd) +export WORKSPACE=3D$(pwd) #build_threads=3D($NUMBER_OF_PROCESSORS)+1 Build_Flags=3D exitCode=3D0 Arch=3DX64 SpiLock=3D0 =20 +export CORE_PATH=3D$WORKSPACE/edk2 +export PLATFORM_PATH=3D$WORKSPACE/edk2-platforms/Platform/Intel/ +export SILICON_PATH=3D$WORKSPACE/edk2-platforms/Silicon/Intel/ +export BINARY_PATH=3D$WORKSPACE/edk2-non-osi/Silicon/Intel/ +export PACKAGES_PATH=3D$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH +cd ./edk2 + ## Clean up previous build files. -if [ -e $(pwd)/EDK2.log ]; then - rm $(pwd)/EDK2.log +if [ -e $CORE_PATH/EDK2.log ]; then + rm $CORE_PATH/EDK2.log fi =20 -if [ -e $(pwd)/Unitool.log ]; then - rm $(pwd)/Unitool.log +if [ -e $CORE_PATH/Unitool.log ]; then + rm $CORE_PATH/Unitool.log fi =20 -if [ -e $(pwd)/Conf/target.txt ]; then - rm $(pwd)/Conf/target.txt +if [ -e $CORE_PATH/Conf/target.txt ]; then + rm $CORE_PATH/Conf/target.txt fi =20 -if [ -e $(pwd)/Conf/BiosId.env ]; then - rm $(pwd)/Conf/BiosId.env +if [ -e $CORE_PATH/Conf/BiosId.env ]; then + rm $CORE_PATH/Conf/BiosId.env fi =20 -if [ -e $(pwd)/Conf/tools_def.txt ]; then - rm $(pwd)/Conf/tools_def.txt +if [ -e $CORE_PATH/Conf/tools_def.txt ]; then + rm $CORE_PATH/Conf/tools_def.txt fi =20 -if [ -e $(pwd)/Conf/build_rule.txt ]; then - rm $(pwd)/Conf/build_rule.txt +if [ -e $CORE_PATH/Conf/build_rule.txt ]; then + rm $CORE_PATH/Conf/build_rule.txt fi =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 . edksetup.sh BaseTools @@ -64,8 +72,9 @@ make -C BaseTools =20 ## Define platform specific environment variables. PLATFORM_PACKAGE=3DVlv2TbltDevicePkg -config_file=3D$WORKSPACE/$PLATFORM_PACKAGE/PlatformPkgConfig.dsc -auto_config_inc=3D$WORKSPACE/$PLATFORM_PACKAGE/AutoPlatformCFG.txt +PLATFORM_PKG_PATH=3D$PLATFORM_PATH/$PLATFORM_PACKAGE +config_file=3D$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc +auto_config_inc=3D$PLATFORM_PKG_PATH/AutoPlatformCFG.txt =20 ## create new AutoPlatformCFG.txt file if [ -f "$auto_config_inc" ]; then @@ -112,10 +121,10 @@ fi =20 ## Remove the values for Platform_Type and Build_Target from BiosIdX.env a= nd stage in Conf if [ $Arch =3D=3D "IA32" ]; then - cp $PLATFORM_PACKAGE/BiosIdR.env Conf/BiosId.env + cp $PLATFORM_PKG_PATH/BiosIdR.env Conf/BiosId.env echo DEFINE X64_CONFIG =3D FALSE >> $auto_config_inc else - cp $PLATFORM_PACKAGE/BiosIdx64R.env Conf/BiosId.env + cp $PLATFORM_PKG_PATH/BiosIdx64R.env Conf/BiosId.env echo DEFINE X64_CONFIG =3D TRUE >> $auto_config_inc fi sed -i '/^BOARD_ID/d' Conf/BiosId.env @@ -142,11 +151,11 @@ fi Platform_Type=3D$1 =20 if [ "$(echo $2 | tr 'a-z' 'A-Z')" =3D=3D "RELEASE" ]; then - TARGET=3DRELEASE + export TARGET=3DRELEASE BUILD_TYPE=3DR echo BUILD_TYPE =3D R >> Conf/BiosId.env else - TARGET=3DDEBUG + export TARGET=3DDEBUG BUILD_TYPE=3DD echo BUILD_TYPE =3D D >> Conf/BiosId.env fi @@ -157,7 +166,7 @@ fi ##********************************************************************** echo "Ensuring correct build directory is present for GenBiosId..." =20 -echo Modifing Conf files for this build... +echo Modifying Conf files for this build... ## Remove lines with these tags from target.txt sed -i '/^ACTIVE_PLATFORM/d' Conf/target.txt sed -i '/^TARGET /d' Conf/target.txt @@ -182,8 +191,8 @@ case $gcc_version in ;; esac =20 -ACTIVE_PLATFORM=3D$PLATFORM_PACKAGE/PlatformPkgGcc"$Arch".dsc -TOOL_CHAIN_TAG=3D$TARGET_TOOLS +ACTIVE_PLATFORM=3D$PLATFORM_PKG_PATH/PlatformPkgGcc"$Arch".dsc +export TOOL_CHAIN_TAG=3D$TARGET_TOOLS MAX_CONCURRENT_THREAD_NUMBER=3D1 echo ACTIVE_PLATFORM =3D $ACTIVE_PLATFORM >> Con= f/target.txt echo TARGET =3D $TARGET >> Con= f/target.txt --=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 (#43503): https://edk2.groups.io/g/devel/message/43503 Mute This Topic: https://groups.io/mt/32419736/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 Fri Apr 19 11:38:02 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+43511+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+43511+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785523; cv=none; d=zoho.com; s=zohoarc; b=AFVgg+D2zlz3fSYNxbay+H+9tzOzpMtbfWQODLXmES8Cs5nnR82zRDyiXGRdaTATd+PgugoWYX1BAkT3yyLoYnkGauMc53wgZ+6w8NW99NljdifV7ZNk6/zol6zzA1XCuCAnW2UQYBn/PrrNPoEQ6Ly8y6DgFwG/aSN8vS8InsY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785523; 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=Rjxe9tWThwtltBzhrzX5nLYb3NYFX59O/VRg8w5DAT0=; b=LD7d34vxJDQduQNdc/r7LUuSvlV2VFZrDB2sdcWqIND3erVjRWEFeyEt+Q/1+5PEUwLtuBA9pYH6t4N7Ee/i5OQ0TIJUKiSMk9XQRvIhq/2g2/vHdKYal67aVO67qB18hE6lRcF69H0B05ap15xohmX92TCAqjw4oYyV5mylpIQ= 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+43511+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 1562785523821126.2739902063588; Wed, 10 Jul 2019 12:05:23 -0700 (PDT) Return-Path: X-Received: from mga02.intel.com (mga02.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:21 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008161" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:19 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gary Lin , Zailiang Sun , Yi Qian Subject: [edk2-devel] [edk2-platforms Patch 07/28] Vlv2TbltDevicePkg: Add the missing headers to inf files Date: Wed, 10 Jul 2019 12:04:55 -0700 Message-Id: <20190710190516.6012-8-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785523; bh=rKlfnUve/TxfXCklxUR0YFUUpz3EcGuhwbKODxe6xy4=; h=Cc:Date:From:Reply-To:Subject:To; b=X8QVxFiYtZ609luOLlxGT0TThgsNGMvptxWG39xBaa/7OZ4qicjhC3iApdIr1OzNQJg wxeDfhwbnx8SjGX2m0dOt7PJXgRkdjvJ3ECjrifN0mJ1zOcN82tBdsObKsSCOlO4he63Q HD/RVLGhWKL1PUVaAuWPcVmhsWLlm6xKO2c= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Gary Lin Some headers files are not listed in the inf files. Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- .../Library/FlashDeviceLib/FlashDeviceLib.inf | 2 +- .../Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf | 8 +++++--- .../Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/FlashDeviceLib/FlashD= eviceLib.inf b/Platform/Intel/Vlv2TbltDevicePkg/Library/FlashDeviceLib/Flas= hDeviceLib.inf index 4ef48cc12b..4f5678594a 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/FlashDeviceLib/FlashDeviceLi= b.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/FlashDeviceLib/FlashDeviceLi= b.inf @@ -26,7 +26,7 @@ [Defines] =20 [Sources] FlashDeviceLib.c - + SpiChipDefinitions.h =20 [Packages] MdePkg/MdePkg.dec diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.i= nf b/Platform/Intel/Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf index 9d4823d488..d2ca8f5b88 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf @@ -4,10 +4,12 @@ # ICH SMM Library that layers on top of the I/O Library to directly # access SMM power management registers. # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
-# = =20 +# = =20 + # SPDX-License-Identifier: BSD-2-Clause-Patent =20 -# = =20 +# = =20 + # # # @@ -30,7 +32,7 @@ [Defines] =20 [Sources] PchSmmLib.c - + CommonHeader.h =20 [Packages] MdePkg/MdePkg.dec diff --git a/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode= .inf b/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf index d429310ac4..c5e3cf4d55 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf @@ -29,6 +29,7 @@ [sources.common] PlatformStatusCode.c PlatformStatusCode.h PeiPostCode.c + EfiStatusCode.h =20 [Packages] MdePkg/MdePkg.dec --=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 (#43511): https://edk2.groups.io/g/devel/message/43511 Mute This Topic: https://groups.io/mt/32419744/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 Fri Apr 19 11:38:02 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+43513+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+43513+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785524; cv=none; d=zoho.com; s=zohoarc; b=F/YBzgXt4tiZh147Z3CdQAoOh+pUYEBRt0tPfD6sNT0/kXY6Ezfk/QxbFN6mEcAvNrSxw6OMni5OVmsrcA65FILiWGUjRxO3BCR7ut+fNK4mQ9VWn+lg/MG5K1/eNSncmVI/9+xWFlcSQ/AI7yXaEIIwYNaSTW+LGRhZ3QU0UzE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785524; 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=0RG1w/3ptpLr6tE+z8kmceXhxS9PjA9aFVfCIkUaBk0=; b=EhhPiVf4LT3fU8LDO/19dpZRpKO7liinGtt/fQ9bsCa+d9N9eXktGfQZ4JCaeV4mS1Z1TyfxTs9Q56TM4lbe45Nw8WafX+GLBocVzBPEsSpqUCZ6svcRvpWqSxpWmKxDWgJqYHw1sxBteKKtkIQFI/zhY23f9NtSuLVK0oaQABc= 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+43513+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 1562785524118302.3356729315137; Wed, 10 Jul 2019 12:05:24 -0700 (PDT) Return-Path: X-Received: from mga02.intel.com (mga02.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:22 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008166" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:19 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gary Lin , Zailiang Sun , Yi Qian Subject: [edk2-devel] [edk2-platforms Patch 08/28] Vlv2TbltDevicePkg/bld_vlv.sh: Remove BiosId.env completely Date: Wed, 10 Jul 2019 12:04:56 -0700 Message-Id: <20190710190516.6012-9-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785523; bh=4BS69crYioGv77NIhNthTDgX1jpxm583Oz8lvEG9FOI=; h=Cc:Date:From:Reply-To:Subject:To; b=uCGMHaZe2Y5ITvWcDI+VVoUXhl/TztZLjR/fmIDHqKNsw2QjD4t2ITZaD1AespMP4IO aa0rU97fl9zgse9nrfsL5hWrHRWOW+mLXraUzwYZ8rxCMKKK0mYc546qOHiJX8XxHQhvM SnJ9gZjgQT3ymy5Emi0NvkCusgWaoG5ck3E= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Gary Lin Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 25 +++------------------ 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/V= lv2TbltDevicePkg/bld_vlv.sh index 0aa1edfb22..bceea99b2d 100755 --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh @@ -53,10 +53,6 @@ if [ -e $CORE_PATH/Conf/target.txt ]; then rm $CORE_PATH/Conf/target.txt fi =20 -if [ -e $CORE_PATH/Conf/BiosId.env ]; then - rm $CORE_PATH/Conf/BiosId.env -fi - if [ -e $CORE_PATH/Conf/tools_def.txt ]; then rm $CORE_PATH/Conf/tools_def.txt fi @@ -119,18 +115,11 @@ if [ "$2" =3D=3D "" ]; then Usage fi =20 -## Remove the values for Platform_Type and Build_Target from BiosIdX.env a= nd stage in Conf if [ $Arch =3D=3D "IA32" ]; then - cp $PLATFORM_PKG_PATH/BiosIdR.env Conf/BiosId.env - echo DEFINE X64_CONFIG =3D FALSE >> $auto_config_inc + echo DEFINE X64_CONFIG =3D FALSE >> $auto_config_inc else - cp $PLATFORM_PKG_PATH/BiosIdx64R.env Conf/BiosId.env - echo DEFINE X64_CONFIG =3D TRUE >> $auto_config_inc + echo DEFINE X64_CONFIG =3D TRUE >> $auto_config_inc fi -sed -i '/^BOARD_ID/d' Conf/BiosId.env -sed -i '/^BUILD_TYPE/d' Conf/BiosId.env - - =20 ## -- Build flags settings for each Platform -- ## AlpineValley (ALPV): SVP_PF_BUILD =3D TRUE, ENBDT_PF_BUILD =3D FA= LSE, TABLET_PF_BUILD =3D FALSE, BYTI_PF_BUILD =3D FALSE, IVI_PF_BUILD =3D= FALSE @@ -141,26 +130,18 @@ sed -i '/^BUILD_TYPE/d' Conf/BiosId.env ## FFD8 (BLAK): SVP_PF_BUILD =3D FALSE, ENBDT_PF_BUILD =3D FA= LSE, TABLET_PF_BUILD =3D TRUE, BYTI_PF_BUILD =3D FALSE, IVI_PF_BUILD =3D= FALSE echo "Setting $1 platform configuration and BIOS ID..." if [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "MNW2" ]; then - echo BOARD_ID =3D MNW2MAX >> Conf/BiosId.env - echo DEFINE ENBDT_PF_BUILD =3D TRUE >> $auto_config_inc + echo DEFINE ENBDT_PF_BUILD =3D TRUE >> $auto_config_inc else echo "Error - Unsupported PlatformType: $1" Usage fi =20 -Platform_Type=3D$1 - if [ "$(echo $2 | tr 'a-z' 'A-Z')" =3D=3D "RELEASE" ]; then export TARGET=3DRELEASE - BUILD_TYPE=3DR - echo BUILD_TYPE =3D R >> Conf/BiosId.env else export TARGET=3DDEBUG - BUILD_TYPE=3DD - echo BUILD_TYPE =3D D >> Conf/BiosId.env fi =20 - ##********************************************************************** ## Additional EDK Build Setup/Configuration ##********************************************************************** --=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 (#43513): https://edk2.groups.io/g/devel/message/43513 Mute This Topic: https://groups.io/mt/32419746/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 Fri Apr 19 11:38:02 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+43506+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+43506+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785523; cv=none; d=zoho.com; s=zohoarc; b=bKYdvrvFmK8e304Q4PUDM+vAxSrin0s6BokpdkKUMOj3gCOiwBw5Ay/urf+IZ9nMySQgK1Wlg4fOt3FdnPthteIeC2PLJ0iyuo0UpYau3vU5c5IL8psKLLipV8jzvIq4Jx1AhwNW8/Dl9u8h4VqpFM5BrqIGQBB+yqDqKccpOJg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785523; 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=VDJmuvKRRTTsZ/fGnKr3LvF+3hpBa4Mc5umDa/kqsVk=; b=BkaIVUYePiNHxq1r7SsXJP1I/HIXr3DTYO5WR/HWr7dgLqIQbZHJZaOvR4GJIdfa9Aoba//lkpfoFSzIJrrhs3kgn4rIxjZ0V4cKC0kcxXJs51NPdB5oBl3LGiJEfWLtt/UdR/A6AsIMuoiTC46rWIvtsklRBshqGM1YCzreDiY= 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+43506+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 1562785523272286.2239647750778; Wed, 10 Jul 2019 12:05:23 -0700 (PDT) Return-Path: X-Received: from mga02.intel.com (mga02.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:21 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008171" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:19 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gary Lin , Zailiang Sun , Yi Qian Subject: [edk2-devel] [edk2-platforms Patch 09/28] Vlv2TbltDevicePkg/bld_vlv.sh: Correct the path to PlatformCapsuleGcc.dsc Date: Wed, 10 Jul 2019 12:04:57 -0700 Message-Id: <20190710190516.6012-10-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785522; bh=1safshP1J9Ay22bzHpoHKI7WJhACQ3NaheuPicuw/EU=; h=Cc:Date:From:Reply-To:Subject:To; b=K1j+0TYFkQG9sbOhZFQfuD91agADVCxRZkyxPoTGEIUTI6scOepuCxe1SXm3/XY9PmO jpzaQBWlvqC2vkj5WNol+KrjHE8khmvqkPBUZjJwyjw6FpnUYBd/PGXySnMMWaZmDXz8t wQaFDTaug4tFo2tBQRO+mz6WjUcZPI27Y20= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Gary Lin For the gcc build, we should use PlatformCapsuleGcc.dsc instead of PlatformCapsule.dsc. Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/V= lv2TbltDevicePkg/bld_vlv.sh index bceea99b2d..7fd5f44264 100755 --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh @@ -199,7 +199,7 @@ echo Skip "Running fce..." ##********************************************************************** ## Build Capsules ##********************************************************************** -build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc +build -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc =20 echo echo -------------------- The EDKII BIOS build has successfully completed.= -------------------- --=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 (#43506): https://edk2.groups.io/g/devel/message/43506 Mute This Topic: https://groups.io/mt/32419739/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 Fri Apr 19 11:38:02 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+43510+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+43510+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785523; cv=none; d=zoho.com; s=zohoarc; b=ZYUV6XZpF1L1FZInNJzC/qj1o99Y3ned5r88yAdriAiGDfiMbvi37gc8z6hgR7wrrQUr0Gk5Hj3fQPg8yfKXPQ1304HvzvAPzt5A2UhWfS2GElySkUsHbNIt2ie2Ke/ZY2FnYmoFZg+xhko4VZ3vamiBFQE9hMlXFzsFfv/No4c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785523; 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=uIaUr3sscmbwZoa5r+5gvr79r8xyz1lYVo+fbrpfWEc=; b=SJTwt2zCSRVZVp4svb3eeTTls5SeUFchdd2l+l3x/+5K+j2Vhqs38s2I33GMDjxFoooGnflz6XUdj27A/exl0ZC3oCt27h5MESLldLbDbReOcEPNH3/qJ7vB4UBZMq8psjnz5Vftv4rIE0u3G5y+OMFZfVG1BYThSSUcI2RxXjY= 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+43510+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 1562785523957241.54579571877218; Wed, 10 Jul 2019 12:05:23 -0700 (PDT) Return-Path: X-Received: from mga02.intel.com (mga02.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:21 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008175" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:19 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gary Lin , Zailiang Sun , Yi Qian Subject: [edk2-devel] [edk2-platforms Patch 10/28] Vlv2TbltDevicePkg/bld_vlv.sh: Create Vlv.ROM Date: Wed, 10 Jul 2019 12:04:58 -0700 Message-Id: <20190710190516.6012-11-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785523; bh=Qi4CK0t6yhf/uJt0DHzAgdmlfTfsffOtrFHmaGDfst8=; h=Cc:Date:From:Reply-To:Subject:To; b=wuGejE6Luf9gDciGIs9qVaIi+AMPRDshE75JuTtTePjnyNOvPRkMyZ9dqn4xH/WyayD s8KiSE74CSGP2OLrrgpkOu04W+SJQjVKnGskNNhIbG+a+1N5SaY0eihIWiPX3ZdzjQFNN x2VSGA6FWX6lQ5cNex9HBpHyzNScNRwCPr0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Gary Lin The scripts for PlatformCapsuleGcc.dsc need Vlv.ROM. Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/V= lv2TbltDevicePkg/bld_vlv.sh index 7fd5f44264..c68e59398a 100755 --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh @@ -199,6 +199,8 @@ echo Skip "Running fce..." ##********************************************************************** ## Build Capsules ##********************************************************************** +cp -f $WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN_TAG}/FV/VL= V.fd \ + $WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN_TAG}/FV/Vl= v.ROM build -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc =20 echo --=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 (#43510): https://edk2.groups.io/g/devel/message/43510 Mute This Topic: https://groups.io/mt/32419743/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 Fri Apr 19 11:38:02 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+43507+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+43507+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785523; cv=none; d=zoho.com; s=zohoarc; b=F6lq0L0zIsIozt6+ymSy5OPJfR8t7JUOGl5zXMVGTSA2QvYzsgIaZ0DJFNgMPSWnPYFk7VkZWLzWG7vsP0jDmxvQAd5H0UsvV002gQQ+chi9qOQuqMvr9rbBPHLOAynLGXnvJDuY8NHLwuSWASCW05LeN1veAcdWPieNqA67pXM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785523; 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=cdPtVoZjzbxDqcg1cLAN6WIZi17P92a98Jk2bBc6wBM=; b=JRdOyMkQJtMlaBUB3qyGYXHDiiWcEGoyaqtW8ZOCUyezZbLkVZAIAyxvkfOJWuxvBPS+av37A3YophpmpcXcJgBjhfKR9HAIowc0mNEj08HxmtxKtjxVnDHJqws49m9ZQZ2CfObe52TchQ93Iu9yTGjzI5Lf5dFhDA0Z9eVFWwc= 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+43507+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 1562785523300890.8937087120752; Wed, 10 Jul 2019 12:05:23 -0700 (PDT) Return-Path: X-Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:21 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008178" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:19 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gary Lin , Zailiang Sun , Yi Qian Subject: [edk2-devel] [edk2-platforms Patch 11/28] Vlv2TbltDevicePkg/GenerateCapsule: Fix the bash scripts Date: Wed, 10 Jul 2019 12:04:59 -0700 Message-Id: <20190710190516.6012-12-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785522; bh=sDpgERABBGrT/QDwTmNRAXEqYm1TixeyceGGDYaWdZY=; h=Cc:Date:From:Reply-To:Subject:To; b=A3hINRjRRQXbtO4VoxmpreYSaUgLgMj6EEWixPj1jW+CoUlG0Coawc0ulBpjgoUgLdp iImHfL1Tiv6TkFx3uPPO6PPVrhMXMVsTkDvG7iiUdRQx0nzqR7+HEVYMVpPiBksP31RYu CRd6y5ZEmJZEHfRAEu6sqtiv44C8e8RGku8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Gary Lin Adjust the paths to fit the current directory structure Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- .../Capsule/GenerateCapsule/GenCapsuleAll.sh | 37 +++++++++++-------- .../GenerateCapsule/GenCapsuleMinnowMax.sh | 24 +++++------- .../GenCapsuleMinnowMaxRelease.sh | 19 +++++----- 3 files changed, 39 insertions(+), 41 deletions(-) mode change 100644 =3D> 100755 Platform/Intel/Vlv2TbltDevicePkg/Feature/Ca= psule/GenerateCapsule/GenCapsuleAll.sh diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsu= le/GenCapsuleAll.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/Gene= rateCapsule/GenCapsuleAll.sh old mode 100644 new mode 100755 index 040024553a..7b77b50c3f --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC= apsuleAll.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC= apsuleAll.sh @@ -9,20 +9,25 @@ =20 cd $(dirname $0) =20 -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 +EFI_DIR=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN_TAG}/X= 64/ +CAP_DIR=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules +SCRIPT_DIR=3D$WORKSPACE/edk2-platforms/Platform/Intel/Vlv2TbltDevicePkg/Fe= ature/Capsule/GenerateCapsule =20 -. 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 +rm -rf $CAP_DIR +mkdir -p $CAP_DIR/SampleDevelopment +mkdir -p $CAP_DIR/NewCert +mkdir -p $CAP_DIR/TestCert +if [ "$TARGET" =3D=3D "DEBUG" ]; then + cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/SampleDevelopment/CapsuleApp.efi + cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/NewCert/CapsuleApp.efi + cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/TestCert/CapsuleApp.efi + . $SCRIPT_DIR/GenCapsuleMinnowMax.sh +else + cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/SampleDevelopment/CapsuleAppReleas= e.efi + cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/NewCert/CapsuleAppRelease.efi + cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/TestCert/CapsuleAppRelease.efi + . $SCRIPT_DIR/GenCapsuleMinnowMaxRelease.sh +fi +. $SCRIPT_DIR/GenCapsuleSampleColor.sh Blue 149DA854-7D19-4FAA-A91E-862EA= 1324BE6 +. $SCRIPT_DIR/GenCapsuleSampleColor.sh Green 79179BFD-704D-4C90-9E02-0AB8D= 968C18A +. $SCRIPT_DIR/GenCapsuleSampleColor.sh Red 72E2945A-00DA-448E-9AA7-075AD= 840F9D4 diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsu= le/GenCapsuleMinnowMax.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsul= e/GenerateCapsule/GenCapsuleMinnowMax.sh index 4fb963c93c..114c4a3477 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC= apsuleMinnowMax.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC= apsuleMinnowMax.sh @@ -13,7 +13,10 @@ 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 +FMP_CAPSULE_PAYLOAD=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_${TOOL_CHAI= N_TAG}/FV/Vlv.ROM +FMP_CAPSULE_DIR=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/ + +PKCS7SIGN_DIR=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/ =20 if [ ! -e "$FMP_CAPSULE_PAYLOAD" ] ; then return @@ -34,12 +37,8 @@ if [ -e NewCert.pem ]; then --signer-private-cert=3DNewCert.pem \ --other-public-cert=3DNewSub.pub.pem \ --trusted-public-cert=3DNewRoot.pub.pem \ - -o $FMP_CAPSULE_FILE \ + -o $FMP_CAPSULE_DIR/NewCert/$FMP_CAPSULE_FILE \ $FMP_CAPSULE_PAYLOAD - - cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert - - rm $FMP_CAPSULE_FILE fi =20 # @@ -53,13 +52,8 @@ GenerateCapsule \ --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 \ + --signer-private-cert=3D$PKCS7SIGN_DIR/TestCert.pem \ + --other-public-cert=3D$PKCS7SIGN_DIR/TestSub.pub.pem \ + --trusted-public-cert=3D$PKCS7SIGN_DIR/TestRoot.pub.pem \ + -o $FMP_CAPSULE_DIR/TestCert/$FMP_CAPSULE_FILE \ $FMP_CAPSULE_PAYLOAD - -cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert - -rm $FMP_CAPSULE_FILE - diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsu= le/GenCapsuleMinnowMaxRelease.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature= /Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh index 29d46dad1e..d2619786e8 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC= apsuleMinnowMaxRelease.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC= apsuleMinnowMaxRelease.sh @@ -13,7 +13,10 @@ 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 +FMP_CAPSULE_PAYLOAD=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_${TOOL_CH= AIN_TAG}/FV/Vlv.ROM +FMP_CAPSULE_DIR=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/ + +PKCS7SIGN_DIR=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/ =20 if [ ! -e "$FMP_CAPSULE_PAYLOAD" ] ; then return @@ -34,12 +37,8 @@ if [ -e NewCert.pem ]; then --signer-private-cert=3DNewCert.pem \ --other-public-cert=3DNewSub.pub.pem \ --trusted-public-cert=3DNewRoot.pub.pem \ - -o $FMP_CAPSULE_FILE \ + -o $FMP_CAPSULE_DIR/NewCert/$FMP_CAPSULE_FILE \ $FMP_CAPSULE_PAYLOAD - - cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert - - rm $FMP_CAPSULE_FILE fi =20 # @@ -53,10 +52,10 @@ GenerateCapsule \ --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 \ + --signer-private-cert=3D$PKCS7SIGN_DIR/TestCert.pem \ + --other-public-cert=3D$PKCS7SIGN_DIR/TestSub.pub.pem \ + --trusted-public-cert=3D$PKCS7SIGN_DIR/TestRoot.pub.pem \ + -o $FMP_CAPSULE_DIR/TestCert/$FMP_CAPSULE_FILE \ $FMP_CAPSULE_PAYLOAD =20 cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert --=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 (#43507): https://edk2.groups.io/g/devel/message/43507 Mute This Topic: https://groups.io/mt/32419740/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 Fri Apr 19 11:38:02 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+43500+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+43500+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785521; cv=none; d=zoho.com; s=zohoarc; b=A1GgeFdMBxrGWM8bpRYNjoD+Czm3z5oIiFfTodOuvM0sRD6QlMo7/xvk1OSbhIRrcsL1/PFc3zHSvD+NIBPTyZuk5MHnRfMgS2wrrshcs4rOIJcxh6nOKOq9vbLTOelXSxwKEqB4cjiLrqzT8QnGAlAJfxyOaPqXh73+M5xDKv8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785521; 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=jbkh3EPQRQJDpEK8gvg2Lzvhlb/DdFJmONBBeTWw81U=; b=kYCZNjoLw257M8hG1/T+IH9E/8YEgst4qHn5E4iCi7msyajAsvUeoX8mI+/WZF6KS/DnbH+mGCaoaSXfIYACTbom2AXepJMoj532lSxVfgZBQrYE1jLGR+0w5Uau5lJIcE5dNyJvx0JW8wTKe3bEAjJs7KaA1OJ7RX1g95b7vb8= 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+43500+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 1562785521954284.01155489810003; Wed, 10 Jul 2019 12:05:21 -0700 (PDT) Return-Path: X-Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:20 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008182" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:20 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gary Lin , Zailiang Sun , Yi Qian Subject: [edk2-devel] [edk2-platforms Patch 12/28] Vlv2TbltDevicePkg/AcpiPlatform: Remove a unused variable Date: Wed, 10 Jul 2019 12:05:00 -0700 Message-Id: <20190710190516.6012-13-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785521; bh=yK8KnS0R0jYNtkqnSOX0pZL7QLuP0aAmKo2SNVBbV10=; h=Cc:Date:From:Reply-To:Subject:To; b=datvgyUsVkEbVSrtRjW958ZwRfp6qkY0cQrAGnSitXd2tLJaEhr2Aq0VorHAElrC1HB KeRc4GJkOlPdCRraBUCHl9p+lKirSG49aa7itzu/w0DOdBRnHNv3aCjVkI9M5TYUne0nx KRH8HAiq4QRae6UTFgL+PYfJV5BFl1kOYZ8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Gary Lin TableVersion in AcpiPlatformEntryPoint() is not used anymore. Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c b= /Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c index 962baf561d..f3efc41e31 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c @@ -747,7 +747,6 @@ AcpiPlatformEntryPoint ( UINT32 FvStatus; UINTN Size; EFI_EVENT Event; - EFI_ACPI_TABLE_VERSION TableVersion; UINTN VarSize; UINTN SysCfgSize; EFI_HANDLE Handle; @@ -759,7 +758,6 @@ AcpiPlatformEntryPoint ( =20 mFirstNotify =3D FALSE; =20 - TableVersion =3D EFI_ACPI_TABLE_VERSION_2_0; Instance =3D 0; CurrentTable =3D NULL; TableHandle =3D 0; --=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 (#43500): https://edk2.groups.io/g/devel/message/43500 Mute This Topic: https://groups.io/mt/32419733/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 Fri Apr 19 11:38:02 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+43501+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+43501+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785522; cv=none; d=zoho.com; s=zohoarc; b=XmXbgXGveE+AmPvwsRA5rv8/tV8tJ5Y/t17vqiproWCeCa18udalSF/4CcXzw5VqshgJDkvqtEP0i1F0L6vhUOdOwtvzDlpOdVXGRg6/4RutN1N+1+1OeQS/n1itK0d55i6ob1Vqg2PpCjTzTN5sLtpfC6uzVEfb13SUtyrt8OU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785522; 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=mBk4g2J+wB/I9YWUS58GUYyL35bf5Nrw+Zccf+gV504=; b=Zu357lZXNCisAWmG059lorU4lNr3CxYxTXwthYTc7Hq22nSg/hkMAB/jynN5T8FriDrR8ygHXeq2dyFrV6FEuQNjnGlsDoS5oWsY/uXCHnCwdqjTI2td0qxRMukuq82fY/QfLCIrhfy7rM6CSGW33WAvG5QRAkUF3Ygjj5yVp1o= 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+43501+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 1562785522050622.5115801603567; Wed, 10 Jul 2019 12:05:22 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:21 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008186" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:20 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gary Lin , Zailiang Sun , Yi Qian Subject: [edk2-devel] [edk2-platforms Patch 13/28] Vlv2TbltDevicePkg/AcpiPlatform: Fix the error from InstallAcpiTable Date: Wed, 10 Jul 2019 12:05:01 -0700 Message-Id: <20190710190516.6012-14-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785521; bh=q0xOTnOJV3nHSYiD3krXa6yRhajYx4ABp8/d8oX8OQY=; h=Cc:Date:From:Reply-To:Subject:To; b=d8qs2kS5sdkCWQhDDmnhOp+icDLnblp6+Ap4eIih1/ZrSx+0LvpMX3pK3jhcYUfX/R5 my4w9D3D30+11RiZBwXFSPP+3EanMmzGbYDHJsZdRjMuoi0T0M6R3LTWzeXet0I1siuFy u/BhRwlD3trzFOjsdsehUdBIDg5ZbnaA/0c= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Gary Lin The firmware crashed when installing ACPI tables: ASSERT_EFI_ERROR (Status =3D Invalid Parameter) ASSERT [AcpiPlatform] edk2-platforms/Platform/Intel/Vlv2TbltDevicePkg/AcpiP= latform/AcpiPlatform.c(1162): !EFI_ERROR (AcpiStatus) The 'Size' from ReadSection() is not the size of the ACPI table so InstallAcpiTable() returned EFI_INVALID_PARAMETER. Use the 'Length' from the header to avoid the crash. Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c b= /Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c index f3efc41e31..72edc1bc1e 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c @@ -1152,7 +1152,7 @@ AcpiPlatformEntryPoint ( AcpiStatus =3D AcpiTable->InstallAcpiTable ( AcpiTable, CurrentTable, - Size, + CurrentTable->Length, &TableHandle ); ASSERT_EFI_ERROR (AcpiStatus); --=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 (#43501): https://edk2.groups.io/g/devel/message/43501 Mute This Topic: https://groups.io/mt/32419734/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 Fri Apr 19 11:38:02 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+43502+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+43502+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785522; cv=none; d=zoho.com; s=zohoarc; b=bzm3zWOwA7stJey+09tQtm7YZQGPVsLmylkoTKIdzvdfUYxN9cNtLqZCg9QRZEK8REiD+fXCjqFM6t8WdOQsPZ7eXoH8uahE5j+8sJ16IKajrYbtc4nKckh93npCR2IWWpMfk4W/bBWo2i/NCRbO8/uvVg48Zm8Ky561s/yR1RE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785522; 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=RBbkZN8uhAPfvCmgoNyogk91y3WUSKp675ZoXIJIark=; b=kCT52DRAwkP/E92kQrP9KIeJ+sDjP9QTHy20UeuBW7pJga6QsoSw+ZX5QkcX8C/ZASbjk3sMDfOwC1FrGtfLfx9tL1bbFtJ/cj199hPzu//n2m20e9RBBZKaE29jQ1U6StBVH4E4OxKLuu6AscndE66WYSCxTHgpQBAhX4MEBUE= 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+43502+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 1562785522388660.467814422537; Wed, 10 Jul 2019 12:05:22 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:21 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008189" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:20 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gary Lin , Zailiang Sun , Yi Qian Subject: [edk2-devel] [edk2-platforms Patch 14/28] Vlv2TbltDevicePkg/SmBiosMiscDxe: Fix the indentation Date: Wed, 10 Jul 2019 12:05:02 -0700 Message-Id: <20190710190516.6012-15-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785521; bh=OeAEN1vv1wi16PAu6E/hIBXPG0uPpaU3z7tb1HMSwn0=; h=Cc:Date:From:Reply-To:Subject:To; b=cSCbpmBdcER/BZqleRkhF32Vj59g/ZoInU+vfL6N80l/4G3PXVfBAKhXQN0nxK9Ns0h 3NNDCVkyiCPLwz0D2hgqKJ326nAXc5wfFSK9YQLwUw89kBk0hgIJm1D2Po9WrWSCp4AsX ktTz0EizCLS05BebaM65WB0JjaXD40NSLe0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Gary Lin Fix the indentation of MiscSystemManufacturerFunction.c to improve the readability. Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- .../MiscSystemManufacturerFunction.c | 51 +++++++++---------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManuf= acturerFunction.c b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSyst= emManufacturerFunction.c index f537e0db76..da660cb3a8 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturer= Function.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturer= Function.c @@ -52,14 +52,14 @@ AddSmbiosManuCallback ( UINTN PdNameStrLen; UINTN SerialNumStrLen; UINTN SkuNumberStrLen; - UINTN FamilyNameStrLen; + UINTN FamilyNameStrLen; EFI_STATUS Status; EFI_STRING Manufacturer; EFI_STRING ProductName; EFI_STRING Version; EFI_STRING SerialNumber; EFI_STRING SkuNumber; - EFI_STRING FamilyName; + EFI_STRING FamilyName; STRING_REF TokenToGet; EFI_SMBIOS_HANDLE SmbiosHandle; SMBIOS_TABLE_TYPE1 *SmbiosRecord; @@ -323,40 +323,37 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscSystemManufacturer) { EFI_STATUS Status; static BOOLEAN CallbackIsInstalledManu =3D FALSE; - VOID *AddSmbiosManuCallbackNotifyReg; - EFI_EVENT AddSmbiosManuCallbackEvent; + VOID *AddSmbiosManuCallbackNotifyReg; + EFI_EVENT AddSmbiosManuCallbackEvent; =20 =20 if (CallbackIsInstalledManu =3D=3D FALSE) { CallbackIsInstalledManu =3D TRUE; // Prevent more than 1 callb= ack. DEBUG ((EFI_D_INFO, "Create Smbios Manu callback.\n")); =20 - // - // gEfiDxeSmmReadyToLockProtocolGuid is ready - // - Status =3D gBS->CreateEvent ( - EVT_NOTIFY_SIGNAL, - TPL_CALLBACK, - (EFI_EVENT_NOTIFY)AddSmbiosManuCallback, - RecordData, - &AddSmbiosManuCallbackEvent - ); + // + // gEfiDxeSmmReadyToLockProtocolGuid is ready + // + Status =3D gBS->CreateEvent ( + EVT_NOTIFY_SIGNAL, + TPL_CALLBACK, + (EFI_EVENT_NOTIFY)AddSmbiosManuCallback, + RecordData, + &AddSmbiosManuCallbackEvent + ); =20 - ASSERT_EFI_ERROR (Status); - if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + if (EFI_ERROR (Status)) { + return Status; + } + + Status =3D gBS->RegisterProtocolNotify ( + &gEfiDxeSmmReadyToLockProtocolGuid, + AddSmbiosManuCallbackEvent, + &AddSmbiosManuCallbackNotifyReg + ); return Status; - - } - - Status =3D gBS->RegisterProtocolNotify ( - &gEfiDxeSmmReadyToLockProtocolGuid, - AddSmbiosManuCallbackEvent, - &AddSmbiosManuCallbackNotifyReg - ); - - return Status; } =20 return EFI_SUCCESS; - } --=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 (#43502): https://edk2.groups.io/g/devel/message/43502 Mute This Topic: https://groups.io/mt/32419735/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 Fri Apr 19 11:38:02 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+43504+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+43504+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785522; cv=none; d=zoho.com; s=zohoarc; b=CGeO45t0rC8SAaT+GoevqeU3VqVmBgpJSfVX4I6JHFk3tVC8MrgsztEhume+DOSt8cChq+y0gNyIhHjSmUbE6HWQd/PUlKDKqjA425y+4gjLWSpLEHX4GzmBPAM5WjWy4jLjagXZiMZ3xgCZQJeqyWbxkCyzDs0jFPGaIz5PoYA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785522; 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=bMBOYTV+bgesEdBZ7J/uuU7zi8a7Is29xkz93/mHnNE=; b=DgWGAhEu0ScuGv7UlIXtlhKXMIX64rdAHaJQWenFvvNBi7WZWtkfbSav5XicYbdsNegmagXDt2qMT/YIB15V6Audo35OsvG3PgkSzBsbFPHUavjOIIWgbCXejAgi+mhR4I/gDvleYzlOZ1kCkVRZ868kFobDbPt7bnlRjngSymc= 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+43504+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 1562785522498129.86409567120677; Wed, 10 Jul 2019 12:05:22 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:21 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008193" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:20 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gary Lin , Zailiang Sun , Yi Qian Subject: [edk2-devel] [edk2-platforms Patch 15/28] Vlv2TbltDevicePkg: Import SD/MMC drivers Date: Wed, 10 Jul 2019 12:05:03 -0700 Message-Id: <20190710190516.6012-16-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785522; bh=FBVm2hkJTXuMYlDepv02WDpA00Nohg68jDNz0jwAAU8=; h=Cc:Date:From:Reply-To:Subject:To; b=a6syDbKyRhl9Dt8Vp1/TEBBAQtyS0TFFwIi5Fw0Bti1CsKplLUDE1owo6aQlQJ+hhzE 4WeIx3pbbXoGY9W20WI0DlgrvEtBVVNAV3EUuav2AHDVqaq0E31XUA80yuDsg8NYihnsx rU+svx3znwHQ4MaKHVxYmWUbQ+zuFim8m1k= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Gary Lin Import the SD card/MMC drivers from MdeModulePkg Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf | 7 +++++++ Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 7 +++++++ Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 7 +++++++ Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 7 +++++++ Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 7 +++++++ 5 files changed, 35 insertions(+) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Platform/In= tel/Vlv2TbltDevicePkg/PlatformPkg.fdf index 0661c778c1..c538fe4a06 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf @@ -529,6 +529,13 @@ [FV.FVMAIN] INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf !endif =20 +# +# eMMC/SD Card +# +INF MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf +INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf +INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf + # # IDE/SCSI/AHCI # diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Platform= /Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf index 06bdebb10b..bd9d415939 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf @@ -478,6 +478,13 @@ [FV.FVMAIN] INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf !endif =20 +# +# eMMC/SD Card +# +INF MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf +INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf +INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf + # # IDE/SCSI/AHCI # diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platf= orm/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index b558caa61f..6317bc1342 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -1143,6 +1143,13 @@ [Components.X64] } !endif =20 +# +# eMMC/SD Card +# + MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf + MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf + MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf + # # IDE/SCSI/AHCI # diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platfor= m/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index 99ada0ef0a..8f69bb47dd 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -1127,6 +1127,13 @@ [Components.IA32] } !endif =20 +# +# eMMC/SD Card +# + MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf + MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf + MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf + # # IDE/SCSI/AHCI # diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform= /Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index 87404d2d82..d146321750 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -1142,6 +1142,13 @@ [Components.X64] } !endif =20 +# +# eMMC/SD Card +# + MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf + MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf + MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf + # # IDE/SCSI/AHCI # --=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 (#43504): https://edk2.groups.io/g/devel/message/43504 Mute This Topic: https://groups.io/mt/32419737/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 Fri Apr 19 11:38:02 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+43505+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+43505+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785523; cv=none; d=zoho.com; s=zohoarc; b=SsxdEiG4HV+DR5fB77pL1tAjez4RlWdEW75bryKg1KflRS685DpbVw6oI/yMugHZcwQQ4DLGNiytlAx4sxpG17zzXOo5i1+9kKL0/Xc7R04RHmWy6fH3eJwoA4N20GZB2wunUo0h4nHt9We0esbQ3c8IgaPaHSnWv906xU1Juys= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785523; 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=elsHW4MT8GHOCm9/zu4OjNOVPesDNtaHFP6KbxsGuD8=; b=K4gDRlCNxsHzxSEjXSpUupov0QIwErMZM8gzWxjQXugEyyVMoXXYnnMKa3o87ht5/VtJRDFD7/OqQbbCNssWAtUQqhMzC8RjYBEk3ZD6q9arRtFwI9K4K5NN597iqzqfsQ0mjV8Um+NwP9+muXdEuB6jvBu8wOPa6gNPJqnu0+s= 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+43505+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 1562785523239153.25541807668128; Wed, 10 Jul 2019 12:05:23 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:21 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008196" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:20 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian , Gary Lin Subject: [edk2-devel] [edk2-platforms Patch 16/28] Vlv2TbltDevicePkg: Update Linux build scripts Date: Wed, 10 Jul 2019 12:05:04 -0700 Message-Id: <20190710190516.6012-17-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785522; bh=jG3/rrbzE/LN3qdlNvoGC5Kw+YT7X9LYA65eAUuLaKg=; h=Cc:Date:From:Reply-To:Subject:To; b=BJmTGWKPO1qpk9cnbMbHVB/COAbocdGOyXW/bug5vl8xVTr2O3EEjA3Mb3wq7JWqDGr QZiQJQdSw2JbX0J2y+/McyR39Pgb0hedIaHVVBUus6q6llgJ7kw/P8uIF5jYB46AtNJML GHd8Dr5/for+2MsTBYdne1yY9d8jBTc08MI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" * Do not change WORKSPACE env var. Assume it is set before running script. * Access Conf dir relative to WORKSPACE * Run Build_IFWI.sh from the Vlv2Tbl2DevicePkg dir * run bld_vlv.sh from same dir as Build_IFWI.sh Cc: Zailiang Sun Cc: Yi Qian Cc: Gary Lin Signed-off-by: Michael D Kinney Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- .../Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 5 +- Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 49 ++++++++++--------- 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh b/Platform/Inte= l/Vlv2TbltDevicePkg/Build_IFWI.sh index 2a22309f5f..f8954cc9cd 100755 --- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh @@ -85,13 +85,10 @@ else IFWI_Suffix=3D"/S $3" fi =20 -## Go to root directory -cd ../../.. - ## Build BIOS 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 BIOS build Script..." -./Platform/Intel/$PLATFORM_PACKAGE/bld_vlv.sh $Build_Flags $Platform_Type = $Build_Target +. bld_vlv.sh $Build_Flags $Platform_Type $Build_Target =20 echo echo Finished Building BIOS. diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/V= lv2TbltDevicePkg/bld_vlv.sh index c68e59398a..aac8534677 100755 --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh @@ -26,7 +26,6 @@ echo -e $(date) ##********************************************************************** ## Initial Setup ##********************************************************************** -export WORKSPACE=3D$(pwd) #build_threads=3D($NUMBER_OF_PROCESSORS)+1 Build_Flags=3D exitCode=3D0 @@ -38,31 +37,31 @@ export PLATFORM_PATH=3D$WORKSPACE/edk2-platforms/Platfo= rm/Intel/ export SILICON_PATH=3D$WORKSPACE/edk2-platforms/Silicon/Intel/ export BINARY_PATH=3D$WORKSPACE/edk2-non-osi/Silicon/Intel/ export PACKAGES_PATH=3D$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH -cd ./edk2 =20 ## Clean up previous build files. -if [ -e $CORE_PATH/EDK2.log ]; then - rm $CORE_PATH/EDK2.log +if [ -e $WORKSPACE/EDK2.log ]; then + rm $WORKSPACE/EDK2.log fi =20 -if [ -e $CORE_PATH/Unitool.log ]; then - rm $CORE_PATH/Unitool.log +if [ -e $WORKSPACE/Unitool.log ]; then + rm $WORKSPACE/Unitool.log fi =20 -if [ -e $CORE_PATH/Conf/target.txt ]; then - rm $CORE_PATH/Conf/target.txt +if [ -e $WORKSPACE/Conf/target.txt ]; then + rm $WORKSPACE/Conf/target.txt fi =20 -if [ -e $CORE_PATH/Conf/tools_def.txt ]; then - rm $CORE_PATH/Conf/tools_def.txt +if [ -e $WORKSPACE/Conf/tools_def.txt ]; then + rm $WORKSPACE/Conf/tools_def.txt fi =20 -if [ -e $CORE_PATH/Conf/build_rule.txt ]; then - rm $CORE_PATH/Conf/build_rule.txt +if [ -e $WORKSPACE/Conf/build_rule.txt ]; then + rm $WORKSPACE/Conf/build_rule.txt fi =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 +cd $CORE_PATH . edksetup.sh BaseTools make -C BaseTools =20 @@ -72,6 +71,8 @@ PLATFORM_PKG_PATH=3D$PLATFORM_PATH/$PLATFORM_PACKAGE config_file=3D$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc auto_config_inc=3D$PLATFORM_PKG_PATH/AutoPlatformCFG.txt =20 +cd $PLATFORM_PKG_PATH + ## create new AutoPlatformCFG.txt file if [ -f "$auto_config_inc" ]; then rm $auto_config_inc @@ -149,11 +150,11 @@ echo "Ensuring correct build directory is present for= GenBiosId..." =20 echo Modifying Conf files for this build... ## Remove lines with these tags from target.txt -sed -i '/^ACTIVE_PLATFORM/d' Conf/target.txt -sed -i '/^TARGET /d' Conf/target.txt -sed -i '/^TARGET_ARCH/d' Conf/target.txt -sed -i '/^TOOL_CHAIN_TAG/d' Conf/target.txt -sed -i '/^MAX_CONCURRENT_THREAD_NUMBER/d' Conf/target.txt +sed -i '/^ACTIVE_PLATFORM/d' $WORKSPACE/Conf/target.txt +sed -i '/^TARGET /d' $WORKSPACE/Conf/target.txt +sed -i '/^TARGET_ARCH/d' $WORKSPACE/Conf/target.txt +sed -i '/^TOOL_CHAIN_TAG/d' $WORKSPACE/Conf/target.txt +sed -i '/^MAX_CONCURRENT_THREAD_NUMBER/d' $WORKSPACE/Conf/target.txt =20 gcc_version=3D$(gcc -v 2>&1 | tail -1 | awk '{print $3}') case $gcc_version in @@ -174,15 +175,15 @@ esac =20 ACTIVE_PLATFORM=3D$PLATFORM_PKG_PATH/PlatformPkgGcc"$Arch".dsc export TOOL_CHAIN_TAG=3D$TARGET_TOOLS -MAX_CONCURRENT_THREAD_NUMBER=3D1 -echo ACTIVE_PLATFORM =3D $ACTIVE_PLATFORM >> Con= f/target.txt -echo TARGET =3D $TARGET >> Con= f/target.txt -echo TOOL_CHAIN_TAG =3D $TOOL_CHAIN_TAG >> Con= f/target.txt -echo MAX_CONCURRENT_THREAD_NUMBER =3D $MAX_CONCURRENT_THREAD_NUMBER >> Con= f/target.txt +MAX_CONCURRENT_THREAD_NUMBER=3D8 +echo ACTIVE_PLATFORM =3D $ACTIVE_PLATFORM >> $WO= RKSPACE/Conf/target.txt +echo TARGET =3D $TARGET >> $WO= RKSPACE/Conf/target.txt +echo TOOL_CHAIN_TAG =3D $TOOL_CHAIN_TAG >> $WO= RKSPACE/Conf/target.txt +echo MAX_CONCURRENT_THREAD_NUMBER =3D $MAX_CONCURRENT_THREAD_NUMBER >> $WO= RKSPACE/Conf/target.txt if [ $Arch =3D=3D "IA32" ]; then - echo TARGET_ARCH =3D IA32 >> Con= f/target.txt + echo TARGET_ARCH =3D IA32 >> $WO= RKSPACE/Conf/target.txt else - echo TARGET_ARCH =3D IA32 X64 >> Con= f/target.txt + echo TARGET_ARCH =3D IA32 X64 >> $WO= RKSPACE/Conf/target.txt fi =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 (#43505): https://edk2.groups.io/g/devel/message/43505 Mute This Topic: https://groups.io/mt/32419738/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 Fri Apr 19 11:38:02 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+43508+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+43508+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785523; cv=none; d=zoho.com; s=zohoarc; b=YeoWt9uF03Y1SxMxtEUiWLHjShtF5X+1kW45ojL2BumpQ2N7pyQx/KOZPkZ/cnatgRFko5Sju1lmCDyVUtgTumU5Ha8ftzi6SaKQ7SnDKJQXjQncjeS7pfm2HUWnbVdFJjp18cDwe0TRDCzXC9BdCHZWcHV9wZ0fyaE5VYWESHw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785523; 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=53Z9JRahAbvVlTQSMb1+YcAEXSEIJdsd/Gxwj/XlxOE=; b=FwY1IsoDoKTCMIz1eIn+z46GxfDW96BtoshgmJysIvpJD5GylRJg40DRd4g8aamyh/vBxIMuX3du6RGhAOLvDgnG0ffGKH9H/E4fGhctne/XILdMkuCD+A9nezYlq+EactOD3JXW4NoBfUILz4cuj6p9YN2aeGcPC5gPfT4Vta8= 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+43508+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 1562785523175544.4305123061301; Wed, 10 Jul 2019 12:05:23 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:21 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008199" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:20 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian , Gary Lin Subject: [edk2-devel] [edk2-platforms Patch 17/28] Vlvt2TbltDevicePkg: Fix NULL pointer access in SmbiosMiscDxe Date: Wed, 10 Jul 2019 12:05:05 -0700 Message-Id: <20190710190516.6012-18-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785522; bh=oq2azuM6b+9GA8Vrnc6oGasYCkoZ1EaMQhlZwttAPT4=; h=Cc:Date:From:Reply-To:Subject:To; b=RiiYpnggUhDAj0ev8Tj7KPkCLi5/yKyuACk57g39toQ8mRgwS++y2MD2p0sf9g2sUE2 qWfeWto8XimdulCxzavStUQnCAec/NtpPIHm0TCZ3dkz6b6Yref49Mb5+RzU80UkXxGc1 Yerz8QsNGSNv4P4MP213zceMXFGMJJ/d/6w= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Handle case where no Simple Network Protocols are found. Cc: Zailiang Sun Cc: Yi Qian Cc: Gary Lin Signed-off-by: Michael D Kinney Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- .../MiscBaseBoardManufacturerFunction.c | 14 +++++++++----- .../SmBiosMiscDxe/MiscSystemManufacturerFunction.c | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardMa= nufacturerFunction.c b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscB= aseBoardManufacturerFunction.c index 4e02486853..8eddc5c2a6 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufactu= rerFunction.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufactu= rerFunction.c @@ -130,11 +130,15 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer) // //Get the MAC string // - Status =3D NetLibGetMacString ( - *Handles, - NULL, - &MacStr - ); + if (Handles =3D=3D NULL) { + Status =3D EFI_NOT_FOUND; + } else { + Status =3D NetLibGetMacString ( + *Handles, + NULL, + &MacStr + ); + } if (EFI_ERROR (Status)) {=09 MacStr =3D L"000000000000"; } diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManuf= acturerFunction.c b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSyst= emManufacturerFunction.c index da660cb3a8..b18dbd6ae2 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturer= Function.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturer= Function.c @@ -212,11 +212,15 @@ AddSmbiosManuCallback ( // //Get the MAC string // - Status =3D NetLibGetMacString ( - *Handles, - NULL, - &MacStr - ); + if (Handles =3D=3D NULL) { + Status =3D EFI_NOT_FOUND; + } else { + Status =3D NetLibGetMacString ( + *Handles, + NULL, + &MacStr + ); + } if (EFI_ERROR (Status)) { MacStr =3D L"000000000000"; } --=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 (#43508): https://edk2.groups.io/g/devel/message/43508 Mute This Topic: https://groups.io/mt/32419741/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 Fri Apr 19 11:38:02 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+43512+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+43512+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785523; cv=none; d=zoho.com; s=zohoarc; b=TWfTDKqN07vheyDLDsdvKPqFyFIKLJ3QeZQ0qTdgzMft9BwWNOnKenMzR312gphzKpRHfgtowF4T4Vtl2MhylMGV8v/HduEpVIxMbVY6eLJ2YB1CtWpHvi4oV6oIworjoEDkgvzQlwwakuKbxJTRt5u0HnPxAPJzLWWUbSlCPgw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785523; 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=FGpMs6p0FpiB6QAHSq9V7JEWERSVed15mY3KxdXCTO4=; b=FBAw9WPVSGwK8p45C5G2EVwUIMkqyZ47ojX/ezzbBFeTVhrxP47N1+RFSrycHKWdEn4WxF9xsIKDVCJZoA7FRDZqTcqdUe0AiklNbJYW0QH+BwSfcIrzQaISVx3VnAWW7PQCUNDdD/B5GneZ7C4Xgk4/UddxWIPbCRnU8NDbRE4= 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+43512+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 1562785523814968.4294563840751; Wed, 10 Jul 2019 12:05:23 -0700 (PDT) Return-Path: X-Received: from mga02.intel.com (mga02.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:22 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008202" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:20 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gary Lin , Zailiang Sun , Yi Qian Subject: [edk2-devel] [edk2-platforms Patch 18/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Check the WORKSPACE env variable Date: Wed, 10 Jul 2019 12:05:06 -0700 Message-Id: <20190710190516.6012-19-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785523; bh=jmxYVjBSF6jmtwxIFs6rfQn/k0FqhDoa+E9R41W8/6Y=; h=Cc:Date:From:Reply-To:Subject:To; b=FuG2zRA3GkZB2jkzWFDo1dQR9qBYDLREOzbhXHlk1Si3NZe8en1DV11SQoLxVN9HBaM O5PWuENlgmPNqLlOPpQgdhWmUGaXYRB0vYAbtH+CXnQad8e3Z9ZcsGxv5gHJ5JRmdxsMg SmwP8n0wTj9Tcw1jQk3exrn984kW76CK+kc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Gary Lin Check WORKSPACE before running the script and notify the user to export the variable if the variable doesn't exist Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh b/Platform/Inte= l/Vlv2TbltDevicePkg/Build_IFWI.sh index f8954cc9cd..422e90ca6c 100755 --- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh @@ -6,7 +6,7 @@ function Usage ( ) { echo echo "Script to build BIOS firmware and stitch the entire IFWI." echo - echo "Usage: Build_IFWI.bat [options] PlatformType BuildTarget " + echo "Usage: Build_IFWI.sh [options] PlatformType BuildTarget " echo echo=20 echo " /yL [option] : Enable SPI lock" @@ -28,6 +28,18 @@ Stitch_Flags=3D Arch=3DX64 PLATFORM_PACKAGE=3DVlv2TbltDevicePkg =20 +## Check whether WORKSPACE is set or not +if [[ -z "$WORKSPACE" ]]; then + echo "Please export WORKSPACE before running Build_IFWI.sh" + echo "See the details in Readme.md" + exit 1 +fi + +## Create $WORKSPACE/Conf if necessary +if [ ! -d $WORKSPACE/Conf ]; then + mkdir $WORKSPACE/Conf +fi + ## Parse Optional arguments if [ "$1" =3D=3D "/?" ]; then Usage --=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 (#43512): https://edk2.groups.io/g/devel/message/43512 Mute This Topic: https://groups.io/mt/32419745/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 Fri Apr 19 11:38:02 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+43514+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+43514+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785524; cv=none; d=zoho.com; s=zohoarc; b=XxYICbXGByL6th1j1ekClBfS9KzaTkmU9AL8zou/OXHmNHaGh7aXiqkcmxQoNpn+zMyuF0mXlmKLWI/RsfQSJx2YaUB28xvWzuG4EVzwBlQU4F9/Dh0F3RA2QYEfjosPsKOsttsF3oXLNQgBbdPMEuB9RQsSaRE6X7E9XEVb1Xo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785524; 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=KTXZgcm9yqGhZBZ8o/u6m4A7XvpvUYsQd4lu3PTry4M=; b=KN+NSJ6KQmyUZcF0IhtxTbyyzZprOB49mQeR9ABERR1UgUuagbDrsTNyvZZtNG+TCERSsa58lrKxvNMp8z4WT2E05zZnvHS0XM6ea9jSEEZjT4P7UbFf0Z0/DqEIbTsXe/cNHqA8fZKAMqMxkXUp7kO6/LDLRfbblLOOMm+jY4Y= 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+43514+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 1562785524069549.6923794661525; Wed, 10 Jul 2019 12:05:24 -0700 (PDT) Return-Path: X-Received: from mga02.intel.com (mga02.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:22 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008206" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:20 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian , Gary Lin Subject: [edk2-devel] [edk2-platforms Patch 19/28] Vlv2DeviceRefCodePkg: Remove redundant gEfiSpiProtocolGuid Date: Wed, 10 Jul 2019 12:05:07 -0700 Message-Id: <20190710190516.6012-20-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785523; bh=28A8zhcwv4z+p2pb+p2+7yBHIVQlIeTyNcK1fXiTCs4=; h=Cc:Date:From:Reply-To:Subject:To; b=INXaMh+q+8dGhCy78ud7hF+0pIdaprzcBQeMNoiGRK131BjaVdjbE4LeLlGoQQZ2XXr x10bXxIx3Ki0LdWM6t2AQmKxeFSypOA7IHlsi9n8ZLMePaWeG78v04LvMKbMJJhcSmV7B J8ql6rvz0fvmxA9+YYdDtn8Oee682DWNlzk= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Remove redundant declaration of gEfiSpiProtocolGuid Cc: Zailiang Sun Cc: Yi Qian Cc: Gary Lin Signed-off-by: Michael D Kinney Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- Silicon/Intel/Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec | 1 - 1 file changed, 1 deletion(-) diff --git a/Silicon/Intel/Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec b/= Silicon/Intel/Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec index 1af1ed757c..97af1d2f41 100644 --- a/Silicon/Intel/Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec +++ b/Silicon/Intel/Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec @@ -39,7 +39,6 @@ [Protocols] gEfiSpiProtocolGuid =3D { 0x1156efc6, 0xea32, 0x4396, = {0xb5, 0xd5, 0x26, 0x93, 0x2e, 0x83, 0xc3, 0x13}} gMemInfoProtocolGuid =3D { 0x6f20f7c8, 0xe5ef, 0x4f21, = {0x8d, 0x19, 0xed, 0xc5, 0xf0, 0xc4, 0x96, 0xae}} gEfiSdHostIoProtocolGuid =3D { 0xb63f8ec7, 0xa9c9, 0x4472, = {0xa4, 0xc0, 0x4d, 0x8b, 0xf3, 0x65, 0xcc, 0x51}} - gEfiSpiProtocolGuid =3D { 0x1156efc6, 0xea32, 0x4396, = {0xb5, 0xd5, 0x26, 0x93, 0x2e, 0x83, 0xc3, 0x13}} gEfiSmmSpiProtocolGuid =3D { 0xD9072C35, 0xEB8F, 0x43AD, = {0xA2, 0x20, 0x34, 0xD4, 0x0E, 0x2A, 0x82, 0x85}} gEfiSmmIchnDispatchProtocolGuid =3D { 0xc50b323e, 0x9075, 0x4f2a, = { 0xac, 0x8e, 0xd2, 0x59, 0x6a, 0x10, 0x85, 0xcc}} gEfiSmmIchnDispatchExProtocolGuid =3D { 0x3920405B, 0xC897, 0x44DA, = {0x88, 0xF3, 0x4C, 0x49, 0x8A, 0x6F, 0xF7, 0x36}} --=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 (#43514): https://edk2.groups.io/g/devel/message/43514 Mute This Topic: https://groups.io/mt/32419747/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 Fri Apr 19 11:38:02 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+43515+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+43515+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785524; cv=none; d=zoho.com; s=zohoarc; b=DG99L4u6xMFg9K/LjZHVJHqJ+m+mzPo8GvcCYerw2zGJJ7cxgVMln1vEiM5lAnZi/5bRZ92IlyHiEFlKOtBcRiU9GJAzdCHXXPdj2xphVsYcmtQzWLLAKxYhJi0bq/WuNMawGGUX/F2ZuG2sYx3s6hFl+fSbSCzystVwpLnsXM4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785524; 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=B+pPqoMZm8wczVUVfC2sKefJiBKCzd+TEUYkryKmZd8=; b=P1JMID5mQtmwMABjwHhHwUCEv10E0ak87W0fQiEfT5evBPo5cZLI5BB0m4tztQhOMKR2LQ/Ysp6Yh2ApHHNZ9RT/i3kFkym0YM21j/Pj8/gGxR+PMRrH1hVUkyFrW3UOUJSuZUfImmhv08pAn5WKoQUdusrX080ZciGZ1/CgjEM= 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+43515+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 156278552421491.72333012636477; Wed, 10 Jul 2019 12:05:24 -0700 (PDT) Return-Path: X-Received: from mga02.intel.com (mga02.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:22 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008211" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:20 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian , Gary Lin Subject: [edk2-devel] [edk2-platforms Patch 20/28] Vlv2TbltDevicePkg: Remove redundant gEfiSpiProtocolGuid Date: Wed, 10 Jul 2019 12:05:08 -0700 Message-Id: <20190710190516.6012-21-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785523; bh=ia42jlPVbQqFR+cMoHYn4Cqr2pvIdDiwZANNBVuuHo4=; h=Cc:Date:From:Reply-To:Subject:To; b=dN5n1H8VqnAQAvgkKHXHdjjyag9VsBLTZUKfTXoupxvGoEcm8a2vUSlnlHi94CMKQuy c4jyjRo/1oAjoQgabJWMC+DFd7OwKdSYYwjwQdt/iqP30tea6Mgj1GD8hV3itf+JSPZVk BjOtDBesnnrAPL9MyBiMRo7tFYXZ4kVuzwA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Remove redundant declaration of gEfiSpiProtocolGuid. This protocol is defined in Vlv2DeviceRefCodePkg. Cc: Zailiang Sun Cc: Yi Qian Cc: Gary Lin Signed-off-by: Michael D Kinney Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.dec | 1 - 1 file changed, 1 deletion(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.dec b/Platform/In= tel/Vlv2TbltDevicePkg/PlatformPkg.dec index abe9d7e3a0..970d2db42a 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.dec +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.dec @@ -187,7 +187,6 @@ [Protocols] # gEfiSpiBusProtocolGuid =3D { 0x137b3044, 0xf6d7, 0x473e, { 0xa6, 0x25,= 0x9f, 0xb9, 0x25, 0x5, 0xc1, 0x80 } } =20 # gLpssDummyProtocolGuid =3D { 0xaf4cc162, 0xd41c, 0x455a, { 0xab, 0x45, = 0x6d, 0xbc, 0xc1, 0xcd, 0x32, 0xf3 } } - gEfiSpiProtocolGuid =3D { 0x1156efc6, 0xea32, 0x4396, { 0x= b5, 0xd5, 0x26, 0x93, 0x2e, 0x83, 0xc3, 0x13 }} gEfiGpioOperationProtocolGuid =3D { 0x38DDFE8F, 0x8991, 0x44AA, { 0x= 98, 0x89, 0x83, 0xF4, 0x91, 0x84, 0x65, 0xB0 }} gEfiEsrtOperationProtocolGuid =3D { 0x4549AB47, 0x6E60, 0x4293, { 0x= B9, 0x1D, 0x31, 0xB6, 0x10, 0xAD, 0x80, 0x56 }} =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 (#43515): https://edk2.groups.io/g/devel/message/43515 Mute This Topic: https://groups.io/mt/32419748/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 Fri Apr 19 11:38:02 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+43517+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+43517+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785524; cv=none; d=zoho.com; s=zohoarc; b=GdJRa2I+qiUAfe8tOtexivnNq30FhpTQYUV/RsUXvuX2d1ZC8ZGDv4xYGp1PRrtigAwVxi5y+uoNX+VoorVGQEHwx6NZrgi8yl1+hVTHF0xPCndRPygPhCbYtxulBluTMCe0Cgahb2hP7SFf+aBRFiNjQ6F/4VwlegYgizwKxBQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785524; 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=3BXjr51TYbcBPbNfSD66qOVNhQY7m/koE8UuDvhDfMM=; b=P2vNlpMPEasqeLJL/dwz6A6NNGMNAt2rJiazwPS2tSdfVacvALmKIOks0+cTBTwh32zuQPJJ7yd9tIeSSTozLhPwHLH9xkP7a2rMgwu2q91AD3hpK9Ke7j4y+vIpy1l4cv5ESrx0/EV551YGn1aOThfGA1AWQrmz+keyv/ieKsQ= 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+43517+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 1562785524560460.59664259437784; Wed, 10 Jul 2019 12:05:24 -0700 (PDT) Return-Path: X-Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:22 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008214" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:20 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian , Gary Lin Subject: [edk2-devel] [edk2-platforms Patch 21/28] Vlv2TbltDevicePkg: Re-enable BIOS ID feature Date: Wed, 10 Jul 2019 12:05:09 -0700 Message-Id: <20190710190516.6012-22-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785524; bh=ABn2MvC9etRntki8PB/MKbYCAafqeSKxpWBPnrp89vg=; h=Cc:Date:From:Reply-To:Subject:To; b=IS350LkYP0vdRouUXyIz9NVuNO/+94gtirS+zgcv3atCuOgIKSlEotfX+Q8iHvlZZ+q Lw9HhmnUytzJ3FOfAdAGda99K3rJGxfVeHReE7bz+iU0Kw5GkyxyegIv8OROv8gtHa4bA UvKs0gJXRhG6khVVT+3bTGw8ZFs4FgNeO3M= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Add back BIOSID feature using GenBiosId.py script and BiosIdLib from the BoardModulePkg. Remove the VLV2 specific BiosIdLib implementation. Cc: Zailiang Sun Cc: Yi Qian Cc: Gary Lin Signed-off-by: Michael D Kinney Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- .../Include/Library/BiosIdLib.h | 86 ---------------- .../Library/BiosIdLib/BiosIdLib.c | 98 ------------------- .../Library/BiosIdLib/BiosIdLib.inf | 33 ------- .../PlatformDxe/PlatformDxe.inf | 5 +- .../Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf | 7 ++ .../Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 7 ++ .../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 2 +- .../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 2 +- .../Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 2 +- .../PlatformSetupDxe/PlatformSetupDxe.inf | 3 +- .../SmBiosMiscDxe/MiscBiosVendorFunction.c | 49 +--------- .../SmBiosMiscDxe/SmBiosMiscDxe.inf | 8 +- Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat | 27 +++++ Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 46 +++++++++ 14 files changed, 100 insertions(+), 275 deletions(-) delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Include/Library/BiosId= Lib.h delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/Bios= IdLib.c delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/Bios= IdLib.inf diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/BiosIdLib.h b= /Platform/Intel/Vlv2TbltDevicePkg/Include/Library/BiosIdLib.h deleted file mode 100644 index bd08c9a80f..0000000000 --- a/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/BiosIdLib.h +++ /dev/null @@ -1,86 +0,0 @@ -/*++ - - Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
- - SPDX-License-Identifier: BSD-2-Clause-Patent - -Module Name: - - BiosIdLib.h - -Abstract: - - BIOS ID library definitions. - - This library provides functions to get BIOS ID, VERSION, DATE and TIME - ---*/ - -#ifndef _BIOS_ID_LIB_H_ -#define _BIOS_ID_LIB_H_ - -// -// BIOS ID string format: -// -// $(BOARD_ID)$(BOARD_REV).$(OEM_ID).$(VERSION_MAJOR).$(BUILD_TYPE)$(VERSI= ON_MINOR).YYMMDDHHMM -// -// Example: "TRFTCRB1.86C.0008.D03.0506081529" -// -#pragma pack(1) - -typedef struct { - CHAR16 BoardId[7]; // "TRFTCRB" - CHAR16 BoardRev; // "1" - CHAR16 Dot1; // "." - CHAR16 OemId[3]; // "86C" - CHAR16 Dot2; // "." - CHAR16 VersionMajor[4]; // "0008" - CHAR16 Dot3; // "." - CHAR16 BuildType; // "D" - CHAR16 VersionMinor[2]; // "03" - CHAR16 Dot4; // "." - CHAR16 TimeStamp[10]; // "YYMMDDHHMM" - CHAR16 NullTerminator; // 0x0000 -} BIOS_ID_STRING; - -#define MEM_IFWIVER_START 0x7E0000 -#define MEM_IFWIVER_LENGTH 0x1000 - -typedef struct _MANIFEST_OEM_DATA{ - UINT32 Signature; - unsigned char FillNull[0x39]; - UINT32 IFWIVersionLen; - unsigned char IFWIVersion[32]; -}MANIFEST_OEM_DATA; - -// -// A signature precedes the BIOS ID string in the FV to enable search by e= xternal tools. -// -typedef struct { - UINT8 Signature[8]; // "$IBIOSI$" - BIOS_ID_STRING BiosIdString; // "TRFTCRB1.86C.0008.D03.0506081529" -} BIOS_ID_IMAGE; - -#pragma pack() - -/** - This function returns the Version & Release Date and Time by getting and= converting - BIOS ID. - - @param[in] BiosVersion The Bios Version out of the conversion. - @param[in] BiosReleaseDate The Bios Release Date out of the conversi= on. - @param[in] BiosReleaseTime The Bios Release Time out of the conversi= on. - - @retval EFI_SUCCESS BIOS Version & Release Date and Time have= been got successfully. - @retval EFI_NOT_FOUND BiosId image is not found, and no paramet= er will be modified. - @retval EFI_INVALID_PARAMETER All the parameters are NULL. - -**/ -EFI_STATUS -GetBiosVersionDateTime ( - OUT CHAR16 *BiosVersion, OPTIONAL - OUT CHAR16 *BiosReleaseDate, OPTIONAL - OUT CHAR16 *BiosReleaseTime OPTIONAL - ); - -#endif diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.c= b/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.c deleted file mode 100644 index f6ab37313c..0000000000 --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.c +++ /dev/null @@ -1,98 +0,0 @@ -/*++ - -Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved - - SPDX-License-Identifier: BSD-2-Clause-Patent - -Module Name: - - BiosIdLib.c - -Abstract: - - Boot service DXE BIOS ID library implementation. - - These functions in this file can be called during DXE and cannot be call= ed during runtime - or in SMM which should use a RT or SMM library. - ---*/ - -#include -#include - -#include - -/** - This function returns the Version & Release Date and Time by getting and= converting - BIOS ID. - - @param BiosVersion The Bios Version out of the conversion. - @param BiosReleaseDate The Bios Release Date out of the conversion. - @param BiosReleaseTime - The Bios Release Time out of the conversion. - - @retval EFI_SUCCESS - BIOS Version & Release Date and Time have been got= successfully. - @retval EFI_NOT_FOUND - BiosId image is not found, and no parameter will= be modified. - @retval EFI_INVALID_PARAMETER - All the parameters are NULL. - -**/ -EFI_STATUS -GetBiosVersionDateTime ( - OUT CHAR16 *BiosVersion, OPTIONAL - OUT CHAR16 *BiosReleaseDate, OPTIONAL - OUT CHAR16 *BiosReleaseTime OPTIONAL - ) -{ - if ((BiosVersion =3D=3D NULL) && (BiosReleaseDate =3D=3D NULL) && (BiosR= eleaseTime =3D=3D NULL)) { - return EFI_INVALID_PARAMETER; - } - - if (BiosVersion !=3D NULL) { - // - // Fill the BiosVersion data from the BIOS ID. - // - StrCpy (BiosVersion, L"MNW2MAX1.X64.0084.D01"); - } - - if (BiosReleaseDate !=3D NULL) { - // - // Fill the build timestamp date from the BIOS ID in the "MM/DD/YY" fo= rmat. - // - BiosReleaseDate[0] =3D L'0'; - BiosReleaseDate[1] =3D L'1'; - BiosReleaseDate[2] =3D L'/'; - - BiosReleaseDate[3] =3D L'0'; - BiosReleaseDate[4] =3D L'1'; - BiosReleaseDate[5] =3D L'/'; - - // - // Add 20 for SMBIOS table - // Current Linux kernel will misjudge 09 as year 0, so using 2009 for = SMBIOS table - // - BiosReleaseDate[6] =3D L'2'; - BiosReleaseDate[7] =3D L'0'; - BiosReleaseDate[8] =3D L'1'; - BiosReleaseDate[9] =3D L'9'; - - BiosReleaseDate[10] =3D L'\0'; - } - - if (BiosReleaseTime !=3D NULL) { - - // - // Fill the build timestamp time from the BIOS ID in the "HH:MM" forma= t. - // - - BiosReleaseTime[0] =3D L'0'; - BiosReleaseTime[1] =3D L'0'; - BiosReleaseTime[2] =3D L':'; - - BiosReleaseTime[3] =3D L'0'; - BiosReleaseTime[4] =3D L'0'; - - BiosReleaseTime[5] =3D L'\0'; - } - - return EFI_SUCCESS; -} - diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.i= nf b/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf deleted file mode 100644 index 0d38d73ada..0000000000 --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf +++ /dev/null @@ -1,33 +0,0 @@ -#/*++ -# -# Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved -# -# SPDX-License-Identifier: BSD-2-Clause-Patent -# -# Module Name: -# -# BiosIdLib.inf -# -# Abstract: -# -# Component description file for BIOS ID library -# -#--*/ -[Defines] - INF_VERSION =3D 0x00010005 - BASE_NAME =3D BiosIdLib - FILE_GUID =3D 98546145-64F1-4d2e-814F-6BF963DB7930 - MODULE_TYPE =3D BASE - VERSION_STRING =3D 1.0 - LIBRARY_CLASS =3D BiosIdLib - PI_SPECIFICATION_VERSION =3D 0x0001000A - -[Sources] - BiosIdLib.c - -[Packages] - MdePkg/MdePkg.dec - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec - Vlv2TbltDevicePkg/PlatformPkg.dec diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf b= /Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf index 9fee691365..88c9b36cb1 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf @@ -48,10 +48,11 @@ [sources.common] [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - Vlv2TbltDevicePkg/PlatformPkg.dec - Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec SecurityPkg/SecurityPkg.dec CryptoPkg/CryptoPkg.dec + BoardModulePkg/BoardModulePkg.dec + Vlv2TbltDevicePkg/PlatformPkg.dec + Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec =20 [LibraryClasses] BaseLib diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Platform/In= tel/Vlv2TbltDevicePkg/PlatformPkg.fdf index c538fe4a06..dd4550dd88 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf @@ -382,6 +382,13 @@ [FV.FVMAIN] INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandl= erRuntimeDxe.inf } =20 +# +# gBiosIdGuid +# +FILE FREEFORM =3D C3E36D09-8294-4b97-A857-D5288FE33E28 { + SECTION RAW =3D $(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/BiosId= .bin + } + # # EDK II Related Platform codes # diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Platform= /Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf index bd9d415939..b6e8e40582 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf @@ -331,6 +331,13 @@ [FV.FVMAIN] INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandl= erRuntimeDxe.inf } =20 +# +# gBiosIdGuid +# +FILE FREEFORM =3D C3E36D09-8294-4b97-A857-D5288FE33E28 { + SECTION RAW =3D $(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/BiosId= .bin + } + # # EDK II Related Platform codes # diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platf= orm/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index 6317bc1342..26c1caad94 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -221,7 +221,7 @@ [LibraryClasses.common] OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf !endif =20 - BiosIdLib|Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf + BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf =20 StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platfor= m/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index 8f69bb47dd..dc6d8b1b26 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -219,7 +219,7 @@ [LibraryClasses.common] OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf !endif =20 - BiosIdLib|Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf + BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf =20 StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform= /Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index d146321750..cbc87aa9be 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -221,7 +221,7 @@ [LibraryClasses.common] OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf !endif =20 - BiosIdLib|Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf + BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf =20 StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetu= pDxe.inf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupD= xe.inf index 85e8b1e8d6..8ff246041d 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf @@ -60,9 +60,10 @@ [Sources] [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec + SecurityPkg/SecurityPkg.dec + BoardModulePkg/BoardModulePkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec #for PchAccess.h - SecurityPkg/SecurityPkg.dec =20 [LibraryClasses] BaseLib diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorF= unction.c b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorFu= nction.c index fb4fa820a5..0fbd5ac0bd 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorFunction= .c +++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorFunction= .c @@ -163,12 +163,6 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBiosVendor) SMBIOS_TABLE_TYPE0 *SmbiosRecord; EFI_SMBIOS_HANDLE SmbiosHandle; EFI_MISC_BIOS_VENDOR *ForType0InputData; - UINT16 UVerStr[32]; - UINTN LoopIndex; - UINTN CopyIndex; - MANIFEST_OEM_DATA *IFWIVerStruct; - UINT8 *Data8 =3D NULL; - UINT16 SpaceVer[2]=3D{0x0020,0x0000}; UINT16 BIOSVersionTemp[100]; =20 ForType0InputData =3D (EFI_MISC_BIOS_VENDOR *)RecordData; @@ -208,49 +202,8 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBiosVendor) TokenToGet =3D STRING_TOKEN (STR_MISC_BIOS_VERSION); Version =3D SmbiosMiscGetString (TokenToGet); =20 - ZeroMem (UVerStr, 2*32); - ZeroMem (BIOSVersionTemp, 2*100); + ZeroMem (BIOSVersionTemp, sizeof (BIOSVersionTemp)); StrCat (BIOSVersionTemp,Version); - Data8 =3D AllocatePool (SECTOR_SIZE_4KB); - ZeroMem (Data8, SECTOR_SIZE_4KB); - - Status =3D gBS->LocateProtocol ( - &gEfiSpiProtocolGuid, - NULL, - (VOID **)&mSpiProtocol - ); - if (!EFI_ERROR(Status)) { - // - // Get data form SPI ROM. - // - Status =3D FlashRead ( - MEM_IFWIVER_START, - Data8, - SECTOR_SIZE_4KB, - EnumSpiRegionAll - ); - if (!EFI_ERROR(Status)) { - for(LoopIndex =3D 0; LoopIndex <=3D SECTOR_SIZE_4KB; LoopIndex++) { - IFWIVerStruct =3D (MANIFEST_OEM_DATA *)(Data8 + LoopIndex); - if(IFWIVerStruct->Signature =3D=3D SIGNATURE_32('$','F','U','D')) { - DEBUG ((EFI_D_ERROR, "the IFWI Length is:%d\n", IFWIVerStruct->I= FWIVersionLen)); - if(IFWIVerStruct->IFWIVersionLen < 32) { - for(CopyIndex =3D 0; CopyIndex < IFWIVerStruct->IFWIVersionLen= ; CopyIndex++) { - UVerStr[CopyIndex] =3D (UINT16)IFWIVerStruct->IFWIVersion[Co= pyIndex]; - } - UVerStr[CopyIndex] =3D 0x0000; - DEBUG ((EFI_D_ERROR, "The IFWI Version is :%s,the IFWI Length = is:%d\n", UVerStr,IFWIVerStruct->IFWIVersionLen)); - StrCat(BIOSVersionTemp,SpaceVer); - StrCat(BIOSVersionTemp,UVerStr); - DEBUG ((EFI_D_ERROR, "The BIOS and IFWI Version is :%s\n", BIO= SVersionTemp)); - } - break; - } - } - } - } - FreePool(Data8); - VerStrLen =3D StrLen(BIOSVersionTemp); if (VerStrLen > SMBIOS_STRING_MAX_LENGTH) { return EFI_UNSUPPORTED; diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.i= nf b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf index 92b51b1743..016fb53b18 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf @@ -81,12 +81,13 @@ [Sources] MiscMemoryDeviceFunction.c =20 [Packages] - MdeModulePkg/MdeModulePkg.dec - Vlv2TbltDevicePkg/PlatformPkg.dec MdePkg/MdePkg.dec - Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec + MdeModulePkg/MdeModulePkg.dec NetworkPkg/NetworkPkg.dec UefiCpuPkg/UefiCpuPkg.dec + BoardModulePkg/BoardModulePkg.dec + Vlv2TbltDevicePkg/PlatformPkg.dec + Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec =20 [LibraryClasses] HiiLib @@ -120,7 +121,6 @@ [Protocols] gMemInfoProtocolGuid gEfiTdtOperationProtocolGuid gDxePchPlatformPolicyProtocolGuid - gEfiSpiProtocolGuid gEfiSimpleNetworkProtocolGuid =20 [Pcd] diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat b/Platform/Intel/= Vlv2TbltDevicePkg/bld_vlv.bat index 5cae78bb6d..ffd6722582 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat @@ -207,11 +207,15 @@ if defined VS140COMNTOOLS ( ) =20 echo Ensuring correct build directory is present +if not exist %WORKSPACE%\Build mkdir %WORKSPACE%\Build if "%Arch%"=3D=3D"IA32" ( + if not exist %WORKSPACE%\Build\%PLATFORM_NAME%IA32 mkdir %WORKSPACE%\Bui= ld\%PLATFORM_NAME%IA32 set BUILD_PATH=3D%WORKSPACE%\Build\%PLATFORM_NAME%IA32\%TARGET%_%TOOL_CH= AIN_TAG% ) else ( + if not exist %WORKSPACE%\Build\%PLATFORM_NAME% mkdir %WORKSPACE%\Build\%= PLATFORM_NAME% set BUILD_PATH=3D%WORKSPACE%\Build\%PLATFORM_NAME%\%TARGET%_%TOOL_CHAIN_= TAG% ) +if not exist %BUILD_PATH% mkdir %BUILD_PATH% =20 echo Modifing Conf files for this build... :: Remove lines with these tags from target.txt @@ -234,6 +238,29 @@ echo MAX_CONCURRENT_THREAD_NUMBER =3D %build_threads% = >> %WOR =20 move /Y %WORKSPACE%\Conf\target.txt.tmp %WORKSPACE%\Conf\target.txt >nul =20 +::********************************************************************** +:: Generate BIOS ID +::********************************************************************** + +echo BOARD_ID =3D MNW2MAX > %BUILD_PATH%/BiosId.env +echo BOARD_REV =3D 1 >> %BUILD_PATH%/BiosId.env +if "%Arch%"=3D=3D"IA32" ( + echo BOARD_EXT =3D I32 >> %BUILD_PATH%/BiosId.env +) +if "%Arch%"=3D=3D"X64" ( + echo BOARD_EXT =3D X64 >> %BUILD_PATH%/BiosId.env +) +echo VERSION_MAJOR =3D 0090 >> %BUILD_PATH%/BiosId.env +if "%TARGET%"=3D=3D"DEBUG" ( + echo BUILD_TYPE =3D D >> %BUILD_PATH%/BiosId.env +) +if "%TARGET%"=3D=3D"RELEASE" ( + echo BUILD_TYPE =3D R >> %BUILD_PATH%/BiosId.env +) +echo VERSION_MINOR =3D 01 >> %BUILD_PATH%/BiosId.env + +%WORKSPACE%\edk2-platforms\Platform\Intel\Tools\GenBiosId\GenBiosId.py -i = %BUILD_PATH%/BiosId.env -o %BUILD_PATH%/BiosId.bin -ot %BUILD_PATH%/BiosId.= txt + ::********************************************************************** :: Build BIOS ::********************************************************************** diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/V= lv2TbltDevicePkg/bld_vlv.sh index aac8534677..03fa062310 100755 --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh @@ -66,6 +66,7 @@ cd $CORE_PATH make -C BaseTools =20 ## Define platform specific environment variables. +PLATFORM_NAME=3DVlv2TbltDevicePkg PLATFORM_PACKAGE=3DVlv2TbltDevicePkg PLATFORM_PKG_PATH=3D$PLATFORM_PATH/$PLATFORM_PACKAGE config_file=3D$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc @@ -186,6 +187,51 @@ else echo TARGET_ARCH =3D IA32 X64 >> $WO= RKSPACE/Conf/target.txt fi =20 + +## Set and Create $BUILD_PATH if necessary +if [ ! -d ${WORKSPACE}/Build ]; then + mkdir ${WORKSPACE}/Build +fi + +if [ $Arch =3D=3D "IA32" ]; then + if [ ! -d ${WORKSPACE}/Build/${PLATFORM_NAME}IA32 ]; then + mkdir ${WORKSPACE}/Build/${PLATFORM_NAME}IA32 + fi + BUILD_PATH=3D${WORKSPACE}/Build/${PLATFORM_NAME}IA32/${TARGET}_${TOOL_CH= AIN_TAG} +else + if [ ! -d ${WORKSPACE}/Build/${PLATFORM_NAME} ]; then + mkdir ${WORKSPACE}/Build/${PLATFORM_NAME} + fi + BUILD_PATH=3D${WORKSPACE}/Build/${PLATFORM_NAME}/${TARGET}_${TOOL_CHAIN_= TAG} +fi + +if [ ! -d $BUILD_PATH ]; then + mkdir $BUILD_PATH +fi + +##********************************************************************** +## Generate BIOS ID +##********************************************************************** + +echo BOARD_ID =3D MNW2MAX > $BUILD_PATH/BiosId.env +echo BOARD_REV =3D 1 >> $BUILD_PATH/BiosId.env +if [ $Arch =3D=3D "IA32" ]; then + echo BOARD_EXT =3D I32 >> $BUILD_PATH/BiosId.env +fi +if [ $Arch =3D=3D "X64" ]; then + echo BOARD_EXT =3D X64 >> $BUILD_PATH/BiosId.env +fi +echo VERSION_MAJOR =3D 0090 >> $BUILD_PATH/BiosId.env +if [ $TARGET =3D=3D "DEBUG" ]; then + echo BUILD_TYPE =3D D >> $BUILD_PATH/BiosId.env +fi +if [ $TARGET =3D=3D "RELEASE" ]; then + echo BUILD_TYPE =3D R >> $BUILD_PATH/BiosId.env +fi +echo VERSION_MINOR =3D 01 >> $BUILD_PATH/BiosId.env + +python $WORKSPACE/edk2-platforms/Platform/Intel/Tools/GenBiosId/GenBiosId.= py -i $BUILD_PATH/BiosId.env -o $BUILD_PATH/BiosId.bin -ot $BUILD_PATH/Bios= Id.txt + ##********************************************************************** ## Build BIOS ##********************************************************************** --=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 (#43517): https://edk2.groups.io/g/devel/message/43517 Mute This Topic: https://groups.io/mt/32419750/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 Fri Apr 19 11:38:02 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+43518+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+43518+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785524; cv=none; d=zoho.com; s=zohoarc; b=fumHs3MBGGxmHU0XbZf9iW/U8vb0M9jvhI8AQRH1Rc+wkNES7m/twOX891Ak+Sj3r3X/nalQgP5Hw9Dz0q/hWYmnAAStnMCU0DX6Q9vutpCuUAADGJwas48bY/PmJwTCPcqAJ8B4F5Nqs1P1cQt67P1OSzp/cfRoz4dv/zjsxy4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785524; 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=uSKTOuh+JhKnBWfDGC9HFzFKN1oUJjB01Qk7c4o0ax4=; b=UlJi3wmLVw17gXlFEYw1DF34TM1JJOkgwE8c/SNBpkJXYMLCS9YClU0Zn7KalIU3aY5R1f+IGFslBo0s3zZbRAdXdmCDh93u3+Ubz+HiJZwFwdR9hlj7y9W3kOpKanSK1HbY63zY+z/CE60z8p6JrNtyhlAd1n4zwwxCf5XaiSs= 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+43518+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 156278552469077.68449525258757; Wed, 10 Jul 2019 12:05:24 -0700 (PDT) Return-Path: X-Received: from mga02.intel.com (mga02.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:22 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008219" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:21 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian , Gary Lin Subject: [edk2-devel] [edk2-platforms Patch 22/28] Vlv2TbltDevicePkg: Add GCC IA32 build support Date: Wed, 10 Jul 2019 12:05:10 -0700 Message-Id: <20190710190516.6012-23-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785524; bh=r6XLtLI1BsV9hf4lS1mTbVywlglAMxqYSkmJwfO7aaI=; h=Cc:Date:From:Reply-To:Subject:To; b=YXndMKHRen1yamgEhGDIzdc4nAJcjW07yJBLSokJV5JvNa7BK/MNT823aiAItST21tv VmCXTWWkFfIHVmqIbg4l+OS9eK7p12P0QpzZhFIr006LJlJMQxVoe2skOuDyWbu7zQvVV uheDiLG1aZNop11rpSF7KoVZUgWcEVv7vm0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" * Remove CpuIa32Lib that contains inline assembly that is not compatible with GCC builds. Use BaseLib functions for CPUID and MSR access and the CPUID and MSR defintions from the UefiCpuPkg. * Add PlatformPkgGccIa32.dsc * Add /IA32 flag to Build_IFWI.sh * Add /IA32 flag to bld_vlv.sh * Remove unused references to gEfiPlatformCpuInfoGuid Cc: Zailiang Sun Cc: Yi Qian Cc: Gary Lin Signed-off-by: Michael D Kinney Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- .../AcpiPlatform/AcpiPlatform.c | 1 - .../Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 4 + .../Include/Guid/PlatformCpuInfo.h | 16 +- .../Include/Library/CpuIA32.h | 345 ------------------ .../Library/CpuIA32Lib/CpuIA32Lib.inf | 41 --- .../Library/CpuIA32Lib/EfiCpuVersion.c | 70 ---- .../Library/CpuIA32Lib/IA32/CpuIA32.S | 223 ----------- .../Library/CpuIA32Lib/IA32/CpuIA32.asm | 206 ----------- .../Library/CpuIA32Lib/IA32/CpuIA32.c | 177 --------- .../Library/CpuIA32Lib/X64/Cpu.S | 207 ----------- .../Library/CpuIA32Lib/X64/Cpu.asm | 222 ----------- .../MonoStatusCode/MonoStatusCode.inf | 1 - .../PlatformInitPei/MemoryCallback.c | 11 +- .../PlatformInitPei/PlatformEarlyInit.h | 4 +- .../PlatformInitPei/PlatformInitPei.inf | 1 - .../PlatformPei/PlatformPei.inf | 1 - ...formPkgIA32.dsc =3D> PlatformPkgGccIA32.dsc} | 28 +- .../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 1 - .../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 1 - .../Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 1 - .../PlatformSetupDxe/PlatformSetupDxe.h | 1 - .../PlatformSetupDxe/PlatformSetupDxe.inf | 2 +- .../PlatformSetupDxe/SetupInfoRecords.c | 42 ++- .../Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c | 12 +- .../Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf | 1 + .../SmBiosMiscDxe/MiscOemType0x90Function.c | 37 +- .../SmBiosMiscDxe/MiscOemType0x94Function.c | 10 +- .../MiscProcessorInformationFunction.c | 3 +- .../SmBiosMiscDxe/SmBiosMiscDxe.inf | 1 - Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 7 +- 30 files changed, 97 insertions(+), 1580 deletions(-) delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Include/Library/CpuIA3= 2.h delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/Cpu= IA32Lib.inf delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/Efi= CpuVersion.c delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA3= 2/CpuIA32.S delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA3= 2/CpuIA32.asm delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA3= 2/CpuIA32.c delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64= /Cpu.S delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64= /Cpu.asm copy Platform/Intel/Vlv2TbltDevicePkg/{PlatformPkgIA32.dsc =3D> PlatformPk= gGccIA32.dsc} (96%) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c b= /Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c index 72edc1bc1e..479ffa61a0 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c @@ -36,7 +36,6 @@ Abstract: #include #include #include -#include #include #include #include diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh b/Platform/Inte= l/Vlv2TbltDevicePkg/Build_IFWI.sh index 422e90ca6c..349f0c7ba7 100755 --- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh @@ -63,6 +63,10 @@ for (( i=3D1; i<=3D$#; )) Arch=3DX64 Build_Flags=3D"$Build_Flags /x64" shift + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/IA32" ]; then + Arch=3DIA32 + Build_Flags=3D"$Build_Flags /IA32" + shift elif [ "$1" =3D=3D "/nG" ]; then Stitch_Flags=3D"$Stitch_Flags /nG" shift diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Include/Guid/PlatformCpuInfo.= h b/Platform/Intel/Vlv2TbltDevicePkg/Include/Guid/PlatformCpuInfo.h index f1756662bd..eec167da3a 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Include/Guid/PlatformCpuInfo.h +++ b/Platform/Intel/Vlv2TbltDevicePkg/Include/Guid/PlatformCpuInfo.h @@ -1,12 +1,9 @@ /*++ =20 - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
- = =20 + Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent =20 - = =20 - - Module Name: =20 PlatformCpuInfo.h @@ -21,7 +18,6 @@ Abstract: #define _PLATFORM_CPU_INFO_GUID_H_ =20 #include "CpuType.h" -#include =20 #define EFI_PLATFORM_CPU_INFO_GUID \ {\ @@ -95,6 +91,14 @@ typedef struct { UINT8 HwCoordinationFeedback; // ECX [0] } EFI_CPU_POWER_MANAGEMENT; // CPUID.6.EAX =20 + +typedef struct { + UINT32 RegEax; + UINT32 RegEbx; + UINT32 RegEcx; + UINT32 RegEdx; +} EFI_CPUID_REGISTER; + // // IMPORTANT: Each CPU feature enabling entry is assumed a tri-state varia= ble. // - Keep the respective feature entry variable as default value (0x00) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/CpuIA32.h b/P= latform/Intel/Vlv2TbltDevicePkg/Include/Library/CpuIA32.h deleted file mode 100644 index 78c78319ce..0000000000 --- a/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/CpuIA32.h +++ /dev/null @@ -1,345 +0,0 @@ -/*++ - - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
- = =20 - SPDX-License-Identifier: BSD-2-Clause-Patent - - = =20 - - -Module Name: - - CpuIA32.h - -Abstract: - ---*/ - -#ifndef _CPU_IA32_H -#define _CPU_IA32_H - -typedef struct { - UINT32 RegEax; - UINT32 RegEbx; - UINT32 RegEcx; - UINT32 RegEdx; -} EFI_CPUID_REGISTER; - -typedef struct { - UINT32 HeaderVersion; - UINT32 UpdateRevision; - UINT32 Date; - UINT32 ProcessorId; - UINT32 Checksum; - UINT32 LoaderRevision; - UINT32 ProcessorFlags; - UINT32 DataSize; - UINT32 TotalSize; - UINT8 Reserved[12]; -} EFI_CPU_MICROCODE_HEADER; - -typedef struct { - UINT32 ExtendedSignatureCount; - UINT32 ExtendedTableChecksum; - UINT8 Reserved[12]; -} EFI_CPU_MICROCODE_EXTENDED_TABLE_HEADER; - -typedef struct { - UINT32 ProcessorSignature; - UINT32 ProcessorFlag; - UINT32 ProcessorChecksum; -} EFI_CPU_MICROCODE_EXTENDED_TABLE; - -typedef struct { - UINT32 Stepping : 4; - UINT32 Model : 4; - UINT32 Family : 4; - UINT32 Type : 2; - UINT32 Reserved1 : 2; - UINT32 ExtendedModel : 4; - UINT32 ExtendedFamily : 8; - UINT32 Reserved2 : 4; -} EFI_CPU_VERSION; - -#define EFI_CPUID_SIGNATURE 0x0 -#define EFI_CPUID_VERSION_INFO 0x1 -#define EFI_CPUID_CACHE_INFO 0x2 -#define EFI_CPUID_SERIAL_NUMBER 0x3 -#define EFI_CPUID_EXTENDED_FUNCTION 0x80000000 -#define EFI_CPUID_EXTENDED_CPU_SIG 0x80000001 -#define EFI_CPUID_BRAND_STRING1 0x80000002 -#define EFI_CPUID_BRAND_STRING2 0x80000003 -#define EFI_CPUID_BRAND_STRING3 0x80000004 - -#define EFI_MSR_IA32_PLATFORM_ID 0x17 -#define EFI_MSR_IA32_APIC_BASE 0x1B -#define EFI_MSR_EBC_HARD_POWERON 0x2A -#define EFI_MSR_EBC_SOFT_POWERON 0x2B -#define BINIT_DRIVER_DISABLE 0x40 -#define INTERNAL_MCERR_DISABLE 0x20 -#define INITIATOR_MCERR_DISABLE 0x10 -#define EFI_MSR_EBC_FREQUENCY_ID 0x2C -#define EFI_MSR_IA32_BIOS_UPDT_TRIG 0x79 -#define EFI_MSR_IA32_BIOS_SIGN_ID 0x8B -#define EFI_MSR_PSB_CLOCK_STATUS 0xCD -#define EFI_APIC_GLOBAL_ENABLE 0x800 -#define EFI_MSR_IA32_MISC_ENABLE 0x1A0 -#define LIMIT_CPUID_MAXVAL_ENABLE_BIT 0x00400000 -#define AUTOMATIC_THERMAL_CONTROL_ENABLE_BIT 0x00000008 -#define COMPATIBLE_FPU_OPCODE_ENABLE_BIT 0x00000004 -#define LOGICAL_PROCESSOR_PRIORITY_ENABLE_BIT 0x00000002 -#define FAST_STRING_ENABLE_BIT 0x00000001 - -#define EFI_CACHE_VARIABLE_MTRR_BASE 0x200 -#define EFI_CACHE_VARIABLE_MTRR_END 0x20F -#define EFI_CACHE_IA32_MTRR_DEF_TYPE 0x2FF -#define EFI_CACHE_MTRR_VALID 0x800 -#define EFI_CACHE_FIXED_MTRR_VALID 0x400 -#define EFI_CACHE_VALID_ADDRESS 0xFFFFFF000 -#define EFI_MSR_VALID_MASK 0xFFFFFFFFF -#define EFI_CACHE_VALID_EXTENDED_ADDRESS 0xFFFFFFFFFF000 -#define EFI_MSR_VALID_EXTENDED_MASK 0xFFFFFFFFFFFFF - -#define EFI_IA32_MTRR_FIX64K_00000 0x250 -#define EFI_IA32_MTRR_FIX16K_80000 0x258 -#define EFI_IA32_MTRR_FIX16K_A0000 0x259 -#define EFI_IA32_MTRR_FIX4K_C0000 0x268 -#define EFI_IA32_MTRR_FIX4K_C8000 0x269 -#define EFI_IA32_MTRR_FIX4K_D0000 0x26A -#define EFI_IA32_MTRR_FIX4K_D8000 0x26B -#define EFI_IA32_MTRR_FIX4K_E0000 0x26C -#define EFI_IA32_MTRR_FIX4K_E8000 0x26D -#define EFI_IA32_MTRR_FIX4K_F0000 0x26E -#define EFI_IA32_MTRR_FIX4K_F8000 0x26F - -#define EFI_IA32_MCG_CAP 0x179 -#define EFI_IA32_MCG_CTL 0x17B -#define EFI_IA32_MC0_CTL 0x400 -#define EFI_IA32_MC0_STATUS 0x401 - -#define EFI_IA32_PERF_STATUS 0x198 -#define EFI_IA32_PERF_CTL 0x199 - -#define EFI_CACHE_UNCACHEABLE 0 -#define EFI_CACHE_WRITECOMBINING 1 -#define EFI_CACHE_WRITETHROUGH 4 -#define EFI_CACHE_WRITEPROTECTED 5 -#define EFI_CACHE_WRITEBACK 6 - -// -// Combine f(FamilyId), m(Model), s(SteppingId) to a single 32 bit number -// -#define EfiMakeCpuVersion(f, m, s) \ - (((UINT32) (f) << 16) | ((UINT32) (m) << 8) | ((UINT32) (s))) - -/** - Halt the Cpu - - @param[in] None - - @retval None - -**/ -VOID -EFIAPI -EfiHalt ( - VOID - ); - -/** - Write back and invalidate the Cpu cache - - @param[in] None - - @retval None - -**/ -VOID -EFIAPI -EfiWbinvd ( - VOID - ); - -/** - Invalidate the Cpu cache - - @param[in] None - - @retval None - -**/ -VOID -EFIAPI -EfiInvd ( - VOID - ); - -/** - Get the Cpu info by execute the CPUID instruction - - @param[in] RegisterInEax The input value to put into register EAX - @param[in] Regs The Output value - - @retval None - -**/ -VOID -EFIAPI -EfiCpuid ( - IN UINT32 RegisterInEax, - OUT EFI_CPUID_REGISTER *Regs - ); - -/** - When RegisterInEax !=3D 4, the functionality is the same as EfiCpuid. - When RegisterInEax =3D=3D 4, the function return the deterministic cache - parameters by excuting the CPUID instruction. - - @param[in] RegisterInEax The input value to put into register EAX. - @param[in] CacheLevel The deterministic cache level. - @param[in] Regs The Output value. - - @retval None - -**/ -VOID -EFIAPI -EfiCpuidExt ( - IN UINT32 RegisterInEax, - IN UINT32 CacheLevel, - OUT EFI_CPUID_REGISTER *Regs - ); - -/** - Read Cpu MSR - - @param[in] Index The index value to select the register - - @retval Return the read data - -**/ -UINT64 -EFIAPI -EfiReadMsr ( - IN UINT32 Index - ); - -/** - Write Cpu MSR - - @param[in] Index The index value to select the register - @param[in] Value The value to write to the selected register - - @retval None - -**/ -VOID -EFIAPI -EfiWriteMsr ( - IN UINT32 Index, - IN UINT64 Value - ); - -/** - Read Time stamp - - @param[in] None - - @retval Return the read data - -**/ -UINT64 -EFIAPI -EfiReadTsc ( - VOID - ); - -/** - Writing back and invalidate the cache,then diable it - - @param[in] None - - @retval None - -**/ -VOID -EFIAPI -EfiDisableCache ( - VOID - ); - -/** - Invalidate the cache,then Enable it - - @param[in] None - - @retval None - -**/ -VOID -EFIAPI -EfiEnableCache ( - VOID - ); - -/** - Get Eflags - - @param[in] None - - @retval Return the Eflags value - -**/ -UINT32 -EFIAPI -EfiGetEflags ( - VOID - ); - -/** - Disable Interrupts - - @param[in] None - - @retval None - -**/ -VOID -EFIAPI -EfiDisableInterrupts ( - VOID - ); - -/** - Enable Interrupts - - @param[in] None - - @retval None - -**/ -VOID -EFIAPI -EfiEnableInterrupts ( - VOID - ); - -/** - Extract CPU detail version infomation - - @param[in] FamilyId FamilyId, including ExtendedFamilyId - @param[in] Model Model, including ExtendedModel - @param[in] SteppingId SteppingId - @param[in] Processor Processor - -**/ -VOID -EFIAPI -EfiCpuVersion ( - IN UINT16 *FamilyId, OPTIONAL - IN UINT8 *Model, OPTIONAL - IN UINT8 *SteppingId, OPTIONAL - IN UINT8 *Processor OPTIONAL - ); - -#endif diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib= .inf b/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf deleted file mode 100644 index c9f0a434ac..0000000000 --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf +++ /dev/null @@ -1,41 +0,0 @@ -# -# -# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved -# = =20 -# SPDX-License-Identifier: BSD-2-Clause-Patent - -# = =20 -# -# -# Module Name: -# -# CpuIA32Lib.inf -# -# Abstract: -# -# Component description file for the Cpu IA32 library. -# -#--*/ - -[defines] - INF_VERSION =3D 0x00010005 - BASE_NAME =3D CpuIA32Lib - FILE_GUID =3D 98546178-64F1-4d2e-814F-6BF963DB7930 - MODULE_TYPE =3D BASE - VERSION_STRING =3D 1.0 - LIBRARY_CLASS =3D CpuIA32Lib - PI_SPECIFICATION_VERSION =3D 0x0001000A - -[Sources] - EfiCpuVersion.c - -[Sources.IA32] - IA32/CpuIA32.c - -[Sources.X64] - X64/Cpu.asm - X64/Cpu.S - -[Packages] - MdePkg/MdePkg.dec - Vlv2TbltDevicePkg/PlatformPkg.dec diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/EfiCpuVers= ion.c b/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/EfiCpuVersion.c deleted file mode 100644 index 935f11e871..0000000000 --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/EfiCpuVersion.c +++ /dev/null @@ -1,70 +0,0 @@ -/** @file - - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
- = =20 - SPDX-License-Identifier: BSD-2-Clause-Patent - - = =20 - -Module Name: - - - EfiCpuVersion.c - -Abstract: - - Provide cpu version extract considering extended family & model ID. ---*/ - -#include - -/** - Extract CPU detail version infomation - - @param FamilyId FamilyId, including ExtendedFamilyId - @param Model Model, including ExtendedModel - @param SteppingId SteppingId - @param Processor Processor - -**/ -VOID -EFIAPI -EfiCpuVersion ( - IN OUT UINT16 *FamilyId, OPTIONAL - IN OUT UINT8 *Model, OPTIONAL - IN OUT UINT8 *SteppingId, OPTIONAL - IN OUT UINT8 *Processor OPTIONAL - ) - -{ - EFI_CPUID_REGISTER Register; - UINT8 TempFamilyId; - - EfiCpuid (EFI_CPUID_VERSION_INFO, &Register); - - if (SteppingId !=3D NULL) { - *SteppingId =3D (UINT8) (Register.RegEax & 0xF); - } - - if (Processor !=3D NULL) { - *Processor =3D (UINT8) ((Register.RegEax >> 12) & 0x3); - } - - if (Model !=3D NULL || FamilyId !=3D NULL) { - TempFamilyId =3D (UINT8) ((Register.RegEax >> 8) & 0xF); - - if (Model !=3D NULL) { - *Model =3D (UINT8) ((Register.RegEax >> 4) & 0xF); - if (TempFamilyId =3D=3D 0x6 || TempFamilyId =3D=3D 0xF) { - *Model =3D (UINT8) (*Model | ((Register.RegEax >> 12) & 0xF0)); - } - } - - if (FamilyId !=3D NULL) { - *FamilyId =3D TempFamilyId; - if (TempFamilyId =3D=3D 0xF) { - *FamilyId =3D (UINT8 ) (*FamilyId + (UINT16) ((Register.RegEax >> = 20) & 0xFF)); - } - } - } -} diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA= 32.S b/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.S deleted file mode 100644 index ba1bd448c0..0000000000 --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.S +++ /dev/null @@ -1,223 +0,0 @@ -# -# -# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved -# = =20 -# SPDX-License-Identifier: BSD-2-Clause-Patent - -# = =20 -# -# -#Module Name: -# -# CpuIA32.c -# -#Abstract: -# -#--*/ - -##include "CpuIA32.h" -#include "EfiBind.h" - -#-------------------------------------------------------------------------= -- - .586p: - #.MODEL flat,C - .code: - -#-------------------------------------------------------------------------= -- - -.globl ASM_PFX(EfiHalt) -.globl ASM_PFX(EfiWbinvd) -.globl ASM_PFX(EfiInvd) -.globl ASM_PFX(EfiCpuid) -.globl ASM_PFX(EfiReadMsr) -.globl ASM_PFX(EfiWriteMsr) -.globl ASM_PFX(EfiReadTsc) -.globl ASM_PFX(EfiDisableCache) -.globl ASM_PFX(EfiEnableCache) -.globl ASM_PFX(EfiGetEflags) -.globl ASM_PFX(EfiDisableInterrupts) -.globl ASM_PFX(EfiEnableInterrupts) -.globl ASM_PFX(EfiCpuidExt) - - -#VOID -#EfiHalt ( -# VOID -#) -ASM_PFX(EfiHalt): - hlt - ret -#EfiHalt ENDP - -#VOID -#EfiWbinvd ( -# VOID -#) -ASM_PFX(EfiWbinvd): - wbinvd - ret -#EfiWbinvd ENDP - -#VOID -#EfiInvd ( -# VOID -#) -ASM_PFX(EfiInvd): - invd - ret -#EfiInvd ENDP - -#VOID -#EfiCpuid (IN UINT32 RegisterInEax, -# OUT EFI_CPUID_REGISTER *Reg OPTIONAL) -ASM_PFX(EfiCpuid): - pushl %ebp - movl %esp, %ebp - pushl %ebx - pushl %esi - pushl %edi - pushal - - movl 8(%ebp), %eax #RegisterInEax - cpuid - cmpl $0, 0xC(%ebp) # Reg - je L1 - movl 0xC(%ebp), %edi # Reg - - movl %eax, (%edi) # Reg->RegEax - movl %ebx, 4(%edi) # Reg->RegEbx - movl %ecx, 8(%edi) # Reg->RegEcx - movl %edx, 0xC(%edi) # Reg->RegEdx - -L1: - popal - popl %edi - popl %esi - popl %ebx - popl %ebp - - ret -#EfiCpuid ENDP - - -#UINT64 -#EfiReadMsr ( -# IN UINT32 Index -# ); -ASM_PFX(EfiReadMsr): - movl 4(%esp), %ecx # Index - rdmsr - ret -#EfiReadMsr ENDP - -#VOID -#EfiWriteMsr ( -# IN UINT32 Index, -# IN UINT64 Value -# ); -ASM_PFX(EfiWriteMsr): - movl 4(%esp), %ecx # Index - movl 8(%esp), %eax # DWORD PTR Value[0] - movl 0xC(%esp), %edx # DWORD PTR Value[4] - wrmsr - ret -#EfiWriteMsr ENDP - -#UINT64 -#EfiReadTsc ( -# VOID -# ) -ASM_PFX(EfiReadTsc): - rdtsc - ret -#EfiReadTsc ENDP - -#VOID -#EfiDisableCache ( -# VOID -#) -ASM_PFX(EfiDisableCache): - movl %cr0, %eax - bswapl %eax - andb $0x60, %al - cmpb $0x60, %al - je L2 - movl %cr0, %eax - orl $0x60000000, %eax - movl %eax, %cr0 - wbinvd -L2: - ret -#EfiDisableCache ENDP - -#VOID -#EfiEnableCache ( -# VOID -# ) -ASM_PFX(EfiEnableCache): - wbinvd - movl %cr0, %eax - andl $0x9fffffff, %eax - movl %eax, %cr0 - ret -#EfiEnableCache ENDP - -#UINT32 -#EfiGetEflags ( -# VOID -# ) -ASM_PFX(EfiGetEflags): - pushfl - popl %eax - ret -#EfiGetEflags ENDP - -#VOID -#EfiDisableInterrupts ( -# VOID -# ) -ASM_PFX(EfiDisableInterrupts): - cli - ret -#EfiDisableInterrupts ENDP - -#VOID -#EfiEnableInterrupts ( -# VOID -# ) -ASM_PFX(EfiEnableInterrupts): - sti - ret -#EfiEnableInterrupts ENDP - -#VOID -#EfiCpuidExt ( -# IN UINT32 RegisterInEax, -# IN UINT32 CacheLevel, -# OUT EFI_CPUID_REGISTER *Regs -# ) -ASM_PFX(EfiCpuidExt): - push %ebx - push %edi - push %esi - pushal - - movl 0x30(%esp), %eax # RegisterInEax - movl 0x34(%esp), %ecx # CacheLevel - cpuid - movl 0x38(%esp), %edi # DWORD PTR Regs - - movl %eax, (%edi) # Reg->RegEax - movl %ebx, 4(%edi) # Reg->RegEbx - movl %ecx, 8(%edi) # Reg->RegEcx - movl %edx, 0xC(%edi) # Reg->RegEdx - - popal - pop %esi - pop %edi - pop %ebx - ret -#EfiCpuidExt ENDP - - - diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA= 32.asm b/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.a= sm deleted file mode 100644 index 3fdf16f8ee..0000000000 --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.asm +++ /dev/null @@ -1,206 +0,0 @@ -; -; This file contains an 'Intel Sample Driver' and is -; licensed for Intel CPUs and chipsets under the terms of your -; license agreement with Intel or your vendor. This file may -; be modified by the user, subject to additional terms of the -; license agreement -; -; -; Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved -; = =20 -; SPDX-License-Identifier: BSD-2-Clause-Patent - -; = =20 -; - -;Module Name: -; -; CpuIA32.c -; -;Abstract: -; -;--*/ - -;#include "CpuIA32.h" - -;-------------------------------------------------------------------------= -- - .586p - .model flat,C - .code - -;-------------------------------------------------------------------------= -- -;VOID -;EfiHalt ( -; VOID -;) -EfiHalt PROC C PUBLIC - hlt - ret -EfiHalt ENDP - -;VOID -;EfiWbinvd ( -; VOID -;) -EfiWbinvd PROC C PUBLIC - wbinvd - ret -EfiWbinvd ENDP - -;VOID -;EfiInvd ( -; VOID -;) -EfiInvd PROC C PUBLIC - invd - ret -EfiInvd ENDP - -;VOID -;EfiCpuid (IN UINT32 RegisterInEax, -; OUT EFI_CPUID_REGISTER *Reg OPTIONAL) -EfiCpuid PROC C PUBLIC - push ebp - mov ebp, esp - push ebx - push esi - push edi - pushad - - mov eax, dword ptr[ebp + 8] ;egisterInEax - cpuid - cmp dword ptr[ebp + 0Ch], 0 ; Reg - je @F - mov edi,dword ptr [ebp+0Ch] ; Reg - - mov dword ptr [edi],eax ; Reg->RegEax - mov dword ptr [edi+4],ebx ; Reg->RegEbx - mov dword ptr [edi+8],ecx ; Reg->RegEcx - mov dword ptr [edi+0Ch],edx ; Reg->RegEdx - -@@: - popad - pop edi - pop esi - pop ebx - pop ebp - - ret -EfiCpuid ENDP - - -;UINT64 -;EfiReadMsr ( -; IN UINT32 Index -; ); -EfiReadMsr PROC C PUBLIC - mov ecx, dword ptr [esp + 4]; Index - rdmsr - ret -EfiReadMsr ENDP - -;VOID -;EfiWriteMsr ( -; IN UINT32 Index, -; IN UINT64 Value -; ); -EfiWriteMsr PROC C PUBLIC - mov ecx, dword ptr [esp+4]; Index - mov eax, dword ptr [esp+8]; DWORD PTR Value[0] - mov edx, dword ptr [esp+0Ch]; DWORD PTR Value[4] - wrmsr - ret -EfiWriteMsr ENDP - -;UINT64 -;EfiReadTsc ( -; VOID -; ) -EfiReadTsc PROC C PUBLIC - rdtsc - ret -EfiReadTsc ENDP - -;VOID -;EfiDisableCache ( -; VOID -;) -EfiDisableCache PROC C PUBLIC - mov eax, cr0 - bswap eax - and al, 60h - cmp al, 60h - je @F - mov eax, cr0 - or eax, 060000000h - mov cr0, eax - wbinvd -@@: - ret -EfiDisableCache ENDP - -;VOID -;EfiEnableCache ( -; VOID -; ) -EfiEnableCache PROC C PUBLIC - wbinvd - mov eax, cr0 - and eax, 09fffffffh - mov cr0, eax - ret -EfiEnableCache ENDP - -;UINT32 -;EfiGetEflags ( -; VOID -; ) -EfiGetEflags PROC C PUBLIC - pushfd - pop eax - ret -EfiGetEflags ENDP - -;VOID -;EfiDisableInterrupts ( -; VOID -; ) -EfiDisableInterrupts PROC C PUBLIC - cli - ret -EfiDisableInterrupts ENDP - -;VOID -;EfiEnableInterrupts ( -; VOID -; ) -EfiEnableInterrupts PROC C PUBLIC - sti - ret -EfiEnableInterrupts ENDP - -;VOID -;EfiCpuidExt ( -; IN UINT32 RegisterInEax, -; IN UINT32 CacheLevel, -; OUT EFI_CPUID_REGISTER *Regs -; ) -EfiCpuidExt PROC C PUBLIC USES ebx edi esi - pushad - - mov eax, dword ptr [esp + 30h] ; RegisterInEax - mov ecx, dword ptr [esp + 34h] ; CacheLevel - cpuid - mov edi, dword ptr [esp + 38h] ; DWORD PTR Regs - - mov dword ptr [edi], eax ; Reg->RegEax - mov dword ptr [edi + 4], ebx ; Reg->RegEbx - mov dword ptr [edi + 8], ecx ; Reg->RegEcx - mov dword ptr [edi + 0Ch], edx ; Reg->RegEdx - - popad - ret -EfiCpuidExt ENDP - - END - diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA= 32.c b/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.c deleted file mode 100644 index cb8de2f9c7..0000000000 --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.c +++ /dev/null @@ -1,177 +0,0 @@ -/** @file - - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
- = =20 - SPDX-License-Identifier: BSD-2-Clause-Patent - - = =20 - -Module Name: - - - CpuIA32.c - -Abstract: - ---*/ - -#include - -VOID -EfiHalt (VOID) -{ - __asm { - hlt - } -} - -VOID -EfiWbinvd (VOID) -{ - __asm { - wbinvd - } -} - -VOID -EfiInvd (VOID) -{ - __asm { - invd - } -} - -VOID -EfiCpuid (IN UINT32 RegisterInEax, - OUT EFI_CPUID_REGISTER *Reg OPTIONAL) -{ - __asm { - pushad - - mov eax, RegisterInEax - cpuid - cmp Reg, 0 - je _Exit - mov edi, DWORD PTR Reg - - mov DWORD PTR [edi].RegEax, eax ; Reg->RegEax - mov DWORD PTR [edi].RegEbx, ebx ; Reg->RegEbx - mov DWORD PTR [edi].RegEcx, ecx ; Reg->RegEcx - mov DWORD PTR [edi].RegEdx, edx ; Reg->RegEdx - -_Exit: - popad - } -} - -UINT64 -EfiReadMsr (IN UINT32 Index) -{ - __asm { - mov ecx, Index - rdmsr - } -} - -VOID -EfiWriteMsr ( - IN UINT32 Index, - IN UINT64 Value - ) -{ - __asm { - mov ecx, Index - mov eax, DWORD PTR Value[0] - mov edx, DWORD PTR Value[4] - wrmsr - } -} - -UINT64 -EfiReadTsc (VOID) -{ - __asm { - rdtsc - } -} - -VOID -EfiDisableCache (VOID) -{ - __asm { - mov eax, cr0 - bswap eax - and al, 60h - cmp al, 60h - je Exit - mov eax, cr0 - or eax, 060000000h - mov cr0, eax - wbinvd -Exit: - } -} - -VOID -EfiEnableCache (VOID) -{ - __asm { - wbinvd - mov eax, cr0 - and eax, 09fffffffh - mov cr0, eax - } -} - -UINT32 -EfiGetEflags ( - VOID - ) -{ - __asm { - pushfd - pop eax - } -} - -VOID -EfiDisableInterrupts (VOID) -{ - __asm { - cli - } -} - -VOID -EfiEnableInterrupts ( - VOID - ) -{ - __asm { - sti - } -} - -VOID -EfiCpuidExt ( - IN UINT32 RegisterInEax, - IN UINT32 CacheLevel, - OUT EFI_CPUID_REGISTER *Regs - ) -{ - __asm { - pushad - - mov eax, RegisterInEax - mov ecx, CacheLevel - cpuid - mov edi, DWORD PTR Regs - - mov DWORD PTR [edi].RegEax, eax ; Reg->RegEax - mov DWORD PTR [edi].RegEbx, ebx ; Reg->RegEbx - mov DWORD PTR [edi].RegEcx, ecx ; Reg->RegEcx - mov DWORD PTR [edi].RegEdx, edx ; Reg->RegEdx - - popad - } -} diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.S = b/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.S deleted file mode 100644 index 3a8d6e6bc5..0000000000 --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.S +++ /dev/null @@ -1,207 +0,0 @@ -# -# -# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved -# = =20 -# SPDX-License-Identifier: BSD-2-Clause-Patent - -# = =20 -# -# -#* Module Name: -#* -#* Cpu.asm -#* -#* Abstract: -#* -#-------------------------------------------------------------------------= ----- -##include - -.globl ASM_PFX(EfiHalt) -.globl ASM_PFX(EfiWbinvd) -.globl ASM_PFX(EfiInvd) -.globl ASM_PFX(EfiCpuid) -.globl ASM_PFX(EfiReadTsc) -.globl ASM_PFX(EfiDisableCache) -.globl ASM_PFX(EfiEnableCache) -.globl ASM_PFX(EfiReadMsr) -.globl ASM_PFX(EfiWriteMsr) -.globl ASM_PFX(EfiGetEflags) -.globl ASM_PFX(EfiDisableInterrupts) -.globl ASM_PFX(EfiEnableInterrupts) -.globl ASM_PFX(EfiCpuidExt) - -.text - - -#-------------------------------------------------------------------------= ----- -# VOID -# EfiHalt ( -# VOID -# ) -#-------------------------------------------------------------------------= ----- -ASM_PFX(EfiHalt): - hlt - retq - - -#-------------------------------------------------------------------------= ----- -# VOID -# EfiWbinvd ( -# VOID -# ) -#-------------------------------------------------------------------------= ----- -ASM_PFX(EfiWbinvd): - wbinvd - retq - - -#-------------------------------------------------------------------------= ----- -# VOID -# EfiInvd ( -# VOID -# ) -#-------------------------------------------------------------------------= ----- -ASM_PFX(EfiInvd): - invd - retq - -#-------------------------------------------------------------------------= ----- -# VOID -# EfiCpuid ( -# IN UINT32 RegisterInEax, // rcx -# OUT EFI_CPUID_REGISTER *Reg OPTIONAL // rdx -# ) -#-------------------------------------------------------------------------= ----- -ASM_PFX(EfiCpuid): - push %rbx - mov %rdx,%r8 - mov %rcx,%rax - cpuid - cmp $0x0,%r8 - je _Exit - mov %eax,(%r8) - mov %ebx,0x4(%r8) - mov %ecx,0x8(%r8) - mov %edx,0xc(%r8) -_Exit: - pop %rbx - retq - -#-------------------------------------------------------------------------= ----- -# UINT64 -# EfiReadMsr ( -# IN UINT32 Index, // rcx -# ) -#-------------------------------------------------------------------------= ----- -ASM_PFX(EfiReadMsr): - rdmsr - shl $0x20,%rdx - or %rdx,%rax - retq - -#-------------------------------------------------------------------------= ----- -# VOID -# EfiWriteMsr ( -# IN UINT32 Index, // rcx -# IN UINT64 Value // rdx -# ) -#-------------------------------------------------------------------------= ----- -ASM_PFX(EfiWriteMsr): - mov %rdx,%rax - sar $0x20,%rdx - wrmsr - retq - -#-------------------------------------------------------------------------= ----- -# UINT64 -# EfiReadTsc ( -# VOID -# ); -#-------------------------------------------------------------------------= ----- -ASM_PFX(EfiReadTsc): - rdtsc - shl $0x20,%rax - shrd $0x20,%rdx,%rax - retq - -#-------------------------------------------------------------------------= ----- -# VOID -# EfiDisableCache ( -# VOID -# ); -#-------------------------------------------------------------------------= ----- -ASM_PFX(EfiDisableCache): -# added a check to see if cache is already disabled. If it is, then skip. - mov %cr0,%rax - and $0x60000000,%rax - cmp $0x0,%rax - jne 1f - mov %cr0,%rax - or $0x60000000,%rax - mov %rax,%cr0 - wbinvd -1: - retq - -#-------------------------------------------------------------------------= ----- -# VOID -# EfiEnableCache ( -# VOID -# ); -#-------------------------------------------------------------------------= ----- -ASM_PFX(EfiEnableCache): - wbinvd - mov %cr0,%rax - and $0xffffffff9fffffff,%rax - mov %rax,%cr0 - retq - -#-------------------------------------------------------------------------= ----- -# UINTN -# EfiGetEflags ( -# VOID -# ); -#-------------------------------------------------------------------------= ----- -ASM_PFX(EfiGetEflags): - pushfq - pop %rax - retq - -#-------------------------------------------------------------------------= ----- -# VOID -# EfiDisableInterrupts ( -# VOID -# ); -#-------------------------------------------------------------------------= ----- -ASM_PFX(EfiDisableInterrupts): - cli - ret - -#-------------------------------------------------------------------------= ----- -# VOID -# EfiEnableInterrupts ( -# VOID -# ); -#-------------------------------------------------------------------------= ----- -ASM_PFX(EfiEnableInterrupts): - sti - ret -#-------------------------------------------------------------------------= ----- -# VOID -# EfiCpuidExt ( -# IN UINT32 RegisterInEax, -# IN UINT32 CacheLevel, -# OUT EFI_CPUID_REGISTER *Regs -# ) -#-------------------------------------------------------------------------= ----- -ASM_PFX(EfiCpuidExt): - push %rbx - mov %rcx,%rax - mov %rdx,%rcx - cpuid - mov %eax,(%r8) - mov %ebx,0x4(%r8) - mov %ecx,0x8(%r8) - mov %edx,0xc(%r8) - pop %rbx - retq diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.as= m b/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.asm deleted file mode 100644 index 44aae7de64..0000000000 --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.asm +++ /dev/null @@ -1,222 +0,0 @@ - -TITLE Cpu.asm: Assembly code for the x64 resources - -; -; This file contains an 'Intel Sample Driver' and is -; licensed for Intel CPUs and chipsets under the terms of your -; license agreement with Intel or your vendor. This file may -; be modified by the user, subject to additional terms of the -; license agreement -; -; -; Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved -; = =20 -; SPDX-License-Identifier: BSD-2-Clause-Patent - -; = =20 -; -; -; -; -;* Module Name: -;* -;* Cpu.asm -;* -;* Abstract: -;* -;-------------------------------------------------------------------------= ----- - -text SEGMENT - - -;-------------------------------------------------------------------------= ----- -; VOID -; EfiHalt ( -; VOID -; ) -;-------------------------------------------------------------------------= ----- -EfiHalt PROC PUBLIC - hlt - ret -EfiHalt ENDP - - -;-------------------------------------------------------------------------= ----- -; VOID -; EfiWbinvd ( -; VOID -; ) -;-------------------------------------------------------------------------= ----- -EfiWbinvd PROC PUBLIC - wbinvd - ret -EfiWbinvd ENDP - - -;-------------------------------------------------------------------------= ----- -; VOID -; EfiInvd ( -; VOID -; ) -;-------------------------------------------------------------------------= ----- -EfiInvd PROC PUBLIC - invd - ret -EfiInvd ENDP - -;-------------------------------------------------------------------------= ----- -; VOID -; EfiCpuid ( -; IN UINT32 RegisterInEax, // rcx -; OUT EFI_CPUID_REGISTER *Reg OPTIONAL // rdx -; ) -;-------------------------------------------------------------------------= ----- -EfiCpuid PROC PUBLIC - push rbx - - mov r8, rdx ; r8 =3D *Reg - mov rax, rcx ; RegisterInEax - cpuid - cmp r8, 0 - je _Exit - mov [r8 + 0], eax ; Reg->RegEax - mov [r8 + 4], ebx ; Reg->RegEbx - mov [r8 + 8], ecx ; Reg->RegEcx - mov [r8 + 12], edx ; Reg->RegEdx - -_Exit: - pop rbx - ret -EfiCpuid ENDP - -;-------------------------------------------------------------------------= ----- -; UINT64 -; EfiReadMsr ( -; IN UINT32 Index, // rcx -; ) -;-------------------------------------------------------------------------= ----- -EfiReadMsr PROC PUBLIC - rdmsr - sal rdx, 32 ; edx:eax -> rax - or rax, rdx ; rax =3D edx:eax - ret -EfiReadMsr ENDP - -;-------------------------------------------------------------------------= ----- -; VOID -; EfiWriteMsr ( -; IN UINT32 Index, // rcx -; IN UINT64 Value // rdx -; ) -;-------------------------------------------------------------------------= ----- -EfiWriteMsr PROC PUBLIC - mov rax, rdx ; rdx =3D Value - sar rdx, 32 ; convert rdx to edx upper 32-bits - wrmsr ; wrmsr[ecx] result =3D edx:eax - ret -EfiWriteMsr ENDP - - -;-------------------------------------------------------------------------= ----- -; UINT64 -; EfiReadTsc ( -; VOID -; ); -;-------------------------------------------------------------------------= ----- -EfiReadTsc PROC PUBLIC - rdtsc - shl rax, 32 - shrd rax, rdx, 32 - ret -EfiReadTsc ENDP - -;-------------------------------------------------------------------------= ----- -; VOID -; EfiDisableCache ( -; VOID -; ); -;-------------------------------------------------------------------------= ----- -EfiDisableCache PROC PUBLIC -; added a check to see if cache is already disabled. If it is, then skip. - mov rax, cr0 - and rax, 060000000h - cmp rax, 0 - jne @f - mov rax, cr0 - or rax, 060000000h - mov cr0, rax - wbinvd -@@: - ret -EfiDisableCache ENDP - -;-------------------------------------------------------------------------= ----- -; VOID -; EfiEnableCache ( -; VOID -; ); -;-------------------------------------------------------------------------= ----- -EfiEnableCache PROC PUBLIC - wbinvd - mov rax, cr0 - and rax, 09fffffffh - mov cr0, rax - ret -EfiEnableCache ENDP - -;-------------------------------------------------------------------------= ----- -; UINTN -; EfiGetEflags ( -; VOID -; ); -;-------------------------------------------------------------------------= ----- -EfiGetEflags PROC PUBLIC - pushfq - pop rax - ret -EfiGetEflags ENDP - -;-------------------------------------------------------------------------= ----- -; VOID -; EfiDisableInterrupts ( -; VOID -; ); -;-------------------------------------------------------------------------= ----- -EfiDisableInterrupts PROC PUBLIC - cli - ret -EfiDisableInterrupts ENDP - -;-------------------------------------------------------------------------= ----- -; VOID -; EfiEnableInterrupts ( -; VOID -; ); -;-------------------------------------------------------------------------= ----- -EfiEnableInterrupts PROC PUBLIC - sti - ret -EfiEnableInterrupts ENDP -;-------------------------------------------------------------------------= ----- -; VOID -; EfiCpuidExt ( -; IN UINT32 RegisterInEax, -; IN UINT32 CacheLevel, -; OUT EFI_CPUID_REGISTER *Regs -; ) -;-------------------------------------------------------------------------= ----- -EfiCpuidExt PROC PUBLIC - push rbx - mov rax, rcx ; rax =3D RegisterInEax - mov rcx, rdx ; rcx =3D CacheLevel - - cpuid - mov [r8 + 0 ], eax ; Reg->RegEax - mov [r8 + 4 ], ebx ; Reg->RegEbx - mov [r8 + 8 ], ecx ; Reg->RegEcx - mov [r8 + 12], edx ; Reg->RegEdx - - pop rbx - ret -EfiCpuidExt ENDP -END diff --git a/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode= .inf b/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf index c5e3cf4d55..f1e8c7f639 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf @@ -58,7 +58,6 @@ [Pcd] gEfiSerialPortTokenSpaceGuid.PcdStatusCodeUseRam =20 [Guids] - gEfiPlatformCpuInfoGuid gEfiStatusCodeDataTypeStringGuid ## CONSUMES =20 [Depex] diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/MemoryCallbac= k.c b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/MemoryCallback.c index 074bf7debb..61ecc52cb5 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/MemoryCallback.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/MemoryCallback.c @@ -124,7 +124,8 @@ MemoryDiscoveredPpiNotifyCallback ( { EFI_STATUS Status; EFI_BOOT_MODE BootMode; - EFI_CPUID_REGISTER FeatureInfo; + UINT32 MaximumExtendedFunction; + CPUID_VIR_PHY_ADDRESS_SIZE_EAX Eax; UINT8 CpuAddressWidth; UINT16 Pm1Cnt; EFI_PEI_HOB_POINTERS Hob; @@ -279,10 +280,10 @@ MemoryDiscoveredPpiNotifyCallback ( // Create a CPU hand-off information // CpuAddressWidth =3D 32; - AsmCpuid (EFI_CPUID_EXTENDED_FUNCTION, &FeatureInfo.RegEax, &FeatureInfo= .RegEbx, &FeatureInfo.RegEcx, &FeatureInfo.RegEdx); - if (FeatureInfo.RegEax >=3D EFI_CPUID_VIRT_PHYS_ADDRESS_SIZE) { - AsmCpuid (EFI_CPUID_VIRT_PHYS_ADDRESS_SIZE, &FeatureInfo.RegEax, &Feat= ureInfo.RegEbx, &FeatureInfo.RegEcx, &FeatureInfo.RegEdx); - CpuAddressWidth =3D (UINT8) (FeatureInfo.RegEax & 0xFF); + AsmCpuid (CPUID_EXTENDED_FUNCTION, &MaximumExtendedFunction, NULL, NULL,= NULL); + if (MaximumExtendedFunction >=3D CPUID_VIR_PHY_ADDRESS_SIZE) { + AsmCpuid (CPUID_VIR_PHY_ADDRESS_SIZE, &Eax.Uint32, NULL, NULL, NULL); + CpuAddressWidth =3D (UINT8) (Eax.Bits.PhysicalAddressBits); } =20 BuildCpuHob(CpuAddressWidth, 16); diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarly= Init.h b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit= .h index 6a2ecf8fb4..8c02adba64 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h @@ -53,7 +53,7 @@ Abstract: #include #include #include -#include +#include =20 #include #include @@ -95,8 +95,6 @@ Abstract: #define SMBIOS_WAKEUP_TYPE_PCI_PME 0x07 #define SMBIOS_WAKEUP_TYPE_AC_POWER_RESTORED 0x08 =20 -#define EFI_CPUID_VIRT_PHYS_ADDRESS_SIZE 0x80000008 - // // Defines for stall ppi // diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitP= ei.inf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.i= nf index eeb9a4a023..8350cf47b7 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf @@ -78,7 +78,6 @@ [Guids] gEfiSetupVariableGuid gEfiPlatformInfoGuid gEfiPlatformBootModeGuid - gEfiPlatformCpuInfoGuid gEfiGlobalVariableGuid gRecoveryOnFatFloppyDiskGuid gRecoveryOnFatUsbDiskGuid diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf b= /Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf index d3969f2344..aac93b0b90 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf @@ -100,7 +100,6 @@ [Guids] gEfiSetupVariableGuid gEfiPlatformInfoGuid gEfiPlatformBootModeGuid - gEfiPlatformCpuInfoGuid gEfiGlobalVariableGuid gRecoveryOnFatFloppyDiskGuid gRecoveryOnFatUsbDiskGuid diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platfor= m/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc similarity index 96% copy from Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc copy to Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc index dc6d8b1b26..7993ee5758 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc @@ -42,7 +42,7 @@ [Defines] DEFINE DXE_ARCHITECTURE =3D IA32 !endif =20 - FLASH_DEFINITION =3D Vlv2TbltDevicePkg/PlatformPkg.fdf + FLASH_DEFINITION =3D Vlv2TbltDevicePkg/PlatformPkgGcc= .fdf !if $(LFMA_ENABLE) =3D=3D TRUE FIX_LOAD_TOP_MEMORY_ADDRESS =3D 0xFFFFFFFFFFFFFFFF DEFINE TOP_MEMORY_ADDRESS =3D 0xFFFFFFFFFFFFFFFF @@ -220,7 +220,6 @@ [LibraryClasses.common] !endif =20 BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf - CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf =20 StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf =20 @@ -770,7 +769,7 @@ [Components.IA32] !if $(RC_BINARY_RELEASE) =3D=3D TRUE Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf { - *_*_IA32_CC_FLAGS =3D /DRC_BINARY_RELEASE + *_*_IA32_CC_FLAGS =3D -DRC_BINARY_RELEASE !if $(TARGET) =3D=3D DEBUG gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E @@ -1245,14 +1244,14 @@ [BuildOptions] DEFINE MINNOW2_FSP_OPTION =3D =20 !if $(ENBDT_PF_BUILD) =3D=3D TRUE - DEFINE ENBDT_PF_ENABLE =3D /DENBDT_PF_ENABLE=3D1 + DEFINE ENBDT_PF_ENABLE =3D -DENBDT_PF_ENABLE=3D1 !else - DEFINE ENBDT_PF_ENABLE =3D /DENBDT_PF_ENABLE=3D0 + DEFINE ENBDT_PF_ENABLE =3D -DENBDT_PF_ENABLE=3D0 !endif =20 =20 !if $(CLKGEN_CONFIG_EXTRA_ENABLE) =3D=3D TRUE - DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =3D /DCLKGEN_CONFIG_EXTRA=3D1 + DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =3D -DCLKGEN_CONFIG_EXTRA=3D1 !else DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =3D !endif @@ -1260,29 +1259,29 @@ [BuildOptions] =20 =20 !if $(PCIESC_ENABLE) =3D=3D TRUE - DEFINE PCIESC_SUPPORT_BUILD_OPTION =3D /DPCIESC_SUPPORT=3D1 + DEFINE PCIESC_SUPPORT_BUILD_OPTION =3D -DPCIESC_SUPPORT=3D1 !else DEFINE PCIESC_SUPPORT_BUILD_OPTION =3D !endif !if $(SATA_ENABLE) =3D=3D TRUE - DEFINE SATA_SUPPORT_BUILD_OPTION =3D /DSATA_SUPPORT=3D1 + DEFINE SATA_SUPPORT_BUILD_OPTION =3D -DSATA_SUPPORT=3D1 !else DEFINE SATA_SUPPORT_BUILD_OPTION =3D !endif !if $(ENBDT_S3_SUPPORT) =3D=3D TRUE - DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D /DNOCS_S3_SUPPORT + DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D -DNOCS_S3_SUPPORT !else DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D !endif =20 !if $(X64_CONFIG) =3D=3D TRUE - DEFINE X64_BUILD_ENABLE =3D /DX64_BUILD_ENABLE=3D1 + DEFINE X64_BUILD_ENABLE =3D -DX64_BUILD_ENABLE=3D1 !else DEFINE X64_BUILD_ENABLE =3D !endif =20 !if $(TPM_ENABLED) =3D=3D TRUE - DEFINE DSC_TPM_BUILD_OPTIONS =3D /DTPM_ENABLED + DEFINE DSC_TPM_BUILD_OPTIONS =3D -DTPM_ENABLED !else DEFINE DSC_TPM_BUILD_OPTIONS =3D !endif @@ -1293,13 +1292,12 @@ [BuildOptions] DEFINE PDB_BUILD_OPTION =3D /Zi !endif =20 + GCC:*_*_*_CC_FLAGS =3D -Wno-missing-braces !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE MSFT:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable GCC:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable INTEL:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable -!if $(TARGET) =3D=3D DEBUG - DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =3D /Od /Oy- -!endif + DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =3D !else DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =3D =20 @@ -1322,7 +1320,7 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptio= ns.common.EDKII.SMM_CORE] GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 =20 [BuildOptions.Common.EDKII] - *_*_IA32_ASM_FLAGS =3D $(VP_BUILD_OPTIONS) /D EDKII_GLUE_PciExpressB= aseAddress=3D$(PLATFORM_PCIEXPRESS_BASE)h /DNOCS_S3_SUPPORT + *_*_IA32_ASM_FLAGS =3D $(VP_BUILD_OPTIONS) -D EDKII_GLUE_PciExpressB= aseAddress=3D$(PLATFORM_PCIEXPRESS_BASE)h -DNOCS_S3_SUPPORT =20 *_*_IA32_CC_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) *_*_IA32_VFRPP_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platf= orm/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index 26c1caad94..ee0d055d64 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -222,7 +222,6 @@ [LibraryClasses.common] !endif =20 BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf - CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf =20 StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf =20 diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platfor= m/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index dc6d8b1b26..62ca4f67cc 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -220,7 +220,6 @@ [LibraryClasses.common] !endif =20 BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf - CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf =20 StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf =20 diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform= /Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index cbc87aa9be..282ff3c2e2 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -222,7 +222,6 @@ [LibraryClasses.common] !endif =20 BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf - CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf =20 StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf =20 diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetu= pDxe.h b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe= .h index b4a30511ac..1876977e4d 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.h +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.h @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetu= pDxe.inf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupD= xe.inf index 8ff246041d..ce92b9241a 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf @@ -61,6 +61,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec SecurityPkg/SecurityPkg.dec + UefiCpuPkg/UefiCpuPkg.dec BoardModulePkg/BoardModulePkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec #for PchAccess.h @@ -79,7 +80,6 @@ [LibraryClasses] UefiRuntimeServicesTableLib PrintLib BiosIdLib - CpuIA32Lib IoLib HobLib =20 diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRec= ords.c b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords= .c index be99356d0f..1770d0de42 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c @@ -27,6 +27,8 @@ Revision History: #include #include #include +#include +#include =20 #include "Valleyview.h" #include "VlvAccess.h" @@ -74,7 +76,6 @@ SB_REV SBRevisionTable[] =3D { #define PREFIX_ZERO 0x20 =20 #define ICH_REG_REV 0x08 -#define MSR_IA32_PLATFORM_ID 0x17 =20 =20 BOOLEAN mSetupInfoDone =3D FALSE; @@ -495,7 +496,7 @@ UpdateAdditionalInformation ( GetOptionalStringByIndex ((CHAR8*)((UINT8*)Type4Record + Type4Record= ->Hdr.Length), StrIndex, &ProcessorVersion); HiiSetString (mHiiHandle, STR_PROCESSOR_VERSION_VALUE, ProcessorVers= ion, NULL); =20 - MicrocodeRevision =3D (UINT32) RShiftU64 (AsmReadMsr64 (EFI_MSR_IA32= _BIOS_SIGN_ID), 32); + MicrocodeRevision =3D (UINT32) RShiftU64 (AsmReadMsr64 (MSR_IA32_BIO= S_SIGN_ID), 32); UnicodeSPrint (NewString, sizeof (NewString), L"%8x", MicrocodeRevis= ion); HiiSetString (mHiiHandle, STR_PROCESSOR_MICROCODE_VALUE, NewString, = NULL); } @@ -590,22 +591,29 @@ VOID UpdateCPUInformation () { CHAR16 Buffer[40]; - UINT16 FamilyId; - UINT8 Model; - UINT8 SteppingId; - UINT8 ProcessorType; + UINT32 FamilyId; + UINT32 Model; + UINT32 SteppingId; EFI_STATUS Status; EFI_MP_SERVICES_PROTOCOL *MpService; UINTN MaximumNumberOfCPUs; UINTN NumberOfEnabledCPUs; UINT32 Buffer32 =3D 0xFFFFFFFF; // Keep buffer with unknown dev= ice + CPUID_VERSION_INFO_EAX Eax; + CPUID_VERSION_INFO_EBX Ebx; + CPUID_VERSION_INFO_ECX Ecx; + CPUID_VERSION_INFO_EDX Edx; =20 - EfiCpuVersion (&FamilyId, &Model, &SteppingId, &ProcessorType); - - // - //we need raw Model data - // - Model =3D Model & 0xf; + AsmCpuid (CPUID_VERSION_INFO, &Eax.Uint32, &Ebx.Uint32, &Ecx.Uint32, &Ed= x.Uint32); + FamilyId =3D Eax.Bits.FamilyId; + if (Eax.Bits.FamilyId =3D=3D 0x0F) { + FamilyId |=3D (Eax.Bits.ExtendedFamilyId << 4); + } + Model =3D Eax.Bits.Model; + if (Eax.Bits.FamilyId =3D=3D 0x06 || Eax.Bits.FamilyId =3D=3D 0x0f) { + Model |=3D (Eax.Bits.ExtendedModelId << 4); + } + SteppingId =3D Eax.Bits.SteppingId; =20 // //Family/Model/Step @@ -633,7 +641,7 @@ UpdateCPUInformation () // // Update Mobile / Desktop / Tablet SKU // - Buffer32 =3D(UINT32) RShiftU64 (EfiReadMsr (MSR_IA32_PLATFORM_ID), 50) &= 0x07; + Buffer32 =3D(UINT32) RShiftU64 (AsmReadMsr64 (MSR_IA32_PLATFORM_ID), 50)= & 0x07; =20 switch(Buffer32){ case 0x0: @@ -903,7 +911,7 @@ UpdatePlatformInformation ( // VLV-QC Desktop 010 // VLV-QC Notebook 011 // - CpuFlavor =3D RShiftU64 (EfiReadMsr (MSR_IA32_PLATFORM_ID), 50) & 0x07; + CpuFlavor =3D RShiftU64 (AsmReadMsr64 (MSR_IA32_PLATFORM_ID), 50) & 0x07; =20 switch(CpuFlavor){ case 0x0: @@ -1038,9 +1046,9 @@ UpdatePlatformInformation ( // // Microcode Revision // - EfiWriteMsr (EFI_MSR_IA32_BIOS_SIGN_ID, 0); - EfiCpuid (EFI_CPUID_VERSION_INFO, NULL); - MicroCodeVersion =3D (UINT32) RShiftU64 (EfiReadMsr (EFI_MSR_IA32_BIOS_S= IGN_ID), 32); + AsmWriteMsr64 (MSR_IA32_BIOS_SIGN_ID, 0); + AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, NULL, NULL); + MicroCodeVersion =3D (UINT32) RShiftU64 (AsmReadMsr64 (MSR_IA32_BIOS_SIG= N_ID), 32); UnicodeSPrint (Buffer, sizeof (Buffer), L"%x", MicroCodeVersion); HiiSetString(mHiiHandle,STRING_TOKEN(STR_PROCESSOR_MICROCODE_VALUE), Buf= fer, NULL); =20 diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c b/Platf= orm/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c index 3583e324e6..4fd618a9a6 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c @@ -18,15 +18,12 @@ Abstract: #include #include #include -#include +#include +#include =20 #include #include =20 -#define EFI_CPUID_FAMILY 0x0F00 -#define EFI_CPUID_MODEL 0x00F0 -#define EFI_CPUID_STEPPING 0x000F - EFI_STATUS=20 EFIAPI PpmPolicyEntry( @@ -36,7 +33,6 @@ PpmPolicyEntry( { EFI_BOOT_SERVICES *pBS; EFI_MP_SERVICES_PROTOCOL *MpService; - EFI_CPUID_REGISTER Cpuid01 =3D { 0, 0, 0, 0}; EFI_HANDLE Handle; EFI_STATUS Status; UINTN CpuCount; @@ -70,13 +66,13 @@ PpmPolicyEntry( // // Store the CPUID for use by SETUP items. // - AsmCpuid (EFI_CPUID_VERSION_INFO, &Cpuid01.RegEax, &Cpuid01.RegEbx, &Cpu= id01.RegEcx, &Cpuid01.RegEdx); + AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, NULL, NULL); =20 mDxePlatformPpmPolicy.Revision =3D PPM_PLATFORM_PO= LICY_PROTOCOL_REVISION_4; =20 //Read CPU Mobile feature from PLATFORM_ID_MSR MSR(0x17) NOTFB_I_AM_NOT_= MOBILE_FUSE_CLIAMC00H Bit 28 //Bit Description: { Disables Mobile features 0 =3D I am NOT a mobile pa= rt 1 =3D I am a mobile part (default)"} - CPUMobileFeature =3D ((RShiftU64 (AsmReadMsr64(EFI_MSR_IA32_PLATFORM_ID)= , 28)) & 0x1); + CPUMobileFeature =3D ((RShiftU64 (AsmReadMsr64(MSR_IA32_PLATFORM_ID), 28= )) & 0x1); =20 if (!EFI_ERROR(Status)) { if (CPUMobileFeature =3D=3D 1){//CPU mobile feature diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf b/Pla= tform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf index 2c0a13f6af..5bcce02983 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf @@ -27,6 +27,7 @@ [Sources] =20 [Packages] MdePkg/MdePkg.dec + UefiCpuPkg/UefiCpuPkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec =20 diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x90= Function.c b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x90= Function.c index 684cda83ec..d5a4243624 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x90Functio= n.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x90Functio= n.c @@ -23,8 +23,9 @@ Abstract: =20 #include "MiscSubclassDriver.h" #include -#include #include +#include +#include =20 =20 VOID @@ -32,18 +33,24 @@ GetCPUStepping ( ) { CHAR16 Buffer[40]; =20 - UINT16 FamilyId; - UINT8 Model; - UINT8 SteppingId; - UINT8 ProcessorType; + UINT32 FamilyId; + UINT32 Model; + UINT32 SteppingId; + CPUID_VERSION_INFO_EAX Eax; + CPUID_VERSION_INFO_EBX Ebx; + CPUID_VERSION_INFO_ECX Ecx; + CPUID_VERSION_INFO_EDX Edx; =20 - - EfiCpuVersion (&FamilyId, &Model, &SteppingId, &ProcessorType); - - // - //we need raw Model data - // - Model =3D Model & 0xf; + AsmCpuid (CPUID_VERSION_INFO, &Eax.Uint32, &Ebx.Uint32, &Ecx.Uint32, &Ed= x.Uint32); + FamilyId =3D Eax.Bits.FamilyId; + if (Eax.Bits.FamilyId =3D=3D 0x0F) { + FamilyId |=3D (Eax.Bits.ExtendedFamilyId << 4); + } + Model =3D Eax.Bits.Model; + if (Eax.Bits.FamilyId =3D=3D 0x06 || Eax.Bits.FamilyId =3D=3D 0x0f) { + Model |=3D (Eax.Bits.ExtendedModelId << 4); + } + SteppingId =3D Eax.Bits.SteppingId; =20 // //Family/Model/Step @@ -243,9 +250,9 @@ GetUcodeVersion() // // Microcode Revision // - EfiWriteMsr (EFI_MSR_IA32_BIOS_SIGN_ID, 0); - EfiCpuid (EFI_CPUID_VERSION_INFO, NULL); - MicroCodeVersion =3D (UINT32) RShiftU64 (EfiReadMsr (EFI_MSR_IA32_BIOS_S= IGN_ID), 32); + AsmWriteMsr64 (MSR_IA32_BIOS_SIGN_ID, 0); + AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, NULL, NULL); + MicroCodeVersion =3D (UINT32) RShiftU64 (AsmReadMsr64 (MSR_IA32_BIOS_SIG= N_ID), 32); UnicodeSPrint (Buffer, sizeof (Buffer), L"%x", MicroCodeVersion); HiiSetString(mHiiHandle,STRING_TOKEN(STR_MISC_UCODE_VERSION), Buffer, NU= LL); } diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94= Function.c b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94= Function.c index 97a782e362..f1bb15ae6e 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94Functio= n.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94Functio= n.c @@ -29,7 +29,6 @@ Abstract: #include =20 #include -#include #include #include #include @@ -73,7 +72,6 @@ SB_REV SBRevisionTable[] =3D { #define PREFIX_ZERO 0x20 =20 #define ICH_REG_REV 0x08 -#define MSR_IA32_PLATFORM_ID 0x17 #define CHARACTER_NUMBER_FOR_VALUE 30 =20 =20 @@ -565,7 +563,7 @@ UpdatePlatformInformation ( // //CPU flavor // - CpuFlavor =3D RShiftU64 (EfiReadMsr (MSR_IA32_PLATFORM_ID), 50) & 0x07; + CpuFlavor =3D RShiftU64 (AsmReadMsr64 (MSR_IA32_PLATFORM_ID), 50) & 0x07; =20 switch(CpuFlavor){ case 0x0: @@ -661,9 +659,9 @@ UpdatePlatformInformation ( // // Microcode Revision // - EfiWriteMsr (EFI_MSR_IA32_BIOS_SIGN_ID, 0); - EfiCpuid (EFI_CPUID_VERSION_INFO, NULL); - MicroCodeVersion =3D (UINT32) RShiftU64 (EfiReadMsr (EFI_MSR_IA32_BIOS_S= IGN_ID), 32); + AsmWriteMsr64 (MSR_IA32_BIOS_SIGN_ID, 0); + AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, NULL, NULL); + MicroCodeVersion =3D (UINT32) RShiftU64 (AsmReadMsr64 (MSR_IA32_BIOS_SIG= N_ID), 32); UnicodeSPrint (Buffer, sizeof (Buffer), L"%x", MicroCodeVersion); HiiSetString(mHiiHandle,STRING_TOKEN(STR_MISC_PROCESSOR_MICROCODE_VALUE)= , Buffer, NULL); =20 diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorIn= formationFunction.c b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscPr= ocessorInformationFunction.c index e71a03ceac..8a52d017c1 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorInformati= onFunction.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorInformati= onFunction.c @@ -20,7 +20,6 @@ Abstract: #include "MiscSubclassDriver.h" =20 #include -#include #include #include =20 @@ -102,7 +101,7 @@ DetermineiFsbFromMsr ( // Determine the processor core frequency // UINT64 Temp; - Temp =3D (EfiReadMsr (BSEL_CR_OVERCLOCK_CONTROL)) & FUSE_BSEL_MASK; + Temp =3D (AsmReadMsr64 (BSEL_CR_OVERCLOCK_CONTROL)) & FUSE_BSEL_MASK; return miFSBFrequencyTable[(UINT32)(Temp)]; =20 } diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.i= nf b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf index 016fb53b18..94d9cd67e7 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf +++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf @@ -103,7 +103,6 @@ [LibraryClasses] UefiLib BiosIdLib PrintLib - CpuIA32Lib PchPlatformLib NetLib HobLib diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/V= lv2TbltDevicePkg/bld_vlv.sh index 03fa062310..1705b1628b 100755 --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh @@ -104,6 +104,9 @@ for (( i=3D1; i<=3D$#; )) elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/X64" ]; then Arch=3DX64 shift + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/IA32" ]; then + Arch=3DIA32 + shift elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/YL" ]; then SpiLock=3D1 shift =20 @@ -243,11 +246,11 @@ build ##********************************************************************** echo Skip "Running fce..." =20 +cp -f $BUILD_PATH/FV/VLV.fd $BUILD_PATH/FV/Vlv.ROM + ##********************************************************************** ## Build Capsules ##********************************************************************** -cp -f $WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN_TAG}/FV/VL= V.fd \ - $WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN_TAG}/FV/Vl= v.ROM build -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc =20 echo --=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 (#43518): https://edk2.groups.io/g/devel/message/43518 Mute This Topic: https://groups.io/mt/32419751/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 Fri Apr 19 11:38:02 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+43509+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+43509+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785523; cv=none; d=zoho.com; s=zohoarc; b=ZmZ5vLeoTdQppDhe8lRULEuYDjnsYvYJxX182zQvahW0+8g/TsDjvQT2xgduP+FjVGMryrgzBZi83nz0gUNnC8jHzqMcPk7Enolv77edSzzFpgM5wJC27NLtwCJk0UinV5DvyFvSfXNotGlyXIdHVfHrBj4XikSjoOLoA51T9PI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785523; 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=RcdDMkZT/tFSPHz4wI3J5O/4nwWTuo8SdC22CDLOeV0=; b=M/2WlsuSzPa+I+228PBq938fSd21bHOXMCDNhDWDO8q2vQP33b+j8kqsc6G5REZ0kzsEOEo3UWKP3KcKilMo9mNvT78OXaVlUfW8WFnHK7leNXu0udUALfy0AsgC6Xy3PRrrZe3uT1WevjlC5XH7fZ69qB1N8PTh0Wx6Sxrh4cA= 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+43509+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 1562785523398448.15148932756824; Wed, 10 Jul 2019 12:05:23 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:21 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008222" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:21 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gary Lin , Zailiang Sun , Yi Qian Subject: [edk2-devel] [edk2-platforms Patch 23/28] Vlv2TbltDevicePkg: Import TlsLib for HTTPS Boot Date: Wed, 10 Jul 2019 12:05:11 -0700 Message-Id: <20190710190516.6012-24-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785523; bh=u2YRSrAiFIQ8GEkhwB6/tNL+lMuYAO6LBdUo7Oj1YQI=; h=Cc:Date:From:Reply-To:Subject:To; b=bi3cwCLnguTTQ5RzL5SFZXoQFOA9SEPltdzBoK5LxfRdGqjnNbPGUeKlEwLO17IOFzp VU1ytItEq+w96xIOdB4wnevSEPHPk38HXQqlhnRYuBtiGGj2MJwVlNsDQQawg9yilPd/7 s5ii3dVf6homkVocMzDsihKhm+fEebO1F60= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Gary Lin When setting NETWORK_TLS_ENABLE to TRUE, we need TlsLib. Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney Reviewed-by: Rebecca Cran --- Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc | 3 +++ Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 3 +++ Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 3 +++ Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 3 +++ 4 files changed, 12 insertions(+) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc b/Plat= form/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc index 7993ee5758..e4e86cbb07 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc @@ -242,6 +242,9 @@ [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf +!endif +!if $(NETWORK_TLS_ENABLE) =3D=3D TRUE + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf !endif TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.inf Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/D= xeTcg2PhysicalPresenceLib.inf diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platf= orm/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index ee0d055d64..bc986eae78 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -244,6 +244,9 @@ [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf +!endif +!if $(NETWORK_TLS_ENABLE) =3D=3D TRUE + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf !endif TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.inf Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/D= xeTcg2PhysicalPresenceLib.inf diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platfor= m/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index 62ca4f67cc..f2f02e5f76 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -242,6 +242,9 @@ [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf +!endif +!if $(NETWORK_TLS_ENABLE) =3D=3D TRUE + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf !endif TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.inf Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/D= xeTcg2PhysicalPresenceLib.inf diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform= /Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index 282ff3c2e2..4184c946a6 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -244,6 +244,9 @@ [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf +!endif +!if $(NETWORK_TLS_ENABLE) =3D=3D TRUE + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf !endif TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.inf Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/D= xeTcg2PhysicalPresenceLib.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 (#43509): https://edk2.groups.io/g/devel/message/43509 Mute This Topic: https://groups.io/mt/32419742/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 Fri Apr 19 11:38:02 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+43519+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+43519+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785524; cv=none; d=zoho.com; s=zohoarc; b=I7R40sQxqIDfiwAmQLhHlw2ozWV0xrU9kMHOwp2vGRmE+MyfFDwvkbA98TPPDEYlv5h4dfIm29n7pQf0fKagaV6yDZ7ds/wpE0t/M+T3LK2Et2csYGRFn/K9CHBiUpkLnschLg72jnk8o3EyRb+aeqTpoTbZ1IxnRLac80cMiIY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785524; 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=z2j4ngGBcHExKFLHVpu1Eh/wNuGDmL1WD1Pa00gu7/I=; b=nNFKafPTnWErNW+seo056EdXmD3DDyILE56BhjABJO0IoFslcMsS6c/nfri5gGk3B/DRKtYJ/wqZHTng6CwdQof5/00YZwN45w90LXpjhbsUTn887O55FF9PjajNX0jAuY/w8B+YkqLhaJFco8wvh0xurCwy+kZXDbVldDXaO1o= 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+43519+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 1562785524832854.1567584044532; Wed, 10 Jul 2019 12:05:24 -0700 (PDT) Return-Path: X-Received: from mga02.intel.com (mga02.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:22 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008226" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:21 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gary Lin , Zailiang Sun , Yi Qian Subject: [edk2-devel] [edk2-platforms Patch 24/28] Vlv2TbltDevicePkg: Reorganize the libraries Date: Wed, 10 Jul 2019 12:05:12 -0700 Message-Id: <20190710190516.6012-25-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785524; bh=sy+VR1QQ/ZZ19h7BJ5Ne6BMdPniaBB4Qe2TELoAVPhc=; h=Cc:Date:From:Reply-To:Subject:To; b=LPtaN2bxyzz2VuBq4uxeAIoaNJxY7AWKNDmwtBpv7r6GlOcOOD11EeIsspS/bgb1MkF GtS5Cqo3KNad3r9M9QX8lQ8jMQYSjFOtdMr8AK0aYpZbnU47jsirJDug5Che5Fph1WXa+ n41LIB0xK/OOPTjPrFgiNfuJp4pbe1O+DvI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Gary Lin * Simplify the logic of importing TpmMeasurementLib * Import BaseCryptLib, OpensslLib, and IntrinsicLib unconditionally since FmpDxe needs them * Import FileExplorerLib unconditionally since UiApp needs it * Update the import of TPM/TCG libraries Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- .../Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc | 45 +++++++---------- .../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 48 +++++++------------ .../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 45 +++++++---------- .../Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 47 +++++++----------- 4 files changed, 66 insertions(+), 119 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc b/Plat= form/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc index e4e86cbb07..eb7ae46505 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc @@ -197,7 +197,6 @@ [LibraryClasses.common] TpmCommLib|SecurityPkg/Library/TpmCommLib/TpmCommLib.inf Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm= .inf - !endif =20 PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatfor= mHookLibNull.inf @@ -215,8 +214,9 @@ [LibraryClasses.common] # CryptLib # !if $(TPM_ENABLED) =3D=3D TRUE - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf + TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.inf +!else + TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurem= entLibNull.inf !endif =20 BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf @@ -224,34 +224,28 @@ [LibraryClasses.common] StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf =20 !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecu= reLibNull.inf - TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.inf AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf - FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf !else - TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurem= entLibNull.inf AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLib= Null.inf !endif + + FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf + VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf -!if $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf -!endif !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf !endif - TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.inf + Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/D= xeTcg2PhysicalPresenceLib.inf Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibN= ull.inf =20 - - Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf =20 [LibraryClasses.IA32.SEC] @@ -305,18 +299,13 @@ [LibraryClasses.IA32] ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeRepor= tStatusCodeLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExt= ractGuidedSectionLib.inf =20 + Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf +!if $(TPM_ENABLED) =3D=3D TRUE TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/Dxe= TcgPhysicalPresenceLib.inf -!if $(TPM_ENABLED) =3D=3D TRUE - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf !endif =20 LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf EfiRegTableLib|Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.i= nf - -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf -!endif - HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRou= terDxe.inf =20 [LibraryClasses.IA32.DXE_DRIVER] @@ -370,6 +359,10 @@ [LibraryClasses.IA32.DXE_SMM_DRIVER] !endif CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuE= xceptionHandlerLib.inf =20 +!if $(TPM_ENABLED) =3D=3D TRUE + TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull= .inf +!endif + [LibraryClasses.IA32.SMM_CORE] MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/Pi= SmmCoreMemoryAllocationLib.inf SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/Pi= SmmCoreSmmServicesTableLib.inf @@ -389,10 +382,7 @@ [LibraryClasses.IA32.SMM_CORE] =20 [LibraryClasses.IA32.DXE_RUNTIME_DRIVER] ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/R= untimeDxeReportStatusCodeLib.inf -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf -!endif -!if $(TPM_ENABLED) =3D=3D TRUE +!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE || $(TPM_ENABLED) =3D=3D TRUE BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf !endif =20 @@ -794,8 +784,6 @@ [Components.IA32] SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf SecurityPkg/Tcg/TcgPei/TcgPei.inf { - NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf - NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256= .inf PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf } !endif @@ -925,7 +913,6 @@ [Components.IA32] MdeModulePkg/Universal/BdsDxe/BdsDxe.inf { PlatformBootManagerLib|Vlv2TbltDevicePkg/Library/DxePlatformBootMana= gerLib/DxePlatformBootManagerLib.inf - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg= 2.inf } MdeModulePkg/Logo/LogoDxe.inf MdeModulePkg/Application/UiApp/UiApp.inf { @@ -1019,9 +1006,9 @@ [Components.IA32] Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.inf =20 !if $(TPM_ENABLED) =3D=3D TRUE - SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf { + SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf { - PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf + PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } =20 SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf { diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platf= orm/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index bc986eae78..69f2b22aff 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -199,7 +199,6 @@ [LibraryClasses.common] TpmCommLib|SecurityPkg/Library/TpmCommLib/TpmCommLib.inf Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm= .inf - !endif =20 PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatfor= mHookLibNull.inf @@ -217,8 +216,9 @@ [LibraryClasses.common] # CryptLib # !if $(TPM_ENABLED) =3D=3D TRUE - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf + TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.inf +!else + TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurem= entLibNull.inf !endif =20 BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf @@ -226,35 +226,28 @@ [LibraryClasses.common] StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf =20 !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecu= reLibNull.inf - TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.inf AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf - FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf !else - TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurem= entLibNull.inf AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLib= Null.inf !endif + + FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf + VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf -!if $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf -!endif !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf !endif - TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.inf + Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/D= xeTcg2PhysicalPresenceLib.inf Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibN= ull.inf =20 - - Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf - BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf =20 [LibraryClasses.IA32.SEC] @@ -308,18 +301,13 @@ [LibraryClasses.X64] ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeRepor= tStatusCodeLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExt= ractGuidedSectionLib.inf =20 + Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf +!if $(TPM_ENABLED) =3D=3D TRUE TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/Dxe= TcgPhysicalPresenceLib.inf -!if $(TPM_ENABLED) =3D=3D TRUE - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf !endif =20 LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf EfiRegTableLib|Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.i= nf - -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf -!endif - HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRou= terDxe.inf =20 [LibraryClasses.X64.DXE_DRIVER] @@ -373,6 +361,10 @@ [LibraryClasses.X64.DXE_SMM_DRIVER] !endif CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuE= xceptionHandlerLib.inf =20 +!if $(TPM_ENABLED) =3D=3D TRUE + TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull= .inf +!endif + [LibraryClasses.X64.SMM_CORE] MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/Pi= SmmCoreMemoryAllocationLib.inf SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/Pi= SmmCoreSmmServicesTableLib.inf @@ -392,10 +384,7 @@ [LibraryClasses.X64.SMM_CORE] =20 [LibraryClasses.X64.DXE_RUNTIME_DRIVER] ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/R= untimeDxeReportStatusCodeLib.inf -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf -!endif -!if $(TPM_ENABLED) =3D=3D TRUE +!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE || $(TPM_ENABLED) =3D=3D TRUE BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf !endif =20 @@ -797,10 +786,8 @@ [Components.IA32] SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf SecurityPkg/Tcg/TcgPei/TcgPei.inf { - NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf - NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256= .inf PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf -} + } !endif =20 Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf { @@ -941,7 +928,6 @@ [Components.X64] MdeModulePkg/Universal/BdsDxe/BdsDxe.inf { PlatformBootManagerLib|Vlv2TbltDevicePkg/Library/DxePlatformBootMana= gerLib/DxePlatformBootManagerLib.inf - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg= 2.inf } MdeModulePkg/Logo/LogoDxe.inf MdeModulePkg/Application/UiApp/UiApp.inf { @@ -1035,9 +1021,9 @@ [Components.X64] Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.inf =20 !if $(TPM_ENABLED) =3D=3D TRUE - SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf { + SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf { - PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf + PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } =20 SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf { diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platfor= m/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index f2f02e5f76..7092ab6e6b 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -197,7 +197,6 @@ [LibraryClasses.common] TpmCommLib|SecurityPkg/Library/TpmCommLib/TpmCommLib.inf Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm= .inf - !endif =20 PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatfor= mHookLibNull.inf @@ -215,8 +214,9 @@ [LibraryClasses.common] # CryptLib # !if $(TPM_ENABLED) =3D=3D TRUE - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf + TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.inf +!else + TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurem= entLibNull.inf !endif =20 BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf @@ -224,34 +224,28 @@ [LibraryClasses.common] StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf =20 !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecu= reLibNull.inf - TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.inf AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf - FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf !else - TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurem= entLibNull.inf AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLib= Null.inf !endif + + FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf + VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf -!if $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf -!endif !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf !endif - TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.inf + Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/D= xeTcg2PhysicalPresenceLib.inf Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibN= ull.inf =20 - - Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf =20 [LibraryClasses.IA32.SEC] @@ -305,18 +299,13 @@ [LibraryClasses.IA32] ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeRepor= tStatusCodeLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExt= ractGuidedSectionLib.inf =20 + Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf +!if $(TPM_ENABLED) =3D=3D TRUE TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/Dxe= TcgPhysicalPresenceLib.inf -!if $(TPM_ENABLED) =3D=3D TRUE - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf !endif =20 LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf EfiRegTableLib|Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.i= nf - -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf -!endif - HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRou= terDxe.inf =20 [LibraryClasses.IA32.DXE_DRIVER] @@ -370,6 +359,10 @@ [LibraryClasses.IA32.DXE_SMM_DRIVER] !endif CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuE= xceptionHandlerLib.inf =20 +!if $(TPM_ENABLED) =3D=3D TRUE + TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull= .inf +!endif + [LibraryClasses.IA32.SMM_CORE] MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/Pi= SmmCoreMemoryAllocationLib.inf SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/Pi= SmmCoreSmmServicesTableLib.inf @@ -389,10 +382,7 @@ [LibraryClasses.IA32.SMM_CORE] =20 [LibraryClasses.IA32.DXE_RUNTIME_DRIVER] ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/R= untimeDxeReportStatusCodeLib.inf -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf -!endif -!if $(TPM_ENABLED) =3D=3D TRUE +!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE || $(TPM_ENABLED) =3D=3D TRUE BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf !endif =20 @@ -794,8 +784,6 @@ [Components.IA32] SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf SecurityPkg/Tcg/TcgPei/TcgPei.inf { - NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf - NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256= .inf PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf } !endif @@ -925,7 +913,6 @@ [Components.IA32] MdeModulePkg/Universal/BdsDxe/BdsDxe.inf { PlatformBootManagerLib|Vlv2TbltDevicePkg/Library/DxePlatformBootMana= gerLib/DxePlatformBootManagerLib.inf - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg= 2.inf } MdeModulePkg/Logo/LogoDxe.inf MdeModulePkg/Application/UiApp/UiApp.inf { @@ -1019,9 +1006,9 @@ [Components.IA32] Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.inf =20 !if $(TPM_ENABLED) =3D=3D TRUE - SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf { + SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf { - PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf + PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } =20 SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf { diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform= /Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index 4184c946a6..238561191f 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -199,7 +199,6 @@ [LibraryClasses.common] TpmCommLib|SecurityPkg/Library/TpmCommLib/TpmCommLib.inf Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm= .inf - !endif =20 PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatfor= mHookLibNull.inf @@ -217,8 +216,9 @@ [LibraryClasses.common] # CryptLib # !if $(TPM_ENABLED) =3D=3D TRUE - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf + TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.inf +!else + TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurem= entLibNull.inf !endif =20 BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf @@ -226,34 +226,28 @@ [LibraryClasses.common] StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf =20 !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecu= reLibNull.inf - TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.inf AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf - FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf !else - TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurem= entLibNull.inf AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLib= Null.inf !endif + + FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf + VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf -!if $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf -!endif !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf !endif - TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.inf + Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/D= xeTcg2PhysicalPresenceLib.inf Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibN= ull.inf =20 - - Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf =20 [LibraryClasses.IA32.SEC] @@ -307,18 +301,13 @@ [LibraryClasses.X64] ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeRepor= tStatusCodeLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExt= ractGuidedSectionLib.inf =20 + Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf +!if $(TPM_ENABLED) =3D=3D TRUE TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/Dxe= TcgPhysicalPresenceLib.inf -!if $(TPM_ENABLED) =3D=3D TRUE - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf !endif =20 LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf EfiRegTableLib|Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.i= nf - -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf -!endif - HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRou= terDxe.inf =20 [LibraryClasses.X64.DXE_DRIVER] @@ -372,6 +361,10 @@ [LibraryClasses.X64.DXE_SMM_DRIVER] !endif CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuE= xceptionHandlerLib.inf =20 +!if $(TPM_ENABLED) =3D=3D TRUE + TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull= .inf +!endif + [LibraryClasses.X64.SMM_CORE] MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/Pi= SmmCoreMemoryAllocationLib.inf SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/Pi= SmmCoreSmmServicesTableLib.inf @@ -391,10 +384,7 @@ [LibraryClasses.X64.SMM_CORE] =20 [LibraryClasses.X64.DXE_RUNTIME_DRIVER] ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/R= untimeDxeReportStatusCodeLib.inf -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf -!endif -!if $(TPM_ENABLED) =3D=3D TRUE +!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE || $(TPM_ENABLED) =3D=3D TRUE BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf !endif =20 @@ -796,10 +786,8 @@ [Components.IA32] SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf SecurityPkg/Tcg/TcgPei/TcgPei.inf { - NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf - NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256= .inf PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf -} + } !endif =20 Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf { @@ -940,7 +928,6 @@ [Components.X64] MdeModulePkg/Universal/BdsDxe/BdsDxe.inf { PlatformBootManagerLib|Vlv2TbltDevicePkg/Library/DxePlatformBootMana= gerLib/DxePlatformBootManagerLib.inf - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg= 2.inf } MdeModulePkg/Logo/LogoDxe.inf MdeModulePkg/Application/UiApp/UiApp.inf { @@ -1034,9 +1021,9 @@ [Components.X64] Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.inf =20 !if $(TPM_ENABLED) =3D=3D TRUE - SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf { + SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf { - PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf + PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } =20 SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.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 (#43519): https://edk2.groups.io/g/devel/message/43519 Mute This Topic: https://groups.io/mt/32419752/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 Fri Apr 19 11:38:02 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+43521+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+43521+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785525; cv=none; d=zoho.com; s=zohoarc; b=mFY+g6+fpPsl/u9O3gbhqSP2RlMDzTWFYEThs8QWVKoTgpngP+JFizVx7PJkKqm/JAj+V9eA1ZejF9soVCPR/mULkuQ67KdXb4HxyrQnxOqlfnHyY3BSioS+KaHU4K2ssdZMHW1mW9VcKrxhDGmwdarnYqZAES728SJcj14LB2o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785525; 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=44nBq7d0MNSgjZG8FeruXDGaxS8mMMni6YhumpWiyCI=; b=jPjuT++MhRa/kR6etOfLNs6pwkvWwM+V68nV/D/I5r3fL8f5Rlf2nroe12BnvpPrGILK1r1EiD/2rLwns01Po6kN3gDKfsxt63cxRS43APpIw059DHkTg8OaR6QrZtPzI3QpLmqyJE29xR9EZ/qN4mOR2JiB0cnVo4fmK3LpYO8= 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+43521+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 1562785525023487.4359031470417; Wed, 10 Jul 2019 12:05:25 -0700 (PDT) Return-Path: X-Received: from mga02.intel.com (mga02.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:23 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008229" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:21 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian , Gary Lin Subject: [edk2-devel] [edk2-platforms Patch 25/28] Vlv2DeviceRefCodePlg/AcpiTablesPCAT: Fix ASL error Date: Wed, 10 Jul 2019 12:05:13 -0700 Message-Id: <20190710190516.6012-26-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785524; bh=DC2htE/in+SHMFlTINDsWgB/JsSIiQVhhJ6q4wB9XJI=; h=Cc:Date:From:Reply-To:Subject:To; b=Mdom7OQjofpDEb+NKrUPyZzcBpD4NttwXPiFyg9svH9zNEM8MNp37aLSHlkmv6qoInp kNenS4oyFT5I0fWiVGKDh9bGDDQ0UOCZTaUREFiAyWUOu3oxAOsr9U6eGzIoKHvl8tu+6 zfXOFaiWHPAiIf0iZ6w8VSxY/tOkMEAAkl4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Remove use of a method to read a register from a BAR and instead access the register directly. Resolves the following error from the latest iasl compiler. Or(ShiftLeft(Derefof(Index(CDCT, \_SB.PCI0.GFX0.MCHK.DCFE)), 21),PARM, PA= RM) Error 6163 - Object is created temporarily in another method and cannot be accessed ^ (\_SB.PCI0.GFX0.MCHK.DCFE) Cc: Zailiang Sun Cc: Yi Qian Cc: Gary Lin Signed-off-by: Michael D Kinney Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- .../AcpiTablesPCAT/IgdOGBDA.ASL | 14 ++++++++++++-- .../AcpiTablesPCAT/IgdOpRn.ASL | 18 +----------------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOGBDA.ASL= b/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOGBDA.ASL index 4482db6906..379fca7379 100644 --- a/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOGBDA.ASL +++ b/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOGBDA.ASL @@ -1,6 +1,6 @@ /*++ =20 -Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved +Copyright (c) 1999 - 2019, Intel Corporation. All rights reserved =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -125,7 +125,17 @@ Method (GBDA, 0, Serialized) =20 // Report the graphics frequency based on DISPLAY_CLOCK_FREQUENCY_ENCO= DING [MMADR+0x20C8] =20 - Or(ShiftLeft(Derefof(Index(CDCT, \_SB.PCI0.GFX0.MCHK.DCFE)), 21),PARM,= PARM) + If (LNotEqual (MADR, 0xFFFFFFFF)) + { + OperationRegion(IGMM,SystemMemory,MADR,0x3000) + Field(IGMM,AnyAcc, NoLock, Preserve) + { + Offset(0X20C8), + , 4, + DCFE, 4, // DISPLAY_CLOCK_FREQUENCY_ENCOD= ING + } + Or(ShiftLeft(Derefof(Index(CDCT, DCFE)), 21),PARM, PARM) + } =20 Store(1, GESF) // Set the modified settings flag Return(SUCC) diff --git a/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOpRn.ASL = b/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOpRn.ASL index 8575fbfe6c..386ad3e65e 100644 --- a/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOpRn.ASL +++ b/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOpRn.ASL @@ -1,6 +1,6 @@ /*++ =20 -Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved +Copyright (c) 1999 - 2019, Intel Corporation. All rights reserved =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -70,22 +70,6 @@ Field(IGDP, AnyAcc, NoLock, Preserve) ASLS, 32, // Reg 0xFC, Address of the IGD OpRegion } =20 -Method (MCHK, 0, Serialized) -{ - - If (LNotEqual (MADR, 0xFFFFFFFF)) - { - OperationRegion(IGMM,SystemMemory,MADR,0x3000) - Field(IGMM,AnyAcc, NoLock, Preserve) - { - Offset(0X20C8), - , 4, - DCFE, 4, // DISPLAY_CLOCK_FREQUENCY_ENCODING - } - } -} - - // Define an OperationRegion to cover the IGD OpRegion layout. =20 OperationRegion(IGDM, SystemMemory, ASLB, 0x2000) --=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 (#43521): https://edk2.groups.io/g/devel/message/43521 Mute This Topic: https://groups.io/mt/32419754/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 Fri Apr 19 11:38:02 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+43520+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+43520+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785524; cv=none; d=zoho.com; s=zohoarc; b=mvexzmr0HXR7T1brsZuvUuCQi/2BjelEEOg8HGQHo3/zXBar1APkw3ZCbX6NiNlF7OQouDKyguKr7GvL6IwtSOb4r6RbeVtBRRlHkSHl953oVjY2/xOxtvw1dookEAc29Zo6Yj8s4rcCmCVTfMf8n9Zg3pGRnz15lagTZrGgcwA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785524; 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=wX90RcyUofjuKctbVNZ4NUvHecucGAKVsZ8fCAfZ/IE=; b=XMOHJ4QHMhzPbVGqTj1wn96UNkA6rkQxk00qAZXyQiQmu150TvULgtDDttG7sFjTNrEZOujBboBiKIgSEv4iO+FUhEWVdnzfJBxKbmOwfpFnTofZneedcrpDM3n9/t8Jq+eMnZomWJIebBh25aRerY2EvHAhZZEAyqFd4G/DHrw= 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+43520+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 1562785524951683.722218754812; Wed, 10 Jul 2019 12:05:24 -0700 (PDT) Return-Path: X-Received: from mga04.intel.com (mga04.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:22 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008234" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:21 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian , Gary Lin Subject: [edk2-devel] [edk2-platforms Patch 26/28] Vlv2TbltDevicePkg: Clean up all build scripts Date: Wed, 10 Jul 2019 12:05:14 -0700 Message-Id: <20190710190516.6012-27-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785524; bh=i2HkzWfkhnl9w1LSFcwjzxLKEu0WYar9ZjKvSDaSQ04=; h=Cc:Date:From:Reply-To:Subject:To; b=hu1tY/X/WOLRgramoRpAyOgHea9YIXx7UCvV1p9xA29tTBXGNS069U7eVbaJk53RMRz 5T2q47VxwnmmNQThPSd2K6QQPlMGI5sX+7G0v3xVslFQG4PcGNE+a2U2KCX1YWerTBCul a80+VjW/4PtfEBu9hYmzM3gkqZAtnqRvKNA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" * Remove cln.sh * Remove unused PlatformDefintions.h file * Remove unused defines from DSC files * Make Windows and Linux script more consistent * Remove unused options from Windows/Linux scripts * Remove unused defines from Windows/Linux scripts * Do not modify Target.txt in Conf directory. Instead, pass all build flags on the command line * Generate build report in the build output directory * Generate build logs in the build output directory * Do not delete files from Conf directory * Update clean operation to only clean one platform target * Do not generate AutoPlatformCFG.txt file anymore Cc: Zailiang Sun Cc: Yi Qian Cc: Gary Lin Signed-off-by: Michael D Kinney Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- Platform/Intel/Vlv2TbltDevicePkg/.gitignore | 5 - .../Intel/Vlv2TbltDevicePkg/Build_IFWI.bat | 75 ++------- .../Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 57 +++---- .../Include/PlatformDefinitions.h | 43 ----- .../Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 2 - .../Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc | 55 +----- .../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 53 +----- .../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 53 +----- .../Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 55 +----- Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat | 120 ++++++------- Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 159 ++++++++---------- Platform/Intel/Vlv2TbltDevicePkg/cln.sh | 62 ------- 12 files changed, 156 insertions(+), 583 deletions(-) delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/.gitignore delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefini= tions.h delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/cln.sh diff --git a/Platform/Intel/Vlv2TbltDevicePkg/.gitignore b/Platform/Intel/V= lv2TbltDevicePkg/.gitignore deleted file mode 100644 index c7698262ad..0000000000 --- a/Platform/Intel/Vlv2TbltDevicePkg/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -AutoPlatformCFG.txt -Stitch/Stitching.log -Stitch/MNW*.bin -Stitch/MNW*.rom -Stitch/MNW*.rom.orig diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat b/Platform/Int= el/Vlv2TbltDevicePkg/Build_IFWI.bat index 44759c617f..f65aa61f4a 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat +++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat @@ -9,15 +9,9 @@ =20 SetLocal EnableDelayedExpansion EnableExtensions =20 -@REM Go to work space directory. -cd .. -cd .. - :: Assign initial values set exitCode=3D0 set "Build_Flags=3D " -set "Stitch_Flags=3D " -set Arch=3DX64 set PLATFORM_PACKAGE=3DVlv2TbltDevicePkg =20 set PLATFORM_PATH=3D%WORKSPACE% @@ -42,11 +36,6 @@ if not exist %PLATFORM_PATH%\%PLATFORM_PACKAGE% ( :OptLoop if /i "%~1"=3D=3D"/?" goto Usage =20 -if /i "%~1"=3D=3D"/q" ( - set Build_Flags=3D%Build_Flags% /q - shift - goto OptLoop -) if /i "%~1"=3D=3D"/l" ( set Build_Flags=3D%Build_Flags% /l shift @@ -67,53 +56,17 @@ if /i "%~1" =3D=3D "/c" ( shift goto OptLoop ) -if /i "%~1" =3D=3D "/ECP" ( - set Build_Flags=3D%Build_Flags% /ecp - shift - goto OptLoop -) - -if /i "%~1"=3D=3D"/s" ( - set Build_Flags=3D%Build_Flags% /s - shift - goto OptLoop -) - if /i "%~1"=3D=3D"/x64" ( - set Arch=3DX64 set Build_Flags=3D%Build_Flags% /x64 shift goto OptLoop ) - if /i "%~1"=3D=3D"/IA32" ( - set Arch=3DIA32 set Build_Flags=3D%Build_Flags% /IA32 shift goto OptLoop ) =20 -if /i "%~1"=3D=3D"/nG" ( - set Stitch_Flags=3D%Stitch_Flags% /nG - shift - goto OptLoop -) -if /i "%~1"=3D=3D"/nM" ( - set Stitch_Flags=3D%Stitch_Flags% /nM - shift - goto OptLoop -) -if /i "%~1"=3D=3D"/nB" ( - set Stitch_Flags=3D%Stitch_Flags% /nB - shift - goto OptLoop -) -if /i "%~1"=3D=3D"/yL" ( - set Stitch_Flags=3D%Stitch_Flags% /yL - shift - goto OptLoop -) - :: Require 2 input parameters if "%~2"=3D=3D"" goto Usage =20 @@ -125,7 +78,7 @@ set Build_Target=3D%~2 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 BIOS build Script... =20 -call %PLATFORM_PATH%\%PLATFORM_PACKAGE%\bld_vlv.bat %Build_Flags% %Platfo= rm_Type% %Build_Target% +call %PLATFORM_PATH%\%PLATFORM_PACKAGE%\bld_vlv.bat %Build_Flags% %Platfor= m_Type% %Build_Target% =20 if %ERRORLEVEL% NEQ 0 ( echo echo -- Error Building BIOS & echo. @@ -139,23 +92,21 @@ goto Exit :Usage echo Script to build BIOS firmware and stitch the entire IFWI. echo. -echo Usage: Build_IFWI.bat [options] PlatformType BuildTarget [IFWI Suf= fix] +echo Usage: Build_IFWI.bat [options] PlatformType BuildTarget echo. -echo /c CleanAll before building -echo /x64 Set Arch to X64 (default: X64) -echo /IA32 Set Arch to IA32 (default: X64) -echo /yL Enable SPI lock -echo.=20 -echo Platform Types: MNW2 -echo Build Targets: Release, Debug -echo IFWI Suffix: Suffix to append to end of IFWI filename (de= fault: MM_DD_YYYY) +echo /c CleanAll +echo /l Generate build log file +echo /y Generate build report file +echo /m Enable multi-processor build +echo /IA32 Set Arch to IA32 (default: X64) +echo /X64 Set Arch to X64 (default: X64) echo. -echo See Stitch/Stitch_Config.txt for additional stitching settin= gs. +echo Platform Types: MNW2 +echo Build Targets: Debug, Release (default: Debug) echo. -echo If capsule update is needed, please update CAPSULE_ENABLE =3D = TRUE in Config.dsc. -echo If recovery is needed, please update RECOVERY_ENABLE =3D TRUE = in Config.dsc. -echo If either of above is TRUE, please set OPENSSL_PATH in windows= evironment -echo and put openssl.exe there, to generate final capsule image. +echo Examples: +echo Build_IFWI.bat MNW2 debug : X64 Debug build for MinnowMax +echo Build_IFWI.bat /IA32 MNW2 release : IA32 Release build for Minno= wMax echo. set exitCode=3D1 =20 diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh b/Platform/Inte= l/Vlv2TbltDevicePkg/Build_IFWI.sh index 349f0c7ba7..153c8c5fae 100755 --- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh @@ -6,15 +6,21 @@ function Usage ( ) { echo echo "Script to build BIOS firmware and stitch the entire IFWI." echo - echo "Usage: Build_IFWI.sh [options] PlatformType BuildTarget " + echo "Usage: Build_IFWI.sh [options] PlatformType BuildTarget" echo - echo=20 - echo " /yL [option] : Enable SPI lock" - echo " Platform Types: MNW2" - echo " Build Targets: Release, Debug" + echo " /c CleanAll" + echo " /l Generate build log file" + echo " /y Generate build report file" + echo " /m Enable multi-processor build" + echo " /IA32 Set Arch to IA32 (default: X64)" + echo " /X64 Set Arch to X64 (default: X64)" echo - echo " See Stitch/Stitch_Config.txt for additional stitching set= tings." + echo " Platform Types: MNW2" + echo " Build Targets: Debug, Release (default: Debug)" echo + echo "Examples:" + echo " Build_IFWI.sh MNW2 debug : X64 Debug build for Minnow= Max" + echo " Build_IFWI.sh /IA32 MNW2 release : IA32 Release build for Min= nowMax" echo exit 0 } @@ -24,9 +30,6 @@ set -e ## Assign initial values exitCode=3D0 Build_Flags=3D -Stitch_Flags=3D -Arch=3DX64 -PLATFORM_PACKAGE=3DVlv2TbltDevicePkg =20 ## Check whether WORKSPACE is set or not if [[ -z "$WORKSPACE" ]]; then @@ -47,41 +50,24 @@ fi =20 for (( i=3D1; i<=3D$#; )) do - if [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/Q" ]; then - Build_Flags=3D"$Build_Flags /q" - shift - elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/L" ]; then + if [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/L" ]; then Build_Flags=3D"$Build_Flags /l" shift + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/Y" ]; then + Build_Flags=3D"$Build_Flags /y" + shift + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/M" ]; then + Build_Flags=3D"$Build_Flags /m" + shift elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/C" ]; then Build_Flags=3D"$Build_Flags /c" shift - elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/ECP" ]; then - Build_Flags=3D"$Build_Flags /ecp" - shift elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/X64" ]; then - Arch=3DX64 Build_Flags=3D"$Build_Flags /x64" shift elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/IA32" ]; then - Arch=3DIA32 Build_Flags=3D"$Build_Flags /IA32" shift - elif [ "$1" =3D=3D "/nG" ]; then - Stitch_Flags=3D"$Stitch_Flags /nG" - shift - elif [ "$1" =3D=3D "/nM" ]; then - Stitch_Flags=3D"$Stitch_Flags /nM" - shift - elif [ "$1" =3D=3D "/nB" ]; then - Stitch_Flags=3D"$Stitch_Flags /nB" - shift - elif [ "$1" =3D=3D "/nV" ]; then - Stitch_Flags=3D"$Stitch_Flags /nV" - shift - elif [ "$1" =3D=3D "/yL" ]; then - Build_Flags=3D"$Build_Flags /yL" - shift else break fi @@ -95,11 +81,6 @@ fi ## Assign required arguments Platform_Type=3D$1 Build_Target=3D$2 -if [ "$3" =3D=3D "" ]; then - IFWI_Suffix=3D -else - IFWI_Suffix=3D"/S $3" -fi =20 ## Build BIOS 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" diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h= b/Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h deleted file mode 100644 index a64cda0799..0000000000 --- a/Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h +++ /dev/null @@ -1,43 +0,0 @@ -/*++ - -Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved - = =20 - SPDX-License-Identifier: BSD-2-Clause-Patent - - = =20 - - -Module Name: - - PlatformDefinitions.h - -Abstract: - - This header file provides platform specific definitions used by other mo= dules - for platform specific initialization. - - THIS FILE SHOULD ONLY CONTAIN #defines BECAUSE IT IS CONSUMED BY NON-C M= ODULES - (ASL and VFR) - - This file should not contain addition or other operations that an ASL co= mpiler or - VFR compiler does not understand. - ---*/ - -#ifndef _PLATFORM_DEFINITIONS_H_ -#define _PLATFORM_DEFINITIONS_H_ - - -// -// Platform Base Address definitions -// -#define PCIEX_BASE_ADDRESS EDKII_GLUE_PciExpressBaseAddress // Pc= i Express Configuration Space Base Address - -#define PCIEX_LENGTH PLATFORM_PCIEXPRESS_LENGTH - -#define THERMAL_BASE_ADDRESS 0xFED08000 - -#ifndef MCH_BASE_ADDRESS -#define MCH_BASE_ADDRESS 0xFED10000 // MCH Register Base Addr= ess -#endif -#endif diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc b/Platf= orm/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc index 7b48d7b44e..43db3e28ab 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc @@ -54,8 +54,6 @@ DEFINE USB_SERIAL_STATUS_CODE_ENABLE =3D FALSE DEFINE RAM_SERIAL_STATUS_CODE_ENABLE =3D FALSE =20 -DEFINE ENBDT_S3_SUPPORT =3D TRUE - DEFINE LZMA_ENABLE =3D TRUE DEFINE S4_ENABLE =3D TRUE =20 diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc b/Plat= form/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc index eb7ae46505..0f9651cfba 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc @@ -27,20 +27,9 @@ [Defines] # # Platform On/Off features are defined here # - # - # Platform Support:: Set only one token except Crestview Hills - # - # 3.BayleyBay - # ENBDT_PF_ENABLE =3D TRUE - # - !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt !include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc =20 -!if $(X64_CONFIG) =3D=3D TRUE - DEFINE DXE_ARCHITECTURE =3D X64 -!else DEFINE DXE_ARCHITECTURE =3D IA32 -!endif =20 FLASH_DEFINITION =3D Vlv2TbltDevicePkg/PlatformPkgGcc= .fdf !if $(LFMA_ENABLE) =3D=3D TRUE @@ -761,8 +750,6 @@ [Components.IA32] =20 !if $(RC_BINARY_RELEASE) =3D=3D TRUE Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf { - - *_*_IA32_CC_FLAGS =3D -DRC_BINARY_RELEASE !if $(TARGET) =3D=3D DEBUG gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E @@ -1231,56 +1218,19 @@ [BuildOptions] # # Define token for different Platform # - DEFINE MINNOW2_FSP_OPTION =3D - -!if $(ENBDT_PF_BUILD) =3D=3D TRUE - DEFINE ENBDT_PF_ENABLE =3D -DENBDT_PF_ENABLE=3D1 -!else - DEFINE ENBDT_PF_ENABLE =3D -DENBDT_PF_ENABLE=3D0 -!endif - - !if $(CLKGEN_CONFIG_EXTRA_ENABLE) =3D=3D TRUE DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =3D -DCLKGEN_CONFIG_EXTRA=3D1 !else DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =3D !endif =20 - - !if $(PCIESC_ENABLE) =3D=3D TRUE DEFINE PCIESC_SUPPORT_BUILD_OPTION =3D -DPCIESC_SUPPORT=3D1 !else DEFINE PCIESC_SUPPORT_BUILD_OPTION =3D !endif -!if $(SATA_ENABLE) =3D=3D TRUE - DEFINE SATA_SUPPORT_BUILD_OPTION =3D -DSATA_SUPPORT=3D1 -!else - DEFINE SATA_SUPPORT_BUILD_OPTION =3D -!endif -!if $(ENBDT_S3_SUPPORT) =3D=3D TRUE - DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D -DNOCS_S3_SUPPORT -!else - DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D -!endif =20 -!if $(X64_CONFIG) =3D=3D TRUE - DEFINE X64_BUILD_ENABLE =3D -DX64_BUILD_ENABLE=3D1 -!else - DEFINE X64_BUILD_ENABLE =3D -!endif - -!if $(TPM_ENABLED) =3D=3D TRUE - DEFINE DSC_TPM_BUILD_OPTIONS =3D -DTPM_ENABLED -!else - DEFINE DSC_TPM_BUILD_OPTIONS =3D -!endif - - - DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =3D $(MINNOW2_FSP_OPTION) $(M= INNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE= _ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OP= TION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUIL= D_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_O= PTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION= ) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT= _BUILD_OPTION) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) = $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS) -!if $(PERFORMANCE_ENABLE) =3D=3D TRUE - DEFINE PDB_BUILD_OPTION =3D /Zi -!endif + DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =3D $(CLKGEN_CONFIG_EXTRA_BUI= LD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION) =20 GCC:*_*_*_CC_FLAGS =3D -Wno-missing-braces !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE @@ -1290,7 +1240,6 @@ [BuildOptions] DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =3D !else DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =3D - !endif =20 # @@ -1310,8 +1259,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptio= ns.common.EDKII.SMM_CORE] GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 =20 [BuildOptions.Common.EDKII] - *_*_IA32_ASM_FLAGS =3D $(VP_BUILD_OPTIONS) -D EDKII_GLUE_PciExpressB= aseAddress=3D$(PLATFORM_PCIEXPRESS_BASE)h -DNOCS_S3_SUPPORT - *_*_IA32_CC_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) *_*_IA32_VFRPP_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) *_*_IA32_APP_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platf= orm/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index 69f2b22aff..257bba7485 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -27,22 +27,11 @@ [Defines] # # Platform On/Off features are defined here # - # - # Platform Support:: Set only one token except Crestview Hills - # - # 3.BayleyBay - # ENBDT_PF_ENABLE =3D TRUE - # - !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt !include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc =20 DEFINE PLATFORMX64_ENABLE =3D TRUE =20 -!if $(X64_CONFIG) =3D=3D TRUE DEFINE DXE_ARCHITECTURE =3D X64 -!else - DEFINE DXE_ARCHITECTURE =3D IA32 -!endif =20 FLASH_DEFINITION =3D Vlv2TbltDevicePkg/PlatformPkgGcc= .fdf !if $(LFMA_ENABLE) =3D=3D TRUE @@ -763,8 +752,6 @@ [Components.IA32] =20 !if $(RC_BINARY_RELEASE) =3D=3D TRUE Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf { - - *_*_IA32_CC_FLAGS =3D -DRC_BINARY_RELEASE !if $(TARGET) =3D=3D DEBUG gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E @@ -1246,15 +1233,6 @@ [BuildOptions] # # Define token for different Platform # - DEFINE MINNOW2_FSP_OPTION =3D - -!if $(ENBDT_PF_BUILD) =3D=3D TRUE - DEFINE ENBDT_PF_ENABLE =3D -DENBDT_PF_ENABLE=3D1 -!else - DEFINE ENBDT_PF_ENABLE =3D -DENBDT_PF_ENABLE=3D0 -!endif - - !if $(CLKGEN_CONFIG_EXTRA_ENABLE) =3D=3D TRUE DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =3D -DCLKGEN_CONFIG_EXTRA=3D1 !else @@ -1268,34 +1246,8 @@ [BuildOptions] !else DEFINE PCIESC_SUPPORT_BUILD_OPTION =3D !endif -!if $(SATA_ENABLE) =3D=3D TRUE - DEFINE SATA_SUPPORT_BUILD_OPTION =3D -DSATA_SUPPORT=3D1 -!else - DEFINE SATA_SUPPORT_BUILD_OPTION =3D -!endif -!if $(ENBDT_S3_SUPPORT) =3D=3D TRUE - DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D -DNOCS_S3_SUPPORT -!else - DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D -!endif =20 -!if $(X64_CONFIG) =3D=3D TRUE - DEFINE X64_BUILD_ENABLE =3D -DX64_BUILD_ENABLE=3D1 -!else - DEFINE X64_BUILD_ENABLE =3D -!endif - -!if $(TPM_ENABLED) =3D=3D TRUE - DEFINE DSC_TPM_BUILD_OPTIONS =3D -DTPM_ENABLED -!else - DEFINE DSC_TPM_BUILD_OPTIONS =3D -!endif - - - DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =3D $(MINNOW2_FSP_OPTION) $(M= INNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE= _ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OP= TION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUIL= D_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_O= PTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION= ) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT= _BUILD_OPTION) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) = $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS) -!if $(PERFORMANCE_ENABLE) =3D=3D TRUE - DEFINE PDB_BUILD_OPTION =3D /Zi -!endif + DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =3D $(CLKGEN_CONFIG_EXTRA_BUI= LD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION) =20 GCC:*_*_*_CC_FLAGS =3D -Wno-missing-braces !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE @@ -1305,7 +1257,6 @@ [BuildOptions] DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =3D !else DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =3D - !endif =20 # @@ -1325,8 +1276,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptio= ns.common.EDKII.SMM_CORE] GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 =20 [BuildOptions.Common.EDKII] - *_*_IA32_ASM_FLAGS =3D $(VP_BUILD_OPTIONS) -D EDKII_GLUE_PciExpressB= aseAddress=3D$(PLATFORM_PCIEXPRESS_BASE)h -DNOCS_S3_SUPPORT - *_*_IA32_CC_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) *_*_IA32_VFRPP_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) *_*_IA32_APP_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platfor= m/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index 7092ab6e6b..23e296d432 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -27,20 +27,9 @@ [Defines] # # Platform On/Off features are defined here # - # - # Platform Support:: Set only one token except Crestview Hills - # - # 3.BayleyBay - # ENBDT_PF_ENABLE =3D TRUE - # - !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt !include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc =20 -!if $(X64_CONFIG) =3D=3D TRUE - DEFINE DXE_ARCHITECTURE =3D X64 -!else DEFINE DXE_ARCHITECTURE =3D IA32 -!endif =20 FLASH_DEFINITION =3D Vlv2TbltDevicePkg/PlatformPkg.fdf !if $(LFMA_ENABLE) =3D=3D TRUE @@ -761,8 +750,6 @@ [Components.IA32] =20 !if $(RC_BINARY_RELEASE) =3D=3D TRUE Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf { - - *_*_IA32_CC_FLAGS =3D /DRC_BINARY_RELEASE !if $(TARGET) =3D=3D DEBUG gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E @@ -1231,15 +1218,6 @@ [BuildOptions] # # Define token for different Platform # - DEFINE MINNOW2_FSP_OPTION =3D - -!if $(ENBDT_PF_BUILD) =3D=3D TRUE - DEFINE ENBDT_PF_ENABLE =3D /DENBDT_PF_ENABLE=3D1 -!else - DEFINE ENBDT_PF_ENABLE =3D /DENBDT_PF_ENABLE=3D0 -!endif - - !if $(CLKGEN_CONFIG_EXTRA_ENABLE) =3D=3D TRUE DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =3D /DCLKGEN_CONFIG_EXTRA=3D1 !else @@ -1253,34 +1231,8 @@ [BuildOptions] !else DEFINE PCIESC_SUPPORT_BUILD_OPTION =3D !endif -!if $(SATA_ENABLE) =3D=3D TRUE - DEFINE SATA_SUPPORT_BUILD_OPTION =3D /DSATA_SUPPORT=3D1 -!else - DEFINE SATA_SUPPORT_BUILD_OPTION =3D -!endif -!if $(ENBDT_S3_SUPPORT) =3D=3D TRUE - DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D /DNOCS_S3_SUPPORT -!else - DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D -!endif =20 -!if $(X64_CONFIG) =3D=3D TRUE - DEFINE X64_BUILD_ENABLE =3D /DX64_BUILD_ENABLE=3D1 -!else - DEFINE X64_BUILD_ENABLE =3D -!endif - -!if $(TPM_ENABLED) =3D=3D TRUE - DEFINE DSC_TPM_BUILD_OPTIONS =3D /DTPM_ENABLED -!else - DEFINE DSC_TPM_BUILD_OPTIONS =3D -!endif - - - DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =3D $(MINNOW2_FSP_OPTION) $(M= INNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE= _ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OP= TION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUIL= D_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_O= PTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION= ) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT= _BUILD_OPTION) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) = $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS) -!if $(PERFORMANCE_ENABLE) =3D=3D TRUE - DEFINE PDB_BUILD_OPTION =3D /Zi -!endif + DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =3D $(CLKGEN_CONFIG_EXTRA_BUI= LD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION) =20 !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE MSFT:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable @@ -1291,7 +1243,6 @@ [BuildOptions] !endif !else DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =3D - !endif =20 # @@ -1311,8 +1262,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptio= ns.common.EDKII.SMM_CORE] GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 =20 [BuildOptions.Common.EDKII] - *_*_IA32_ASM_FLAGS =3D $(VP_BUILD_OPTIONS) /D EDKII_GLUE_PciExpressB= aseAddress=3D$(PLATFORM_PCIEXPRESS_BASE)h /DNOCS_S3_SUPPORT - *_*_IA32_CC_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) *_*_IA32_VFRPP_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) *_*_IA32_APP_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform= /Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index 238561191f..e0fd767dea 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -27,22 +27,11 @@ [Defines] # # Platform On/Off features are defined here # - # - # Platform Support:: Set only one token except Crestview Hills - # - # 3.BayleyBay - # ENBDT_PF_ENABLE =3D TRUE - # - !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt !include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc =20 DEFINE PLATFORMX64_ENABLE =3D TRUE =20 -!if $(X64_CONFIG) =3D=3D TRUE DEFINE DXE_ARCHITECTURE =3D X64 -!else - DEFINE DXE_ARCHITECTURE =3D IA32 -!endif =20 FLASH_DEFINITION =3D Vlv2TbltDevicePkg/PlatformPkg.fdf !if $(LFMA_ENABLE) =3D=3D TRUE @@ -763,8 +752,6 @@ [Components.IA32] =20 !if $(RC_BINARY_RELEASE) =3D=3D TRUE Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf { - - *_*_IA32_CC_FLAGS =3D /DRC_BINARY_RELEASE !if $(TARGET) =3D=3D DEBUG gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E @@ -1246,56 +1233,19 @@ [BuildOptions] # # Define token for different Platform # - DEFINE MINNOW2_FSP_OPTION =3D - -!if $(ENBDT_PF_BUILD) =3D=3D TRUE - DEFINE ENBDT_PF_ENABLE =3D /DENBDT_PF_ENABLE=3D1 -!else - DEFINE ENBDT_PF_ENABLE =3D /DENBDT_PF_ENABLE=3D0 -!endif - - !if $(CLKGEN_CONFIG_EXTRA_ENABLE) =3D=3D TRUE DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =3D /DCLKGEN_CONFIG_EXTRA=3D1 !else DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =3D !endif =20 - - !if $(PCIESC_ENABLE) =3D=3D TRUE DEFINE PCIESC_SUPPORT_BUILD_OPTION =3D /DPCIESC_SUPPORT=3D1 !else DEFINE PCIESC_SUPPORT_BUILD_OPTION =3D !endif -!if $(SATA_ENABLE) =3D=3D TRUE - DEFINE SATA_SUPPORT_BUILD_OPTION =3D /DSATA_SUPPORT=3D1 -!else - DEFINE SATA_SUPPORT_BUILD_OPTION =3D -!endif -!if $(ENBDT_S3_SUPPORT) =3D=3D TRUE - DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D /DNOCS_S3_SUPPORT -!else - DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D -!endif =20 -!if $(X64_CONFIG) =3D=3D TRUE - DEFINE X64_BUILD_ENABLE =3D /DX64_BUILD_ENABLE=3D1 -!else - DEFINE X64_BUILD_ENABLE =3D -!endif - -!if $(TPM_ENABLED) =3D=3D TRUE - DEFINE DSC_TPM_BUILD_OPTIONS =3D /DTPM_ENABLED -!else - DEFINE DSC_TPM_BUILD_OPTIONS =3D -!endif - - - DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =3D $(MINNOW2_FSP_OPTION) $(M= INNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE= _ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OP= TION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUIL= D_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_O= PTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION= ) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT= _BUILD_OPTION) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) = $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS) -!if $(PERFORMANCE_ENABLE) =3D=3D TRUE - DEFINE PDB_BUILD_OPTION =3D /Zi -!endif + DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =3D $(CLKGEN_CONFIG_EXTRA_BUI= LD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION) =20 !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE MSFT:*_*_X64_GENFW_FLAGS =3D --keepexceptiontable @@ -1306,7 +1256,6 @@ [BuildOptions] !endif !else DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =3D - !endif =20 # @@ -1326,8 +1275,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptio= ns.common.EDKII.SMM_CORE] GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 =20 [BuildOptions.Common.EDKII] - *_*_IA32_ASM_FLAGS =3D $(VP_BUILD_OPTIONS) /D EDKII_GLUE_PciExpressB= aseAddress=3D$(PLATFORM_PCIEXPRESS_BASE)h /DNOCS_S3_SUPPORT - *_*_IA32_CC_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) *_*_IA32_VFRPP_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) *_*_IA32_APP_FLAGS =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat b/Platform/Intel/= Vlv2TbltDevicePkg/bld_vlv.bat index ffd6722582..c39b8ccd62 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat @@ -11,7 +11,6 @@ echo. echo %date% %time% echo. =20 - ::********************************************************************** :: Initial Setup ::********************************************************************** @@ -20,9 +19,14 @@ set /a build_threads=3D1 set "Build_Flags=3D " set exitCode=3D0 set Arch=3DX64 -set Source=3D0 +set GenLog=3DFALSE +set GenReport=3DFALSE +set Clean=3DFALSE set PLATFORM_NAME=3DVlv2TbltDevicePkg =20 +::********************************************************************** +:: Detect full path to the edk2 repo +::********************************************************************** set CORE_PATH=3D%WORKSPACE% if not exist %CORE_PATH%\edksetup.bat ( if defined PACKAGES_PATH ( @@ -41,6 +45,9 @@ if not exist %CORE_PATH%\edksetup.bat ( ) :CorePathFound =20 +::********************************************************************** +:: Detect full path to the Vlv2TbltDevicePkg +::********************************************************************** set PLATFORM_PACKAGE=3D%WORKSPACE%\%PLATFORM_NAME% if not exist %PLATFORM_PACKAGE% ( if defined PACKAGES_PATH ( @@ -61,28 +68,13 @@ if not exist %PLATFORM_PACKAGE% ( =20 cd %CORE_PATH% =20 -:: Clean up previous build files. -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\.cache rmdir /q/s %WORKSPACE%\Conf\.cache +::********************************************************************** +:: Run edksetup.bat and make sure tools are up to date +::********************************************************************** =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 call %CORE_PATH%\edksetup.bat Rebuild @echo off =20 -:: Define platform specific environment variables. -set config_file=3D%PLATFORM_PACKAGE%\PlatformPkgConfig.dsc -set auto_config_inc=3D%PLATFORM_PACKAGE%\AutoPlatformCFG.txt - - - -::create new AutoPlatformCFG.txt file -copy /y nul %auto_config_inc% >nul - ::********************************************************************** :: Parse command line arguments ::********************************************************************** @@ -92,12 +84,12 @@ copy /y nul %auto_config_inc% >nul if /i "%~1"=3D=3D"/?" goto Usage =20 if /i "%~1"=3D=3D"/l" ( - set Build_Flags=3D%Build_Flags% -j EDK2.log + set GenLog=3DTRUE shift goto OptLoop ) if /i "%~1"=3D=3D"/y" ( - set Build_Flags=3D%Build_Flags% -y %PLATFORM_PACKAGE%\EDK2_%PLATFORM_P= ACKAGE%.report + set GenReport=3DTRUE shift goto OptLoop ) @@ -109,16 +101,7 @@ if /i "%~1"=3D=3D"/m" ( goto OptLoop ) if /i "%~1" =3D=3D "/c" ( - echo Removing previous build files ... - if exist build ( - del /f/s/q build > nul - rmdir /s/q build - ) - if exist %WORKSPACE%\Conf\.cache ( - del /f/s/q %WORKSPACE%\Conf\.cache > nul - rmdir /s/q %WORKSPACE%\Conf\.cache - ) - echo. + set Clean=3DTRUE shift goto OptLoop ) @@ -137,23 +120,6 @@ if /i "%~1"=3D=3D"/IA32" ( :: Required argument(s) if "%~1"=3D=3D"" goto Usage =20 -if "%Arch%"=3D=3D"IA32" ( - echo DEFINE X64_CONFIG =3D FALSE >> %auto_config_inc% -) else if "%Arch%"=3D=3D"X64" ( - echo DEFINE X64_CONFIG =3D TRUE >> %auto_config_inc% -) - -:: -- Build flags settings for each Platform -- -echo Setting %1 platform configuration... -if /i "%~1" =3D=3D "MNW2" ( - echo DEFINE ENBDT_PF_BUILD =3D TRUE >> %auto_config_inc% - =20 -) else ( - echo Error - Unsupported PlatformType: %1 - goto Usage -) -set Platform_Type=3D%~1 - if /i "%~2" =3D=3D "RELEASE" ( set target=3DRELEASE ) else ( @@ -161,8 +127,9 @@ if /i "%~2" =3D=3D "RELEASE" ( ) =20 ::********************************************************************** -:: Additional EDK Build Setup/Configuration +:: Detect TOOL_CHAIN_TAG ::********************************************************************** + echo. echo Setting the Build environment for VS2015/VS2013/VS2012/VS2010/VS2008.= .. if defined VS140COMNTOOLS ( @@ -206,6 +173,10 @@ if defined VS140COMNTOOLS ( goto :BldFail ) =20 +::********************************************************************** +:: Generate BUILD_PATH and make sure the directory exists +::********************************************************************** + echo Ensuring correct build directory is present if not exist %WORKSPACE%\Build mkdir %WORKSPACE%\Build if "%Arch%"=3D=3D"IA32" ( @@ -217,26 +188,41 @@ if "%Arch%"=3D=3D"IA32" ( ) if not exist %BUILD_PATH% mkdir %BUILD_PATH% =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" %WORKSPACE%\Conf\target.txt > %WORKS= PACE%\Conf\target.txt.tmp +::********************************************************************** +:: Check for clean operation +::********************************************************************** =20 -echo TARGET =3D %TARGET% >> %WOR= KSPACE%\Conf\target.txt.tmp +if "%Clean%"=3D=3D"TRUE" ( + echo Removing previous build files ... + if exist %BUILD_PATH% ( + rmdir /s/q %BUILD_PATH% + ) + if exist %WORKSPACE%\Conf\.cache ( + rmdir /s/q %WORKSPACE%\Conf\.cache + ) + echo. + goto :Exit +) + +::********************************************************************** +:: Generate Build_Flags +::********************************************************************** + +set Build_Flags=3D%Build_Flags% -b %TARGET% if "%Arch%"=3D=3D"IA32" ( - echo TARGET_ARCH =3D IA32 >> %WO= RKSPACE%\Conf\target.txt.tmp + set Build_Flags=3D%Build_Flags% -a IA32 ) else if "%Arch%"=3D=3D"X64" ( - echo TARGET_ARCH =3D IA32 X64 >> %WOR= KSPACE%\Conf\target.txt.tmp + set Build_Flags=3D%Build_Flags% -a IA32 -a X64 ) -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 = >> %WORKSPACE%\Conf\target.txt.tmp -) else ( - echo ACTIVE_PLATFORM =3D %PLATFORM_PACKAGE%/PlatformPkg%Arch%Source.dsc = >> %WORKSPACE%\Conf\target.txt.tmp +set Build_Flags=3D%Build_Flags% -t %TOOL_CHAIN_TAG% +set Build_Flags=3D%Build_Flags% -p %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc +set Build_Flags=3D%Build_Flags% -n %build_threads% +if "%GenLog%"=3D=3D"TRUE" ( + set Build_Flags=3D%Build_Flags% -j %BUILD_PATH%\%PLATFORM_NAME%.log +) +if "%GenReport%"=3D=3D"TRUE" ( + set Build_Flags=3D%Build_Flags% -y %BUILD_PATH%\%PLATFORM_NAME%.report ) -echo MAX_CONCURRENT_THREAD_NUMBER =3D %build_threads% = >> %WORKSPACE%\Conf\target.txt.tmp - -move /Y %WORKSPACE%\Conf\target.txt.tmp %WORKSPACE%\Conf\target.txt >nul =20 ::********************************************************************** :: Generate BIOS ID @@ -267,6 +253,8 @@ echo VERSION_MINOR =3D 01 >> %BUILD_PATH%/BiosId.= env =20 echo. echo Invoking EDK2 build... +echo build %Build_Flags% + call build %Build_Flags% =20 if %ERRORLEVEL% NEQ 0 goto BldFail @@ -300,7 +288,7 @@ echo Build BIOS rom for VLV platforms. echo. echo Usage: bld_vlv.bat [options] PlatformType [Build Target] echo. -echo /c CleanAll before building +echo /c CleanAll echo /l Generate build log file echo /y Generate build report file echo /m Enable multi-processor build diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/V= lv2TbltDevicePkg/bld_vlv.sh index 1705b1628b..d32beb6a45 100755 --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh @@ -7,15 +7,22 @@ function Usage() { echo "******************************************************************= *********" echo "Build BIOS rom for VLV platforms." echo - echo "Usage: bld_vlv.sh PlatformType [Build Target]" + echo "Usage: bld_vlv.sh [options] PlatformType [Build Target]" echo + echo " /c CleanAll" + echo " /l Generate build log file" + echo " /y Generate build report file" + echo " /m Enable multi-processor build" + echo " /IA32 Set Arch to IA32 (default: X64)" + echo " /X64 Set Arch to X64 (default: X64)" echo echo " Platform Types: MNW2" echo " Build Targets: Debug, Release (default: Debug)" echo + echo "Examples:" + echo " bld_vlv.sh MNW2 : X64 Debug build for MinnowMax" + echo " bld_vlv.sh /IA32 MNW2 release : IA32 Release build for Minnow= Max" echo "******************************************************************= *********" - echo "Press any key......" - read exit 0 } =20 @@ -29,8 +36,12 @@ echo -e $(date) #build_threads=3D($NUMBER_OF_PROCESSORS)+1 Build_Flags=3D exitCode=3D0 +build_threads=3D1 Arch=3DX64 -SpiLock=3D0 +GenLog=3DFALSE +GenReport=3DFALSE +Clean=3DFALSE + =20 export CORE_PATH=3D$WORKSPACE/edk2 export PLATFORM_PATH=3D$WORKSPACE/edk2-platforms/Platform/Intel/ @@ -38,27 +49,6 @@ export SILICON_PATH=3D$WORKSPACE/edk2-platforms/Silicon/= Intel/ export BINARY_PATH=3D$WORKSPACE/edk2-non-osi/Silicon/Intel/ export PACKAGES_PATH=3D$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH =20 -## Clean up previous build files. -if [ -e $WORKSPACE/EDK2.log ]; then - rm $WORKSPACE/EDK2.log -fi - -if [ -e $WORKSPACE/Unitool.log ]; then - rm $WORKSPACE/Unitool.log -fi - -if [ -e $WORKSPACE/Conf/target.txt ]; then - rm $WORKSPACE/Conf/target.txt -fi - -if [ -e $WORKSPACE/Conf/tools_def.txt ]; then - rm $WORKSPACE/Conf/tools_def.txt -fi - -if [ -e $WORKSPACE/Conf/build_rule.txt ]; then - rm $WORKSPACE/Conf/build_rule.txt -fi - ## 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 cd $CORE_PATH @@ -69,17 +59,9 @@ make -C BaseTools PLATFORM_NAME=3DVlv2TbltDevicePkg PLATFORM_PACKAGE=3DVlv2TbltDevicePkg PLATFORM_PKG_PATH=3D$PLATFORM_PATH/$PLATFORM_PACKAGE -config_file=3D$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc -auto_config_inc=3D$PLATFORM_PKG_PATH/AutoPlatformCFG.txt =20 cd $PLATFORM_PKG_PATH =20 -## create new AutoPlatformCFG.txt file -if [ -f "$auto_config_inc" ]; then - rm $auto_config_inc -fi -touch $auto_config_inc - ##********************************************************************** ## Parse command line arguments ##********************************************************************** @@ -89,17 +71,17 @@ for (( i=3D1; i<=3D$#; )) do if [ "$1" =3D=3D "/?" ]; then Usage - elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/Q" ]; then - Build_Flags=3D"$Build_Flags --quiet" - shift elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/L" ]; then - Build_Flags=3D"$Build_Flags -j EDK2.log" + GenLog=3DTRUE + shift + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/Y" ]; then + GenReport=3DTRUE + shift + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/M" ]; then + build_threads=3D8 shift elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/C" ]; then - echo Removing previous build files ... - if [ -d "Build" ]; then - rm -r Build - fi + Clean=3DTRUE shift elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/X64" ]; then Arch=3DX64 @@ -107,9 +89,6 @@ for (( i=3D1; i<=3D$#; )) elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/IA32" ]; then Arch=3DIA32 shift - elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/YL" ]; then - SpiLock=3D1 - shift =20 else break fi @@ -120,26 +99,7 @@ if [ "$2" =3D=3D "" ]; then Usage fi =20 -if [ $Arch =3D=3D "IA32" ]; then - echo DEFINE X64_CONFIG =3D FALSE >> $auto_config_inc -else - echo DEFINE X64_CONFIG =3D TRUE >> $auto_config_inc -fi - -## -- Build flags settings for each Platform -- -## AlpineValley (ALPV): SVP_PF_BUILD =3D TRUE, ENBDT_PF_BUILD =3D FA= LSE, TABLET_PF_BUILD =3D FALSE, BYTI_PF_BUILD =3D FALSE, IVI_PF_BUILD =3D= FALSE -## BayleyBay (BBAY): SVP_PF_BUILD =3D FALSE, ENBDT_PF_BUILD =3D TR= UE, TABLET_PF_BUILD =3D FALSE, BYTI_PF_BUILD =3D FALSE, IVI_PF_BUILD =3D= FALSE -## BayLake (BLAK): SVP_PF_BUILD =3D FALSE, ENBDT_PF_BUILD =3D FA= LSE, TABLET_PF_BUILD =3D TRUE, BYTI_PF_BUILD =3D FALSE, IVI_PF_BUILD =3D= FALSE -## Bakersport (BYTI): SVP_PF_BUILD =3D FALSE, ENBDT_PF_BUILD =3D FA= LSE, TABLET_PF_BUILD =3D FALSE, BYTI_PF_BUILD =3D TRUE, IVI_PF_BUILD =3D = FALSE -## Crestview Hills (CVHS): SVP_PF_BUILD =3D FALSE, ENBDT_PF_BUILD =3D FA= LSE, TABLET_PF_BUILD =3D FALSE, BYTI_PF_BUILD =3D TRUE, IVI_PF_BUILD =3D = TRUE -## FFD8 (BLAK): SVP_PF_BUILD =3D FALSE, ENBDT_PF_BUILD =3D FA= LSE, TABLET_PF_BUILD =3D TRUE, BYTI_PF_BUILD =3D FALSE, IVI_PF_BUILD =3D= FALSE echo "Setting $1 platform configuration and BIOS ID..." -if [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "MNW2" ]; then - echo DEFINE ENBDT_PF_BUILD =3D TRUE >> $auto_config_inc -else - echo "Error - Unsupported PlatformType: $1" - Usage -fi =20 if [ "$(echo $2 | tr 'a-z' 'A-Z')" =3D=3D "RELEASE" ]; then export TARGET=3DRELEASE @@ -148,18 +108,8 @@ else fi =20 ##********************************************************************** -## Additional EDK Build Setup/Configuration +## Detect TOOL_CHAIN_TAG ##********************************************************************** -echo "Ensuring correct build directory is present for GenBiosId..." - -echo Modifying Conf files for this build... -## Remove lines with these tags from target.txt -sed -i '/^ACTIVE_PLATFORM/d' $WORKSPACE/Conf/target.txt -sed -i '/^TARGET /d' $WORKSPACE/Conf/target.txt -sed -i '/^TARGET_ARCH/d' $WORKSPACE/Conf/target.txt -sed -i '/^TOOL_CHAIN_TAG/d' $WORKSPACE/Conf/target.txt -sed -i '/^MAX_CONCURRENT_THREAD_NUMBER/d' $WORKSPACE/Conf/target.txt - gcc_version=3D$(gcc -v 2>&1 | tail -1 | awk '{print $3}') case $gcc_version in [1-3].*|4.[0-7].*) @@ -167,31 +117,19 @@ case $gcc_version in exit 1 ;; 4.8.*) - TARGET_TOOLS=3DGCC48 + export TOOL_CHAIN_TAG=3DGCC48 ;; 4.9.*|6.[0-2].*) - TARGET_TOOLS=3DGCC49 + export TOOL_CHAIN_TAG=3DGCC49 ;; *) - TARGET_TOOLS=3DGCC5 + export TOOL_CHAIN_TAG=3DGCC5 ;; esac =20 -ACTIVE_PLATFORM=3D$PLATFORM_PKG_PATH/PlatformPkgGcc"$Arch".dsc -export TOOL_CHAIN_TAG=3D$TARGET_TOOLS -MAX_CONCURRENT_THREAD_NUMBER=3D8 -echo ACTIVE_PLATFORM =3D $ACTIVE_PLATFORM >> $WO= RKSPACE/Conf/target.txt -echo TARGET =3D $TARGET >> $WO= RKSPACE/Conf/target.txt -echo TOOL_CHAIN_TAG =3D $TOOL_CHAIN_TAG >> $WO= RKSPACE/Conf/target.txt -echo MAX_CONCURRENT_THREAD_NUMBER =3D $MAX_CONCURRENT_THREAD_NUMBER >> $WO= RKSPACE/Conf/target.txt -if [ $Arch =3D=3D "IA32" ]; then - echo TARGET_ARCH =3D IA32 >> $WO= RKSPACE/Conf/target.txt -else - echo TARGET_ARCH =3D IA32 X64 >> $WO= RKSPACE/Conf/target.txt -fi - - -## Set and Create $BUILD_PATH if necessary +##********************************************************************** +## Generate $BUILD_PATH and make sure the directory exists +##********************************************************************** if [ ! -d ${WORKSPACE}/Build ]; then mkdir ${WORKSPACE}/Build fi @@ -212,6 +150,40 @@ if [ ! -d $BUILD_PATH ]; then mkdir $BUILD_PATH fi =20 +##********************************************************************** +## Check for clean operation +##********************************************************************** +if [ $Clean =3D=3D "TRUE" ]; then + echo Removing previous build files ... + if [ -d ${BUILD_PATH} ]; then + rm -r ${BUILD_PATH} + fi + if [ -d ${WORKSPACE}/Conf/.cache ]; then + rm -r ${WORKSPACE}/Conf/.cache + fi + exit 0 +fi + +##********************************************************************** +## Generate Build_Flags +##********************************************************************** + +Build_Flags=3D"$Build_Flags -b $TARGET" +if [ $Arch =3D=3D "IA32" ]; then + Build_Flags=3D"$Build_Flags -a IA32" +else + Build_Flags=3D"$Build_Flags -a IA32 -a X64" +fi +Build_Flags=3D"$Build_Flags -t $TOOL_CHAIN_TAG" +Build_Flags=3D"$Build_Flags -p ${PLATFORM_PKG_PATH}/PlatformPkgGcc${Arch}.= dsc" +Build_Flags=3D"$Build_Flags -n $build_threads" +if [ $GenLog =3D=3D "TRUE" ]; then + Build_Flags=3D"$Build_Flags -j ${BUILD_PATH}/${PLATFORM_NAME}.log" +fi +if [ $GenReport =3D=3D "TRUE" ]; then + Build_Flags=3D"$Build_Flags -y ${BUILD_PATH}/${PLATFORM_NAME}.report" +fi + ##********************************************************************** ## Generate BIOS ID ##********************************************************************** @@ -239,7 +211,8 @@ python $WORKSPACE/edk2-platforms/Platform/Intel/Tools/G= enBiosId/GenBiosId.py -i ## Build BIOS ##********************************************************************** echo "Invoking EDK2 build..." -build +echo build $Build_Flags +build $Build_Flags =20 ##********************************************************************** ## Post Build processing and cleanup diff --git a/Platform/Intel/Vlv2TbltDevicePkg/cln.sh b/Platform/Intel/Vlv2T= bltDevicePkg/cln.sh deleted file mode 100644 index 3511695f6f..0000000000 --- a/Platform/Intel/Vlv2TbltDevicePkg/cln.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env bash -echo -echo Run build cleanall... -echo - -echo -echo Directories to clean... -echo - -cd .. - -if [ -d "Build" ]; then - rm -r Build -fi - -if [ -d "Conf/.cache" ]; then - rm -r Conf/.cache -fi - -if [ -d "RomImages" ]; then - rm -r RomImages -fi - -echo -echo Files to clean... -echo - -if [ -e $(pwd)/EDK2.log ]; then - rm $(pwd)/EDK2.log -fi - -if [ -e $(pwd)/Unitool.log ]; then - rm $(pwd)/Unitool.log -fi - -if [ -e $(pwd)/Conf/target.txt ]; then - rm $(pwd)/Conf/target.txt -fi - -if [ -e $(pwd)/Conf/BiosId.env ]; then - rm $(pwd)/Conf/BiosId.env -fi - -if [ -e $(pwd)/Conf/tools_def.txt ]; then - rm $(pwd)/Conf/tools_def.txt -fi - -if [ -e $(pwd)/Conf/build_rule.txt ]; then - rm $(pwd)/Conf/build_rule.txt -fi - -if [ -e $(pwd)/Conf/BuildEnv.sh ]; then - rm $(pwd)/Conf/BuildEnv.sh -fi - -if [ -e $(pwd)/Vlv2TbltDevicePkg/AutoPlatformCFG.txt ]; then - rm $(pwd)/Vlv2TbltDevicePkg/AutoPlatformCFG.txt -fi - -echo -echo All done... -echo --=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 (#43520): https://edk2.groups.io/g/devel/message/43520 Mute This Topic: https://groups.io/mt/32419753/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 Fri Apr 19 11:38:02 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+43516+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+43516+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785524; cv=none; d=zoho.com; s=zohoarc; b=m9K6cLQ60qRTHkqxR5qBo1rgxkaeEfZwLcV/m59k7e2IYw82S78RifWQrzzA+/XQ7Gxs+LmHO5fxNB9LWbyEEBlaEqbQ/jv1xCiw1WRnodkX1jYWSfmMDZg9bM8TOEyZ522/sIC8hWKOJT6DYv59bEBgwuS1XEag5M5qqRn2uYs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785524; 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=mE9CzVNTuhW7himrFcAQTAwoFp1a0mjIlKiyr1MlIwI=; b=i4PeKdBAa4cK/DZt/zW8h/csh8lJxEiNG6k6nmztevC5P1wG0xxPLZGGoxIyWcv5cYy3S677knRBR5dNFB7vGok597w2hlfUAcDC3tLUFJQQzQ5gIhlujczthY24br9fHNj+3sAY/MHhmWUhdy+ALmZRWpHnv+6J3TrPG2F4/9I= 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+43516+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 1562785524362366.2878727999182; Wed, 10 Jul 2019 12:05:24 -0700 (PDT) Return-Path: X-Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:22 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008236" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:21 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian , Gary Lin Subject: [edk2-devel] [edk2-platforms Patch 27/28] Vlv2TbltDevicePkg: Only build capsules for X64 Date: Wed, 10 Jul 2019 12:05:15 -0700 Message-Id: <20190710190516.6012-28-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785523; bh=gnRi0Vt4h2v4iZnKxDHtCt45sudHCR1I6rKxuZI4vkU=; h=Cc:Date:From:Reply-To:Subject:To; b=hzFLmRFoa7e6zEIl4kA2/VRZasfy98FdoDJzND2g+zSGSOxUEz/lJzisbfP2ccoZpPh bkRinfeDM1MnI3n3zrmyesXsPFzb/WFX/DXU6dzrm5+6kS2+B6kkRKS4h4CwuhBiMrnHT mHMFGzyzmzZ5RyNi+ttzf1KkgZ09sa/ooWo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Only build capsules for X64 builds. More changes are required to build IA32 capsules. Cc: Zailiang Sun Cc: Yi Qian Cc: Gary Lin Signed-off-by: Michael D Kinney Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat | 6 +++++- Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat b/Platform/Intel/= Vlv2TbltDevicePkg/bld_vlv.bat index c39b8ccd62..99c1068663 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat @@ -277,7 +277,11 @@ if %ERRORLEVEL% NEQ 0 goto BldFail ::echo FD successfully updated with default Hii values. =20 @REM build capsule here -call build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc +if "%Arch%"=3D=3D"X64" ( + echo Invoking EDK2 build for capsules... + echo build -t %TOOL_CHAIN_TAG% -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc + call build -t %TOOL_CHAIN_TAG% -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc +) =20 goto Exit =20 diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/V= lv2TbltDevicePkg/bld_vlv.sh index d32beb6a45..0d1ea60ac6 100755 --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh @@ -224,7 +224,11 @@ cp -f $BUILD_PATH/FV/VLV.fd $BUILD_PATH/FV/Vlv.ROM ##********************************************************************** ## Build Capsules ##********************************************************************** -build -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc +if [ $Arch =3D=3D "X64" ]; then + echo "Invoking EDK2 build for capsules..." + echo build -t $TOOL_CHAIN_TAG -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.d= sc + build -t $TOOL_CHAIN_TAG -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc +fi =20 echo echo -------------------- The EDKII BIOS build has successfully completed.= -------------------- --=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 (#43516): https://edk2.groups.io/g/devel/message/43516 Mute This Topic: https://groups.io/mt/32419749/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 Fri Apr 19 11:38:02 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+43522+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+43522+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785525; cv=none; d=zoho.com; s=zohoarc; b=iDI/ADgWbCmqpsUSeDmC9VRiooWMOjRrBGSXkyty2u06kApFCDAFEdlrlfFRNiR0FH/ApaS43tx1CsQeXG+hFS+u8Dndge9bigNqqSh9pS4AgIf4xE7oJmTGQPDAy0zX7hp1SA45EVK0E5686TGhIj+uCBqoOvPRlb9iM75rYNo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785525; 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=QFNuw3SvJ3eUaeNJSW+RPtxuBb8CY69yN8rx4pkNK+Q=; b=f2luvJSLpfgsj7al38xuVj40viuVBP98tAmPL0N/POufTLI467xSDfZPIpFeS2RI4P5g1hH3OQD80NnrAiM8y+fKvhfdtzgGaA7/0C/pab1GlNHYHjdt9evAAytg2GQ59ji+hTste+f4DXDqYw/VtXg5Cn5vHW74L1iMOn0VMb8= 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+43522+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 1562785525046112.71662882480393; Wed, 10 Jul 2019 12:05:25 -0700 (PDT) Return-Path: X-Received: from mga04.intel.com (mga04.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:23 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008240" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:21 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian , Gary Lin Subject: [edk2-devel] [edk2-platforms Patch 28/28] Vlv2TbltDevicePkg: Update Readme.md for multiple repos Date: Wed, 10 Jul 2019 12:05:16 -0700 Message-Id: <20190710190516.6012-29-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-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=1562785524; bh=rxc1RmwjOZ6OQijzYoC3Egb8yLOMV6y5/Mn0lHtvCkI=; h=Cc:Date:From:Reply-To:Subject:To; b=vZeIvCyXfcQ2ipPUTL9Xjdsnec0aVXZDs/OZLiudoz9JvMN3qznNA3WmKTPpWyzR7/+ Jr9aB0bQjVBMmYSBqO00UBuQDRQrCXxeYGR/M9wGKsvt8LNajEnrk9JZ4Y1js2JViWPCr w07cyWuzWPysfj0IAnnbZvI9fpSQbNV8lQ4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Update Readme.md with instructions to clone content from the edk2, edk2-platforms, and edk2-non-osi repositories and build Vlv2TbltDevicePkg for Windows and Linux. Cc: Zailiang Sun Cc: Yi Qian Cc: Gary Lin Signed-off-by: Michael D Kinney Reviewed-By: Zailiang Sun Reviewed-by: Michael D Kinney --- Platform/Intel/Vlv2TbltDevicePkg/Readme.md | 145 ++++++++++----------- 1 file changed, 69 insertions(+), 76 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Readme.md b/Platform/Intel/Vl= v2TbltDevicePkg/Readme.md index cbbb465b69..97180ef7af 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Readme.md +++ b/Platform/Intel/Vlv2TbltDevicePkg/Readme.md @@ -42,39 +42,27 @@ the MinnowBoard MAX firmware and generates UEFI Capsule= s that can be used to update the MinnowBoard MAX firmware and three sample devices. =20 ``` -git clone --recurse-submodules https://github.com/tianocore/edk2.git +git clone https://github.com/tianocore/edk2.git +cd edk2 +git submodule update --init +cd .. +git clone https://github.com/tianocore/edk2-platforms.git +git clone https://github.com/tianocore/edk2-non-osi.git =20 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 -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 .. - 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 -mkdir Conf - 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 PACKAGES_PATH=3D%WORKSPACE%\edk2;%WORKSPACE%\edk2-platforms\Silicon\In= tel;%WORKSPACE%\edk2-platforms\Platform\Intel;%WORKSPACE%\edk2-non-osi\Sili= con\Intel +path=3D%path%;%WORKSPACE%\openssl-1.0.2r-x64_86-win64 set NASM_PREFIX=3D%WORKSPACE%\nasm-2.13.03\ =20 -cd %WORKSPACE%\edk2 +cd edk2-platforms\Platform\Intel\Vlv2TbltDevicePkg =20 -call edkSetup.bat Rebuild - -cd Vlv2TbltDevicePkg - -Build_IFWI.bat /m /y MNW2 Debug +Build_IFWI.bat /m MNW2 Debug ``` =20 Once all the code and tools are downloaded and installed, only the followi= ng @@ -83,48 +71,50 @@ directory used to install the source and binaries. =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 PACKAGES_PATH=3D%WORKSPACE%\edk2;%WORKSPACE%\edk2-platforms\Silicon\In= tel;%WORKSPACE%\edk2-platforms\Platform\Intel;%WORKSPACE%\edk2-non-osi\Sili= con\Intel +path=3D%path%;%WORKSPACE%\openssl-1.0.2r-x64_86-win64 set NASM_PREFIX=3D%WORKSPACE%\nasm-2.13.03\ - -cd %WORKSPACE%\edk2 - -call edkSetup.bat Rebuild ``` =20 Once the environment is setup, the MinnowBoard MAX firmware and capsules c= an be rebuilt using the following commands. =20 -* Build Debug Image +* Build X64 Debug Image with report file =20 ``` -cd Vlv2TbltDevicePkg +cd edk2-platforms\Platform\Intel\Vlv2TbltDevicePkg Build_IFWI.bat /m /y MNW2 Debug ``` =20 -* Build Release Image +* Build X64 Release Image with build log =20 ``` -cd Vlv2TbltDevicePkg -Build_IFWI.bat /m /y MNW2 Release +cd edk2-platforms\Platform\Intel\Vlv2TbltDevicePkg +Build_IFWI.bat /m /l MNW2 Release ``` =20 -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`. +* Build IA32 Debug Image =20 -The CapsuleApp and generated UEFI Capsules are in `Build/Vlv2TbltDevicePkg= /Capsules` +``` +cd edk2-platforms\Platform\Intel\Vlv2TbltDevicePkg +Build_IFWI.bat /m /IA32 MNW2 Debug +``` + +The generated firmware image is the build output directory below WORKSPACE= . For +exampple, the X64 Debug Image is at: + +`Build\Vlv2TbltDevicePkg\DEBUG_VS2015x86\FV\Vlv.ROM` + +And the IA32 Release image is at: + +`Build\Vlv2TbltDevicePkgIA32\RELEASE_VS2015x86\FV\Vlv.ROM` + +The X64 CapsuleApp and generated UEFI Capsules are in the directory + +`Build\Vlv2TbltDevicePkg\Capsules` =20 # Linux Pre-requisites =20 -* The tool GenBiosId has a dependency on libc.so.6. Make sure it is insta= lled. - Here are a few example installation commands: - - sudo dnf install libc.so.6 - - apt-get install libc:i386 - # Download and Build MinnowMax using Linux/GCC =20 Run the script below from an empty directory. The script clones the EDK II @@ -134,24 +124,18 @@ the MinnowBoard MAX firmware and generates UEFI Capsu= les that can be used to update the MinnowBoard MAX firmware and three sample devices. =20 ``` -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 - -cd .. -mkdir Conf - -export WORKSPACE=3D$PWD/edk2 -export PACKAGES_PATH=3D$PWD/Vlv2Binaries -export EDK_TOOLS_PATH=3D$WORKSPACE/BaseTools - +git clone https://github.com/tianocore/edk2.git cd edk2 -cd Vlv2TbltDevicePkg -. Build_IFWI.sh MNW2 Debug +git submodule update --init +cd .. +git clone https://github.com/tianocore/edk2-platforms.git +git clone https://github.com/tianocore/edk2-non-osi.git + +export WORKSPACE=3D$PWD + +cd edk2-platforms/Platform/Intel/Vlv2TbltDevicePkg + +./Build_IFWI.sh /m MNW2 Debug ``` =20 Once all the code is downloaded and installed, only the following commands= are @@ -160,35 +144,44 @@ install the source and binaries. =20 ``` export WORKSPACE=3D$PWD/edk2 -export PACKAGES_PATH=3D$PWD/Vlv2Binaries -export EDK_TOOLS_PATH=3D$WORKSPACE/BaseTools - -cd edk2 -cd Vlv2TbltDevicePkg ``` =20 Once the environment is setup, the MinnowBoard MAX firmware and capsules c= an be rebuilt using the following commands. =20 +* Build X64 Debug Image with report file =20 -* Build Debug Image +``` +cd edk2-platforms/Platform/Intel/Vlv2TbltDevicePkg +./Build_IFWI.sh /m /y MNW2 Debug +``` + +* Build X64 Release Image with build log =20 ``` -cd Vlv2TbltDevicePkg -./Build_IFWI.sh MNW2 Debug +cd edk2-platforms/Platform/Intel/Vlv2TbltDevicePkg +./Build_IFWI.sh /m /l MNW2 Release ``` =20 -* Build Release Image +* Build IA32 Debug Image =20 ``` -cd Vlv2TbltDevicePkg -./Build_IFWI.sh MNW2 Release +cd edk2-platforms/Platform/Intel/Vlv2TbltDevicePkg +./Build_IFWI.sh /m /IA32 MNW2 Debug ``` =20 -The generated firmware image is the `MNW2MAX_X64_D_0084_01_GCC.bin` file in -`edk2\Vlv2TbltDevicePkg\Stitch` +The generated firmware image is the build output directory below WORKSPACE= . For +exampple, the X64 Debug Image is at: + +`Build/Vlv2TbltDevicePkg/DEBUG_GCC5/FV/Vlv.ROM` + +And the IA32 Release image is at: + +`Build/Vlv2TbltDevicePkgIA32/RELEASE_GCC5/FV/Vlv.ROM` + +The X64 CapsuleApp and generated UEFI Capsules are in the directory =20 -The CapsuleApp and generated UEFI Capsules are in `Build\Vlv2TbltDevicePkg= \Capsules` +`Build/Vlv2TbltDevicePkg/Capsules` =20 # Use DediProg to update FLASH image on a MinnowBoard MAX Target =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 (#43522): https://edk2.groups.io/g/devel/message/43522 Mute This Topic: https://groups.io/mt/32419755/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-