From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web09.4981.1666434046576044303 for ; Sat, 22 Oct 2022 03:20:47 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=ndq21DqZ; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: bob.c.feng@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666434046; x=1697970046; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=twEcsTW9IlqiByrNZ/M8uSyK8Jjp6nShazu5L4w5Q9U=; b=ndq21DqZMDPtg9/0mncAb1wPoCPw8/KeG6H5NW22M1laXJsItSFEFi/c Ubh9Uyz9HBtOkko3OZFYdE3Zplqxwee6edZwxSd17O9Wb3X5EYqeIu0Fa eyj332YA3v0Cis2euvhQ/a+LvG+EmlHlkbZhlFsq47ZaQIrLiUMTyyTFu idjfPn3oI1Owhl1dpOwva39XBhPBszrwDNxeMDGjRwuy7xKZ+orcFuuiS WWp3IWozU3Q8GDxzWEiZTGSqFWOL14ssNTIcyb0CNUh/i4wWv8INRo4EX CP/FK+NLcPvSpQCc1IEyThhjB95dzzyyRysPXkMplZlbjh3u+L4Tuik4V Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10507"; a="290482013" X-IronPort-AV: E=Sophos;i="5.95,205,1661842800"; d="scan'208";a="290482013" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Oct 2022 03:20:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10507"; a="756090025" X-IronPort-AV: E=Sophos;i="5.95,205,1661842800"; d="scan'208";a="756090025" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orsmga004.jf.intel.com with ESMTP; 22 Oct 2022 03:20:37 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 22 Oct 2022 03:20:37 -0700 Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 22 Oct 2022 03:20:36 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Sat, 22 Oct 2022 03:20:36 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.108) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Sat, 22 Oct 2022 03:20:36 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JwyC/tJBMhTrQT0L+Qfc57b3Ei9HV7H6H8F275HrDR+wAqjBzHB+j29JBj+2jo0lWIwAqsJSy01+PtWxeuukXMiZgl3dT/InIE68AwjQvJHcQbcuNC4b6/Y9nHHHzT0g7w+W9DuXUKL1Fuy6jRwrISZiC0Qos7Oh7RW6gDX/QmJV5J6NKSwAFB4ZJtF5PWQz8+ph6XXs9evizE/f4QxT2a+XBCydf9HguyDE7WMidL1KRSh6UKhRXeOKTDOYWdbhq9DlZIlEnSZyYn0svGu06sSsDC8fkWNDmnWPzrsFo5fhfHRuLJhyYfUNfYmCybT8qy1lRppRvYTG6ll6HudXOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=CJi0ywA7jiCFoIMWtgpSea/1CXztn4v+tiJq0JnUc6g=; b=UeN3xbAlNHKjBw9c2K70Wi2Zp8G07VqeOaVpWmkyOWxP6UBcEc4G+9UAmMRAa7BUP/j55OJS8WJck8RKjuIhPEMuPpDRGEBP3Pr261tdtWmRyGL9awpm+lF2ILybAHiLgRXwPBmUvFmcKxEVj+j7m9OZ+MrKU8/afTBiLOcHKX1cT8Ud5WmM2gS4RrQHVVa+Z3UgrrYQqCs1oVzlaQSOHNPKzvoCP+fCche6awNjMiJxXmZy6OrmKxsC8Kw18FdS/emyRv4EU8LcAwFobx7stdQxyLW6YvL4iDxaYnkSjUqGLxub9G6iXS/w7jH/ogjtJBJ4Z12my4Zv5ZgMiDLjHA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from PH7PR11MB5863.namprd11.prod.outlook.com (2603:10b6:510:135::11) by IA1PR11MB6396.namprd11.prod.outlook.com (2603:10b6:208:3ab::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Sat, 22 Oct 2022 10:20:34 +0000 Received: from PH7PR11MB5863.namprd11.prod.outlook.com ([fe80::5a9e:911b:b5fd:6503]) by PH7PR11MB5863.namprd11.prod.outlook.com ([fe80::5a9e:911b:b5fd:6503%5]) with mapi id 15.20.5723.033; Sat, 22 Oct 2022 10:20:34 +0000 From: "Bob Feng" To: "devel@edk2.groups.io" , "Hv, Pavamana" Subject: Re: [edk2-devel] [PATCH v2] edk2Platforms-Silicon:Add VAB FIT record types support in FitGen.c Thread-Topic: [edk2-devel] [PATCH v2] edk2Platforms-Silicon:Add VAB FIT record types support in FitGen.c Thread-Index: AQHY5DgiknthlhH/4kaUehbL1r1zVq4aN1Xw Date: Sat, 22 Oct 2022 10:20:34 +0000 Message-ID: References: <3bbfe7d39637575ca8942493c7d70df111400f1c.1666228699.git.pavamana.hv@intel.com> In-Reply-To: <3bbfe7d39637575ca8942493c7d70df111400f1c.1666228699.git.pavamana.hv@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.6.500.17 dlp-product: dlpe-windows dlp-reaction: no-action authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PH7PR11MB5863:EE_|IA1PR11MB6396:EE_ x-ms-office365-filtering-correlation-id: f29d788c-7702-47a1-a1f0-08dab4170e59 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Vpo9HW4T+1firL9SRWdLsClDHe7c1eCSxgoTGM1H518CDHJwqt2+0bY6gyHKYrD9evQ2kMSfJX8+FXmG5ZJN3yRzCHYziIhTnAbSaBrb0ap5Jh7UZ+oPcICNoiVICZbUHroH/N2Wlk3ERR/wCpzCBPN8AG8EFjVYwFUk7KNE42PFAaPgKLKZHUnfv7bJs4JBXWDBr6m0Q6SWmyWpjIrhoKZKEABp+TMsyiUyl3DYWN6xavxrWU6txWAT+U5rcZEbQeMpjqLcHneVa3AlyOG0oVt7Aj9IyEeZzWkIzgDqZ0HLLFU4JeYkLTZ8Gn9SGd353cU6PPkn1hkMMvy35XHTazeBYYZ8YmeCIOpiBKYGV7MoAv1Tw8k6I75pwmWARUC5rtjMcr1V3YC7INiIqeb7h+twpkS+4beZFo+zV0jc0Uy3526/+P13pjbu1lzlSBPtQLly1Y93Gj2jkfWHg9t4gqBXU5a/ww3ISEPaRbzpUbKnExO6YWJay9KJ4xrDS36T3tXuTRomp2RngBkP4mbanwruEOt5kPdY6okZ1q6z/qZTWeEygoKD6YeJ6ifx5qd1QqVzu+t07E+sESQyubRpq50XXaWS62vywGa2ijVIkIJpHwHnYtd+ljaauoNmvdIVWsr9eyNkCVS55CdWi4FxBv1MrhKVs6Ui31D1LJ5ca0OvGpg6kOFZ1HyBv6Ee1978h/ITSaYumKPYXacX/tzg4bbY/JpxnUHTPiY0jV1ZGZwateKQegNwT3qepsC8B/Bpc9IW7bZrg1YdjKqZ7hwPazghzEcuq062W10J8ATatXPr+xBSOXj9a4Mu2DD/CcqxqGmW56t/nMczkkSGGbh+GA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH7PR11MB5863.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(39860400002)(366004)(376002)(346002)(136003)(396003)(451199015)(64756008)(9686003)(66946007)(122000001)(52536014)(66556008)(26005)(478600001)(53546011)(66476007)(110136005)(76116006)(316002)(33656002)(55016003)(186003)(8676002)(86362001)(6636002)(7696005)(2906002)(38070700005)(966005)(41300700001)(82960400001)(6506007)(71200400001)(5660300002)(38100700002)(66899015)(66446008)(83380400001)(8936002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?LGxZD3f2JcDfUw20fB3vHfTwGjkc8ihO0xKTGYnUYOxr/BEa+x2Ai4rv3pba?= =?us-ascii?Q?vmElkYLC1rHJQcYCs47zgf0tUcq4IugN1aWz0Ua2XGwnrwqH3Ocw99RxQ6NW?= =?us-ascii?Q?JXxY8zIl1EG6WlwcMbhAoSzvG+IpXsOT2F/9dfnTpcf3EgMEkObjGJPJpDT6?= =?us-ascii?Q?iAIajDnTckYPnE/g+UOLxWRFa6mX8sdoJWekJUPpUTJQKEqYobD1QXBcOfkE?= =?us-ascii?Q?9nxI7fPdonQxnrm5cDGq+VtmPepsLprOL0ymwJFN/ZUAodqyl3Scq7MGe9jz?= =?us-ascii?Q?w9PfsJB/EeEiv1LFv7sghrczZJOPaP6gG7N7lKL8UrO7VLGHawkR7x8HKP5C?= =?us-ascii?Q?dI2ddr6xdDG1ka1rRb/2eTkhi6PtSZmQMmpFlxmbZ55DtY2ziJhYTf2JW5je?= =?us-ascii?Q?5zUjAuHO+4wds90RF8X6ELR1lufJSl+jqsWZtscZXAYFdck6rfartSGSzXrS?= =?us-ascii?Q?vz3p2M8/2iQEU4wNJRzwJLmi9YXaW8d94GoX0BO1KBT1qE9YR2mlEDQKlmMd?= =?us-ascii?Q?fWrmNKrJZzWZ9dZNDx51zkzDdPS7MANvp5rl1KOg3Rp7dFTWSmst2UvdIqo+?= =?us-ascii?Q?c+HeJM+dfs2ijO+QxUSR3SU+37vT+Ivw2H1wHhD6X1AJLG6jCPl5TeLmbfe9?= =?us-ascii?Q?wnqv7zlsCYPfFBoZhywgUW2i1KPU7JChKWkCbj4YtvtxsPy0kj4loh9ffGsB?= =?us-ascii?Q?dzaSWGGqenQnqcxIS4LgZoA66+TtCvmSDb+E83oXGVD+pYhhhrbExMg1AQq/?= =?us-ascii?Q?i/+sfxkQ7+RIVEZto4VuopYtjTeK59M5aoRuluCyLpDJiezlrc9itRa5pRrt?= =?us-ascii?Q?gb7Z2VKgf2FDPe29NIbHy1CUksPBowU5iUonrrINqTB0vp3OiyatgqoUeiM3?= =?us-ascii?Q?z2crgZ2je96rOmdCesigaGf67ToUdGYseZx3sIgA2pb/D5QIq2ao5qVhtWdM?= =?us-ascii?Q?qi4dnSwZM7vKvOttLWmsio12MXS0CZVeKtaaj7x1u84sfA5d6N8P6+LA562B?= =?us-ascii?Q?c0y9BRJHSonLMJypPqWJDubB91FCV3ncZ8kGY1/K+v5Bt8xV5yKZPhGaNKHS?= =?us-ascii?Q?lZ4l3YHYZCpvv6Qc1V2syhEbQz5Y6wqXTay1KVJHEwW6TGY7mgELhJjVy7se?= =?us-ascii?Q?cNvOJExowazWEYrwheZ4jMWOUegtPvgrkonWDNVcP833ZO/XVy6bBsXQPUB0?= =?us-ascii?Q?lO0qtPHqG6seC7Qcgg2vIjuBjjjrapV5zoy6Glq15pjHBGEC/e8Ec6XD4gWB?= =?us-ascii?Q?hHZhPyxabe+YaFkbk6UCnBl5Eu0nAPmpw8/w2MwMFIhfeWsdYhzJx0V2GIMd?= =?us-ascii?Q?apVQr9wJYNWh8zkq5oDgaKuLaS1UNIeEggq1CX2y5nuVgDOG7COBQnZ2pS39?= =?us-ascii?Q?fJ3mqcpkPBQNAGilu+j0BaPZOXHoXo50vo//i3tcW1A/Hll70MSVQTL+V70L?= =?us-ascii?Q?0LtGSK51SNHbfBLRLhawb8FbH0w1zZ0qIUeZesgA54D9z0IovrbPE2D0i8T9?= =?us-ascii?Q?1IyZcdFI3xaqLlfnt/DUUMRTurhfun8nAanUkRFB2RX1Y5s4/34BUqMQAPgj?= =?us-ascii?Q?lSH8GWyu/mHeiaXGl0lxROfLPBLjXpa20ytBKQnk?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH7PR11MB5863.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f29d788c-7702-47a1-a1f0-08dab4170e59 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Oct 2022 10:20:34.3880 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 9QFEu5ZTXx4GUS/2If+hTtgNHuDZUCdm3iM1wPZmoazDtvF8pUVPwDJDIn75zP46SFCI2f43yX/tZBpqRCu0Ew== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB6396 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Bob Feng -----Original Message----- From: devel@edk2.groups.io On Behalf Of Hv, Pavamana Sent: Thursday, October 20, 2022 11:57 AM To: devel@edk2.groups.io Cc: Hv, Pavamana Subject: [edk2-devel] [PATCH v2] edk2Platforms-Silicon:Add VAB FIT record t= ypes support in FitGen.c REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4086 This commit adds support for new FIT record type for Vendor Authorized Boot= (VAB) security technology(FIT spec revision 1.4). VAB defines 3 new following types Vendor Authorized Boot Provisioning Table (Type 0x1A) Vendor Authorized Boo= t Image Manifest (Type 0x1B) Vendor Authorized Boot Key Manifest (Type 0x1C= ) The code has been updated to align these binaries on 64 byte boundary and= not to overlap with other regions, similar to Key manifest, Boot Policy ma= nifest and other optional types. Also added macros to define FIT spec Major and Minor version numbers and pr= int the same instead of hardcoded string. Signed-off-by: Pavamana Holavanahalli --- Silicon/Intel/Tools/FitGen/FitGen.c | 61 +++++++++++++++++++---------- Si= licon/Intel/Tools/FitGen/FitGen.h | 5 ++- 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c b/Silicon/Intel/Tools/FitG= en/FitGen.c index 21dfcf1ebb..87123f9922 100644 --- a/Silicon/Intel/Tools/FitGen/FitGen.c +++ b/Silicon/Intel/Tools/FitGen/FitGen.c @@ -234,20 +234,24 @@ typedef struct { #define FLASH_TO_MEMORY(Address, FvBuffer, FvSize) \ (VO= ID *)(UINTN)((UINTN)(FvBuffer) + (UINTN)(FvSize) - (TOP_FLASH_ADDRESS - (UI= NTN)(Address))) -#define FIT_TABLE_TYPE_HEADER 0-#define FI= T_TABLE_TYPE_MICROCODE 1-#define FIT_TABLE_TYPE_STARTUP_ACM = 2-#define FIT_TABLE_TYPE_DIAGNST_ACM 3-#define FIT_TABL= E_TYPE_BIOS_MODULE 7-#define FIT_TABLE_TYPE_TPM_POLICY = 8-#define FIT_TABLE_TYPE_BIOS_POLICY 9-#define FIT_TABLE_TYPE= _TXT_POLICY 10-#define FIT_TABLE_TYPE_KEY_MANIFEST 11= -#define FIT_TABLE_TYPE_BOOT_POLICY_MANIFEST 12-#define FIT_TABLE_TYPE_BI= OS_DATA_AREA 13-#define FIT_TABLE_TYPE_CSE_SECURE_BOOT 16-#d= efine FIT_TABLE_SUBTYPE_FIT_PATCH_MANIFEST 12-#define FIT_TABLE_SUBTYPE_AC= M_MANIFEST 13+#define FIT_TABLE_TYPE_HEADER 0+#= define FIT_TABLE_TYPE_MICROCODE 1+#define FIT_TABLE_TYPE_= STARTUP_ACM 2+#define FIT_TABLE_TYPE_DIAGNST_ACM = 3+#define FIT_TABLE_TYPE_BIOS_MODULE 7+#define FIT_TA= BLE_TYPE_TPM_POLICY 8+#define FIT_TABLE_TYPE_BIOS_POLICY = 9+#define FIT_TABLE_TYPE_TXT_POLICY 10+#def= ine FIT_TABLE_TYPE_KEY_MANIFEST 11+#define FIT_TABLE_TYPE_BO= OT_POLICY_MANIFEST 12+#define FIT_TABLE_TYPE_BIOS_DATA_AREA = 13+#define FIT_TABLE_TYPE_CSE_SECURE_BOOT 16+#define FIT_T= ABLE_SUBTYPE_FIT_PATCH_MANIFEST 12+#define FIT_TABLE_SUBTYPE_ACM_MANI= FEST 13+#define FIT_TABLE_TYPE_VAB_PROVISION_TABLE 26+#= define FIT_TABLE_TYPE_VAB_BOOT_IMAGE_MANIFEST 27+#define FIT_TABLE_TYPE= _VAB_BOOT_KEY_MANIFEST 28+ // // With OptionalModule Address isn't k= nown until free space has been@@ -322,8 +326,10 @@ Returns: --*/ { printf (- "%s - Tiano IA32/X64 FIT table generation Utility fo= r FIT spec revision 1.2."" Version %i.%i\n\n",+ "%s - Tiano IA32/X64 FIT= table generation Utility for FIT spec revision %i.%i."" Version %i.%i\n\n"= , UTILITY_NAME,+ FIT_SPEC_VERSION_MAJOR,+ FIT_SPEC_VERSION_MINOR,= UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION );@@ -1956,7 +196= 2,10 @@ Returns: (gFitTableContext.OptionalModule[Index].Type =3D=3D FIT_TABLE_TYPE= _KEY_MANIFEST) || (gFitTableContext.OptionalModule[Index].Type =3D= =3D FIT_TABLE_TYPE_BOOT_POLICY_MANIFEST) || (gFitTableContext.Optio= nalModule[Index].Type =3D=3D FIT_TABLE_TYPE_BIOS_DATA_AREA) ||- (gFi= tTableContext.OptionalModule[Index].Type =3D=3D FIT_TABLE_TYPE_CSE_SECURE_B= OOT)) {+ (gFitTableContext.OptionalModule[Index].Type =3D=3D FIT_TAB= LE_TYPE_CSE_SECURE_BOOT) ||+ (gFitTableContext.OptionalModule[Index]= .Type =3D=3D FIT_TABLE_TYPE_VAB_PROVISION_TABLE) ||+ (gFitTableConte= xt.OptionalModule[Index].Type =3D=3D FIT_TABLE_TYPE_VAB_BOOT_IMAGE_MANIFEST= ) ||+ (gFitTableContext.OptionalModule[Index].Type =3D=3D FIT_TABLE_= TYPE_VAB_BOOT_KEY_MANIFEST)) { // NOTE: It might be virtual address n= ow. Just put a place holder. FitEntryNumber ++; }@@ -2154,8 +2163= ,11 @@ Returns: (gFitTableContext.OptionalModule[Index].Type =3D=3D FIT_TABLE_TY= PE_KEY_MANIFEST) || (gFitTableContext.OptionalModule[Index].Type = =3D=3D FIT_TABLE_TYPE_BOOT_POLICY_MANIFEST) || (gFitTableContext.= OptionalModule[Index].Type =3D=3D FIT_TABLE_TYPE_BIOS_DATA_AREA) ||- = (gFitTableContext.OptionalModule[Index].Type =3D=3D FIT_TABLE_TYPE_CSE_S= ECURE_BOOT)) {- // Let it 64 byte align+ (gFitTableContext.= OptionalModule[Index].Type =3D=3D FIT_TABLE_TYPE_CSE_SECURE_BOOT) ||+ = (gFitTableContext.OptionalModule[Index].Type =3D=3D FIT_TABLE_TYPE_VAB_= PROVISION_TABLE) ||+ (gFitTableContext.OptionalModule[Index].Type = =3D=3D FIT_TABLE_TYPE_VAB_BOOT_IMAGE_MANIFEST) ||+ (gFitTableConte= xt.OptionalModule[Index].Type =3D=3D FIT_TABLE_TYPE_VAB_BOOT_KEY_MANIFEST))= {+ // Let it 64 byte align AlignedSize +=3D BIOS_MODULE_A= LIGNMENT; AlignedSize &=3D ~BIOS_MODULE_ALIGNMENT; }@@ -2166,= 8 +2178,11 @@ Returns: (gFitTableContext.OptionalModule[Index].Type =3D=3D FIT_TABLE_TY= PE_KEY_MANIFEST) || (gFitTableContext.OptionalModule[Index].Type = =3D=3D FIT_TABLE_TYPE_BOOT_POLICY_MANIFEST) || (gFitTableContext.= OptionalModule[Index].Type =3D=3D FIT_TABLE_TYPE_BIOS_DATA_AREA) ||- = (gFitTableContext.OptionalModule[Index].Type =3D=3D FIT_TABLE_TYPE_CSE_S= ECURE_BOOT)) {- // Let it 64 byte align+ (gFitTableContext.= OptionalModule[Index].Type =3D=3D FIT_TABLE_TYPE_CSE_SECURE_BOOT) ||+ = (gFitTableContext.OptionalModule[Index].Type =3D=3D FIT_TABLE_TYPE_VAB_= PROVISION_TABLE) ||+ (gFitTableContext.OptionalModule[Index].Type = =3D=3D FIT_TABLE_TYPE_VAB_BOOT_IMAGE_MANIFEST) ||+ (gFitTableConte= xt.OptionalModule[Index].Type =3D=3D FIT_TABLE_TYPE_VAB_BOOT_KEY_MANIFEST))= {+ // Let it 64 byte align OptionalModuleAddress =3D (UIN= T8 *)((UINTN)OptionalModuleAddress & ~BIOS_MODULE_ALIGNMENT); } @@ -2= 201,7 +2216,11 @@ Returns: (gFitTableContext.OptionalModule[Index].Type =3D=3D FIT_TABLE_TYPE= _KEY_MANIFEST) || (gFitTableContext.OptionalModule[Index].Type =3D= =3D FIT_TABLE_TYPE_BOOT_POLICY_MANIFEST) || (gFitTableContext.Optio= nalModule[Index].Type =3D=3D FIT_TABLE_TYPE_BIOS_DATA_AREA) ||- (gFi= tTableContext.OptionalModule[Index].Type =3D=3D FIT_TABLE_TYPE_CSE_SECURE_B= OOT)) {+ (gFitTableContext.OptionalModule[Index].Type =3D=3D FIT_TAB= LE_TYPE_CSE_SECURE_BOOT) ||+ (gFitTableContext.OptionalModule[Index]= .Type =3D=3D FIT_TABLE_TYPE_VAB_PROVISION_TABLE) ||+ (gFitTableConte= xt.OptionalModule[Index].Type =3D=3D FIT_TABLE_TYPE_VAB_BOOT_IMAGE_MANIFEST= ) ||+ (gFitTableContext.OptionalModule[Index].Type =3D=3D FIT_TABLE_= TYPE_VAB_BOOT_KEY_MANIFEST)) {+ CheckOverlap (gFitTableContext.Option= alModule[Index].Address, AlignedSize); } }diff --git a/Silicon/Intel/= Tools/FitGen/FitGen.h b/Silicon/Intel/Tools/FitGen/FitGen.h index 80a1423ceb..511ab652ab 100644 --- a/Silicon/Intel/Tools/FitGen/FitGen.h +++ b/Silicon/Intel/Tools/FitGen/FitGen.h @@ -31,9 +31,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // Utility version information // #define UTILITY_MAJOR_VERSION 0-#define = UTILITY_MINOR_VERSION 66+#define UTILITY_MINOR_VERSION 67 #define UTILITY_D= ATE __DATE__ +#define FIT_SPEC_VERSION_MAJOR 1+#define FIT_SPEC_VE= RSION_MINOR 4+ // // The minimum number of arguments accepted from the comm= and line. //--=20 2.26.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D Groups.io Links: You receive all messages sent to this group. View/Reply Online (#95416): https://edk2.groups.io/g/devel/message/95416 Mute This Topic: https://groups.io/mt/94447248/1768742 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [bob.c.feng@intel.com] -= =3D-=3D-=3D-=3D-=3D-=3D