From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web09.5562.1624844295267473832 for ; Sun, 27 Jun 2021 18:38:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=cBGFA9mT; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: chasel.chiu@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10028"; a="271731331" X-IronPort-AV: E=Sophos;i="5.83,304,1616482800"; d="scan'208";a="271731331" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jun 2021 18:38:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,304,1616482800"; d="scan'208";a="456121941" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by fmsmga008.fm.intel.com with ESMTP; 27 Jun 2021 18:38:14 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Sun, 27 Jun 2021 18:38:13 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4 via Frontend Transport; Sun, 27 Jun 2021 18:38:13 -0700 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.176) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.4; Sun, 27 Jun 2021 18:38:13 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j+hvxQg6bibydaqGftOTHPxu+gNjoq2yEBN/REhbgnE4Znrrh/4/BFoDff019FDgObf0C/C7+DK47DSYOhE7wBH7StROBapPYhbHLdt+3j+to5ujwN1i+v721njgTqrsqSbj1BC6cimMv2gJfDgZS20LCWIiN8Bw+qVyrVaL7xxnQl0c97c32UsWlR16JUJ203KXFHeNEwQVNfE8IKsf6R4OWXvDrFdhYJy/ZySHAlnsgDhKYaq1ccZa6z6lKjKxHF2nGFeIOZ8m3rAgBkkm8OQtKEBj4+MbIGdr+ewYSUn5zki0dDkn6hmjjvqECBkseKqtcoW3ou/iQLLJ4gZtVQ== 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-SenderADCheck; bh=0+jMmT3ha0JMzL4lTxQzL2ZFmDw01dxioutRHSrTK5I=; b=TQlsdegcK/nwTGtbbxWBu8JjePeLVV2aFxqu04Q7LOsSjssnzpXqAxqu3SrQt6XVrSase4O5D+AGvBJQTajmtX80iReJj7TJtz9zaRjX16z8j+SiJh1HofJGzxb7/69HGKizcntzQLCfvP7Yj1x2/ibNc49M0QWsfaAaTusrp7rzhR0P4xO7Lw4A2ZpzOTge1sFUzPlMZzxJYaAY1Ag/0EUspvALij4p++EPCfijQH5DEvEBuskZyfCB0viCUY/nFPNxR7hXKzpYkZk0AxzbpQS2Uq5Rv32vSgZfWa7bvXtDLJ4rUm/1PuiRNVcELNc6wH6nccLgBaBjK/NWrAaaSg== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0+jMmT3ha0JMzL4lTxQzL2ZFmDw01dxioutRHSrTK5I=; b=cBGFA9mTJoIjCBLiCBrVIZT1GmXuztML4cMtsKMhmjvJfS2IQKuEAf764xSh3o92w1PkItmnlVnuzcsX3tmMDuFXpZE162vwh+VpAWDhEXS7Qv7M5W2/h1EoK/N8RzABVoT8ALKgd2cYitcp3+e8pa45YtIdERio2nO62JM7PQE= Received: from BN9PR11MB5483.namprd11.prod.outlook.com (2603:10b6:408:104::10) by BN6PR11MB3858.namprd11.prod.outlook.com (2603:10b6:405:7e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.26; Mon, 28 Jun 2021 01:38:12 +0000 Received: from BN9PR11MB5483.namprd11.prod.outlook.com ([fe80::2162:be61:a479:4168]) by BN9PR11MB5483.namprd11.prod.outlook.com ([fe80::2162:be61:a479:4168%7]) with mapi id 15.20.4264.026; Mon, 28 Jun 2021 01:38:12 +0000 From: "Chiu, Chasel" To: "devel@edk2.groups.io" , "mikuback@linux.microsoft.com" CC: "Desimone, Nathaniel L" Subject: Re: [edk2-devel] [edk2-platforms][PATCH v4 15/41] WhiskeylakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs Thread-Topic: [edk2-devel] [edk2-platforms][PATCH v4 15/41] WhiskeylakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs Thread-Index: AQHXaghKcFsqQ5gxCkqlTZHBiQFzJ6soqGrg Date: Mon, 28 Jun 2021 01:38:11 +0000 Message-ID: References: <20210625212120.235-1-mikuback@linux.microsoft.com> <20210625212120.235-16-mikuback@linux.microsoft.com> In-Reply-To: <20210625212120.235-16-mikuback@linux.microsoft.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=intel.com; x-originating-ip: [114.43.34.211] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 34e005ea-9f78-497d-bf89-08d939d56425 x-ms-traffictypediagnostic: BN6PR11MB3858: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2958; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: hEFcucnXH3YQkFqNMVUvLwJBcM+uXef846ekkAFHaV2gUMUwGZ99lOYDwrTQztwjSVbYUOwa/dLDeXzVZcOts2k+ACDjuR7N/etT6bP0WzAeyBskpKg4CgyuGy+hXly3a8EcOWqsuXrFu4tv1wL0YmlqJWzg/+p/KAApqFk5I38thZLpaRuYtXMSHRVznFRQ8VBirK/anzVsCFdpA3D5DGMKbJetE1/5rd1hHwg6k7wimtV7xs0pzMOV9YYnsM6ln2bh50wPZ9O3RMwmrTYoJfJ+bdikQ9H+i7w0/Fe9SMrPG6jRg969K5a1STanAKOWuLfe2SjskCqY1omDa/wZ4klz7COwF7qNnQ3eIl18awwRjv4/VgFLOja0IsVwtQFvyG11dzb6bq4F1wH6kTsKlI/E4eTHiYoqJgzwfUsEvV8tyl8FI1ridS2g76K34td9Ao6TDoQzZsjsa9xDZfwvs/UrlrQ9BongQ5GjzCFP2J130j8RmrqOHEXtxXtPKtCBaYacPKZNHtCiLpXTeAus2BezGpu0MI1kxUHLYQX+XA0wxa0s74J7/B12T0z1T1T+cYxZnPbe0PDjSR4s4r14AcmVbuilTA1tJZOPTG8B6TytsI18FAtm7BGEf8LiF2ESONkayFUAkyFQT+kiBCmKsVR/YbRgIqTA5VsJ3C18qIg19l/UpLhNP4L7IcZxHqHCHRG6R/kPKtbvodDnbn7F6xTDKxOjFQDesH1LYht1TpdWWdEF79ZPiOzvcZwWS6JBu4FSwNv+tZYzeg9tu2TmuwbI0DzdDSsizAoECTGlBj86HssS1wYFx9tIDx9mIX8e x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN9PR11MB5483.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(39860400002)(396003)(346002)(376002)(136003)(366004)(122000001)(52536014)(966005)(71200400001)(38100700002)(55016002)(9686003)(316002)(8936002)(4326008)(6506007)(53546011)(107886003)(8676002)(7696005)(2906002)(64756008)(83380400001)(19627235002)(33656002)(186003)(478600001)(110136005)(86362001)(30864003)(26005)(66946007)(66476007)(66446008)(76116006)(66556008)(5660300002)(11716005)(579004);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?3Qb4RGTScJwvd+ezuWnGSZqVwnAhaphFZxJvEMh76yBgUqJ4UIKrFa/+pmAv?= =?us-ascii?Q?NRv0oxKK67XP3974XfLz0MFHthgdoE0h/a2Kwy3RmUw36wEv/1OyazlMdOYG?= =?us-ascii?Q?3WSwDln6fjxEn1N/+/Pjef/yPY7r+lQLzb+gB2i8h83yBP1ALUnG4AEO1PBc?= =?us-ascii?Q?Hlz9khyZDc2ajU9V49deve7hYzAkBYXI/6v8eGBbbP4EUipBiJFFMaOXcPBO?= =?us-ascii?Q?YKOVUTZ6vdulchJiyG+OIowZ4f2sT9GEx4QGiUh9/S4FZ9W4Mg+uyqtkHiSs?= =?us-ascii?Q?OFHtzJOUNLyPRTFZ5ieT+f29IBc/APhvdqzSD7Q9SZaF0abW8xG3gDzyLBIs?= =?us-ascii?Q?FhZG/WSao4c691OAIJDsgpaGxMIUFiQ5UiTrSDSWD1BzovuwzdyDqRhFrnXo?= =?us-ascii?Q?cyGUi5IkFsU3quXFmK59TlE0hbE5yElsrlP/CHyy/EZVNcLlpOj+a82/UeVs?= =?us-ascii?Q?f6a6TWwfz3dfarvEMnGDnI9B0UNZ10jbva1NTQmR81qleuyQd81lCVoqJpVK?= =?us-ascii?Q?dn8JOAohY2t0jIRLeeod7Pb2dpbUVruN215WpvnnfDob3gjqvIUvYR72pO80?= =?us-ascii?Q?wVp2V3rnpIlSBgNWzPMBfIx5iJOdRUT+Yfxa8C8LY7ID/DiDwfFVgfF9xPyN?= =?us-ascii?Q?wXOPMBXsD7gDSRRSdHGHSFA9Hk4G8pO3jk/1UTCW5VkRGdX1qtt3MRtv+85o?= =?us-ascii?Q?kCBKpHx4IFyMc6Y+Jym5WLW7UqQuiXfRP6afDGHcDIuMMGmuA5Bgyef7PBqm?= =?us-ascii?Q?6gZH+xvaUb7q3y0Kshz7Pxu7G36xDdLAmzgLQiUdPXl9lQXqFTZz+tDN2z98?= =?us-ascii?Q?Jd+B3EzOtErARyqDnqz8X3j/pBWD5Aj8HhFManuoI2ZtELp80wHm0gr9j07H?= =?us-ascii?Q?AHf2zpVVMxsQdLFA0zINpgD7yCAlI7LlPZlNJ7KZ8g5r+GQuYsA7CjDjk/lu?= =?us-ascii?Q?miLNX/IIJC7iGmRoX7xsdiHMjxuImAnpXe1qNsyzSvFupZF9io45VCyloK79?= =?us-ascii?Q?/CBVwqE3MnR6InHzpaBiT2TKtLxF5DQp17CrkUB2zbImGHsLewQfz4oZFV+L?= =?us-ascii?Q?nDhMMV46WmTXqvSBQOPEA1CBF8Zm7XAKeLB7NyxmHyI4mJlUmLlwf+oqA/M7?= =?us-ascii?Q?nOhnE8mkl5TEU4QC6nSCPFoAgAnUqfEI9jB+fzhECSr9/1/Vc1C26QoYcnvP?= =?us-ascii?Q?pz7Dvqozi+17a7afjBdV0lq6iwEjAgWR9Vf1AlLmM8dY6auSNpMr1gBHP+wd?= =?us-ascii?Q?LenCWt/LEXrXBopD9cgdelm184vkVC4FfEvVJITowT3ar3DOY6O48bKyB7kM?= =?us-ascii?Q?IGi1/ht7uark6PZIG2IkdE+O?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN9PR11MB5483.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 34e005ea-9f78-497d-bf89-08d939d56425 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jun 2021 01:38:11.9832 (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: JdXuF3FyTLTiSDpW1fJ2bia8nDJFQOjKppri2cYrLW8zdJZDwdSE7Yfdp1thKj4/fFZp0Zm3hUE02rA5fUqvvw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB3858 Return-Path: chasel.chiu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Chasel Chiu > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Michael > Kubacki > Sent: Saturday, June 26, 2021 5:21 AM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Desimone, Nathaniel L > > Subject: [edk2-devel] [edk2-platforms][PATCH v4 15/41] > WhiskeylakeOpenBoardPkg: Use IntelSiliconPkg BIOS area and ucode PCDs >=20 > From: Michael Kubacki >=20 > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3307 >=20 > Updates PCDs to use the IntelSiliconPkg PCD tokenspace now that the PCDs = are > declared in IntelSiliconPkg.dec. >=20 > Cc: Chasel Chiu > Cc: Nate DeSimone > Signed-off-by: Michael Kubacki > Reviewed-by: Nate DeSimone > --- > Platform/Intel/WhiskeylakeOpenBoardPkg/BiosInfo/BiosInfo.inf > | 4 +-- >=20 > Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitDxe= .in > f | 4 +-- >=20 > Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/Include/Fdf/FlashMapIncl > ude.fdf | 4 +-- >=20 > Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/Library/BoardInitLib/Pei > MultiBoardInitPreMemLib.inf | 2 +- > Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.fdf > | 36 ++++++++++---------- >=20 > Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/Fdf/Flash > MapInclude.fdf | 4 +-- >=20 > Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.fd > f | 36 ++++++++++---------- > 7 files changed, 45 insertions(+), 45 deletions(-) >=20 > diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/BiosInfo/BiosInfo.inf > b/Platform/Intel/WhiskeylakeOpenBoardPkg/BiosInfo/BiosInfo.inf > index a9687d93dee1..0a807ad84f4d 100644 > --- a/Platform/Intel/WhiskeylakeOpenBoardPkg/BiosInfo/BiosInfo.inf > +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/BiosInfo/BiosInfo.inf > @@ -36,8 +36,8 @@ [Packages] > MinPlatformPkg/MinPlatformPkg.dec >=20 > [Pcd] > - gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase ## CON= SUMES > - gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize ## CON= SUMES > + gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase = ## > CONSUMES > + gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize = ## > CONSUMES >=20 > [Sources] > BiosInfo.c > diff --git > a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitD= xe. > inf > b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitD= xe. > inf > index 3233375d6568..537d507ed7d6 100644 > --- > a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitD= xe. > inf > +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/PolicyInitDxe/Policy > +++ InitDxe.inf > @@ -47,8 +47,8 @@ [Packages] >=20 > [Pcd] > gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress = ## > CONSUMES > - gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase = ## > CONSUMES > - gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize = ## CONSUMES > + gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase = ## > CONSUMES > + gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize = ## > CONSUMES > gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdIntelGopEnable > gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPlatformFlavor > gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPlatformType > diff --git > a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/Include/Fdf/FlashMapI > nclude.fdf > b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/Include/Fdf/FlashMapI > nclude.fdf > index f7aa730ae7d2..5895eebc5a79 100644 > --- > a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/Include/Fdf/FlashMapI > nclude.fdf > +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/Include/Fdf/FlashM > +++ apInclude.fdf > @@ -38,8 +38,8 @@ > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize =3D > 0x00170000 # > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSOffset =3D > 0x00490000 # Flash addr (0xFFDE0000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSSize =3D > 0x00070000 # > -SET gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset =3D = 0x00500000 > # Flash addr (0xFFE50000) > -SET gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize =3D = 0x00050000 > # > +SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset =3D > 0x00500000 # Flash addr (0xFFE50000) > +SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize =3D > 0x00050000 # > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMOffset =3D > 0x00550000 # Flash addr (0xFFEA0000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMSize =3D > 0x000EA000 # > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTOffset =3D > 0x0063A000 # Flash addr (0xFFF8A000) > diff --git > a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/Library/BoardInitLib/Pe > iMultiBoardInitPreMemLib.inf > b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/Library/BoardInitLib/Pe > iMultiBoardInitPreMemLib.inf > index 2903bdacaebd..091d2118c7b3 100644 > --- > a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/Library/BoardInitLib/Pe > iMultiBoardInitPreMemLib.inf > +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/Library/BoardInitL > +++ ib/PeiMultiBoardInitPreMemLib.inf > @@ -293,7 +293,7 @@ [Pcd] > gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTSize > gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMSize > gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSSize > - gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize > + gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize >=20 > [FixedPcd] > gSiPkgTokenSpaceGuid.PcdMchBaseAddress ## CONSUMES > diff --git > a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.fdf > b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.fdf > index 22fbfc99f0f0..8aea5aa475a0 100644 > --- a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.fdf > +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.fdf > @@ -31,8 +31,8 @@ [FD.UpXtreme] > # assigned with PCD values. Instead, it uses the definitions for its var= iety, which > # are FLASH_BASE, FLASH_SIZE, FLASH_BLOCK_SIZE and FLASH_NUM_BLOCKS. > # > -BaseAddress =3D $(FLASH_BASE) | > gSiPkgTokenSpaceGuid.PcdBiosAreaBaseAddress #The base address of the > FLASH Device. > -Size =3D $(FLASH_SIZE) | gSiPkgTokenSpaceGuid.PcdBiosSize = #The size > in bytes of the FLASH Device > +BaseAddress =3D $(FLASH_BASE) | > gIntelSiliconPkgTokenSpaceGuid.PcdBiosAreaBaseAddress #The base address = of > the FLASH Device. > +Size =3D $(FLASH_SIZE) | gIntelSiliconPkgTokenSpaceGuid.PcdBios= Size > #The size in bytes of the FLASH Device > ErasePolarity =3D 1 > BlockSize =3D $(FLASH_BLOCK_SIZE) > NumBlocks =3D $(FLASH_NUM_BLOCKS) > @@ -43,21 +43,21 @@ [FD.UpXtreme] > # Set FLASH_REGION_FV_RECOVERY_OFFSET to PcdNemCodeCacheBase, > because macro expression is not supported. > # So, PlatformSecLib uses PcdBiosAreaBaseAddress + PcdNemCodeCacheBase > to get the real CodeCache base address. > SET gSiPkgTokenSpaceGuid.PcdNemCodeCacheBase =3D > $(gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryOffset) > -SET gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase =3D > $(gSiPkgTokenSpaceGuid.PcdBiosAreaBaseAddress) + > $(gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset) > -SET gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize =3D > $(gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize) > -SET gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchAddress =3D > $(gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase) + 0x60 -SET > gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize =3D > $(gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize) - 0x60 > +SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase =3D > +$(gIntelSiliconPkgTokenSpaceGuid.PcdBiosAreaBaseAddress) + > +$(gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset) > +SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize =3D > +$(gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize) > +SET gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchAddress =3D > +$(gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase) + 0x60 SET > +gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize =3D > +$(gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize) - 0x60 > SET gMinPlatformPkgTokenSpaceGuid.PcdMicrocodeOffsetInFv =3D 0x60 > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeBase =3D > gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeSize =3D > gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeOffset =3D > gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset > -SET gIntelFsp2WrapperTokenSpaceGuid.PcdFlashCodeCacheAddress =3D > gSiPkgTokenSpaceGuid.PcdBiosAreaBaseAddress > -SET gIntelFsp2WrapperTokenSpaceGuid.PcdFlashCodeCacheSize =3D > gSiPkgTokenSpaceGuid.PcdBiosSize > -SET gIntelFsp2WrapperTokenSpaceGuid.PcdFsptBaseAddress =3D > $(gSiPkgTokenSpaceGuid.PcdBiosAreaBaseAddress) + > $(gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTOffset) > -SET gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress =3D > $(gSiPkgTokenSpaceGuid.PcdBiosAreaBaseAddress) + > $(gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMOffset) > -SET gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress =3D > $(gSiPkgTokenSpaceGuid.PcdBiosAreaBaseAddress) + > $(gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSOffset) > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaBaseAddress =3D > gSiPkgTokenSpaceGuid.PcdBiosAreaBaseAddress > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize =3D > gSiPkgTokenSpaceGuid.PcdBiosSize > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeBase =3D > gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeSize =3D > gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeOffset =3D > +gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset > +SET gIntelFsp2WrapperTokenSpaceGuid.PcdFlashCodeCacheAddress =3D > gIntelSiliconPkgTokenSpaceGuid.PcdBiosAreaBaseAddress > +SET gIntelFsp2WrapperTokenSpaceGuid.PcdFlashCodeCacheSize =3D > gIntelSiliconPkgTokenSpaceGuid.PcdBiosSize > +SET gIntelFsp2WrapperTokenSpaceGuid.PcdFsptBaseAddress =3D > $(gIntelSiliconPkgTokenSpaceGuid.PcdBiosAreaBaseAddress) + > $(gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTOffset) > +SET gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress =3D > $(gIntelSiliconPkgTokenSpaceGuid.PcdBiosAreaBaseAddress) + > $(gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMOffset) > +SET gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress =3D > $(gIntelSiliconPkgTokenSpaceGuid.PcdBiosAreaBaseAddress) + > $(gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSOffset) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaBaseAddress =3D > gIntelSiliconPkgTokenSpaceGuid.PcdBiosAreaBaseAddress > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize =3D > gIntelSiliconPkgTokenSpaceGuid.PcdBiosSize >=20 > ################################################################# > ############### > # > # Following are lists of FD Region layout which correspond to the locati= ons of > different @@ -158,8 +158,8 @@ [FD.UpXtreme] # FSP_S Section FILE =3D > $(PLATFORM_FSP_BIN_PACKAGE)/Fsp_Rebased_S.fd >=20 > - > gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset|gSiPkgTokenSpaceGuid.Pcd > FlashMicrocodeFvSize > - > gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase|gSiPkgTokenSpaceGuid.PcdFl > ashMicrocodeFvSize > +gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset|gIntelSiliconP > +kgTokenSpaceGuid.PcdFlashMicrocodeFvSize > +gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase|gIntelSiliconPkg > +TokenSpaceGuid.PcdFlashMicrocodeFvSize > #Microcode > FV =3D FvMicrocode >=20 > diff --git > a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/Fdf/Fla > shMapInclude.fdf > b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/Fdf/Fla > shMapInclude.fdf > index e0db38194211..586e3488c2a7 100644 > --- > a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/Fdf/Fla > shMapInclude.fdf > +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/Fdf > +++ /FlashMapInclude.fdf > @@ -34,8 +34,8 @@ > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootSize =3D > 0x00190000 # > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset =3D > 0x00320000 # Flash addr (0xFFB20000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize =3D > 0x00170000 # > -SET gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset =3D = 0x00490000 > # Flash addr (0xFFC90000) > -SET gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize =3D = 0x000B0000 > # > +SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset =3D > 0x00490000 # Flash addr (0xFFC90000) > +SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize =3D > 0x000B0000 # > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSOffset =3D > 0x00540000 # Flash addr (0xFFD40000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSSize =3D > 0x00070000 # > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMOffset =3D > 0x005B0000 # Flash addr (0xFFDB0000) > diff --git > a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg. > fdf > b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg. > fdf > index 1ab8c137924e..f0601984338c 100644 > --- > a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg. > fdf > +++ > b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPk > +++ g.fdf > @@ -31,8 +31,8 @@ [FD.WhiskeylakeURvp] > # assigned with PCD values. Instead, it uses the definitions for its var= iety, which > # are FLASH_BASE, FLASH_SIZE, FLASH_BLOCK_SIZE and FLASH_NUM_BLOCKS. > # > -BaseAddress =3D $(FLASH_BASE) | > gSiPkgTokenSpaceGuid.PcdBiosAreaBaseAddress #The base address of the > FLASH Device. > -Size =3D $(FLASH_SIZE) | gSiPkgTokenSpaceGuid.PcdBiosSize = #The size > in bytes of the FLASH Device > +BaseAddress =3D $(FLASH_BASE) | > gIntelSiliconPkgTokenSpaceGuid.PcdBiosAreaBaseAddress #The base address = of > the FLASH Device. > +Size =3D $(FLASH_SIZE) | gIntelSiliconPkgTokenSpaceGuid.PcdBios= Size > #The size in bytes of the FLASH Device > ErasePolarity =3D 1 > BlockSize =3D $(FLASH_BLOCK_SIZE) > NumBlocks =3D $(FLASH_NUM_BLOCKS) > @@ -43,21 +43,21 @@ [FD.WhiskeylakeURvp] # Set > FLASH_REGION_FV_RECOVERY_OFFSET to PcdNemCodeCacheBase, because > macro expression is not supported. > # So, PlatformSecLib uses PcdBiosAreaBaseAddress + PcdNemCodeCacheBase > to get the real CodeCache base address. > SET gSiPkgTokenSpaceGuid.PcdNemCodeCacheBase =3D > $(gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryOffset) > -SET gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase =3D > $(gSiPkgTokenSpaceGuid.PcdBiosAreaBaseAddress) + > $(gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset) > -SET gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize =3D > $(gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize) > -SET gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchAddress =3D > $(gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase) + 0x60 -SET > gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize =3D > $(gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize) - 0x60 > +SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase =3D > +$(gIntelSiliconPkgTokenSpaceGuid.PcdBiosAreaBaseAddress) + > +$(gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset) > +SET gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize =3D > +$(gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize) > +SET gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchAddress =3D > +$(gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase) + 0x60 SET > +gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize =3D > +$(gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize) - 0x60 > SET gMinPlatformPkgTokenSpaceGuid.PcdMicrocodeOffsetInFv =3D 0x60 > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeBase =3D > gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeSize =3D > gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeOffset =3D > gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset > -SET gIntelFsp2WrapperTokenSpaceGuid.PcdFlashCodeCacheAddress =3D > gSiPkgTokenSpaceGuid.PcdBiosAreaBaseAddress > -SET gIntelFsp2WrapperTokenSpaceGuid.PcdFlashCodeCacheSize =3D > gSiPkgTokenSpaceGuid.PcdBiosSize > -SET gIntelFsp2WrapperTokenSpaceGuid.PcdFsptBaseAddress =3D > $(gSiPkgTokenSpaceGuid.PcdBiosAreaBaseAddress) + > $(gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTOffset) > -SET gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress =3D > $(gSiPkgTokenSpaceGuid.PcdBiosAreaBaseAddress) + > $(gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMOffset) > -SET gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress =3D > $(gSiPkgTokenSpaceGuid.PcdBiosAreaBaseAddress) + > $(gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSOffset) > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaBaseAddress =3D > gSiPkgTokenSpaceGuid.PcdBiosAreaBaseAddress > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize =3D > gSiPkgTokenSpaceGuid.PcdBiosSize > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeBase =3D > gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeSize =3D > gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeOffset =3D > +gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset > +SET gIntelFsp2WrapperTokenSpaceGuid.PcdFlashCodeCacheAddress =3D > gIntelSiliconPkgTokenSpaceGuid.PcdBiosAreaBaseAddress > +SET gIntelFsp2WrapperTokenSpaceGuid.PcdFlashCodeCacheSize =3D > gIntelSiliconPkgTokenSpaceGuid.PcdBiosSize > +SET gIntelFsp2WrapperTokenSpaceGuid.PcdFsptBaseAddress =3D > $(gIntelSiliconPkgTokenSpaceGuid.PcdBiosAreaBaseAddress) + > $(gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTOffset) > +SET gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress =3D > $(gIntelSiliconPkgTokenSpaceGuid.PcdBiosAreaBaseAddress) + > $(gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMOffset) > +SET gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress =3D > $(gIntelSiliconPkgTokenSpaceGuid.PcdBiosAreaBaseAddress) + > $(gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSOffset) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaBaseAddress =3D > gIntelSiliconPkgTokenSpaceGuid.PcdBiosAreaBaseAddress > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize =3D > gIntelSiliconPkgTokenSpaceGuid.PcdBiosSize >=20 > ################################################################# > ############### > # > # Following are lists of FD Region layout which correspond to the locati= ons of > different @@ -153,8 +153,8 @@ [FD.WhiskeylakeURvp] > gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryBase|gMinPlatformPk > gTokenSpaceGuid.PcdFlashFvPostMemorySize > FV =3D FvPostMemory >=20 > - > gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset|gSiPkgTokenSpaceGuid.Pcd > FlashMicrocodeFvSize > - > gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase|gSiPkgTokenSpaceGuid.PcdFl > ashMicrocodeFvSize > +gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset|gIntelSiliconP > +kgTokenSpaceGuid.PcdFlashMicrocodeFvSize > +gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase|gIntelSiliconPkg > +TokenSpaceGuid.PcdFlashMicrocodeFvSize > #Microcode > FV =3D FvMicrocode >=20 > -- > 2.28.0.windows.1 >=20 >=20 >=20 > -=3D-=3D-=3D-=3D-=3D-=3D > Groups.io Links: You receive all messages sent to this group. > View/Reply Online (#77112): https://edk2.groups.io/g/devel/message/77112 > Mute This Topic: https://groups.io/mt/83794796/1777047 > Group Owner: devel+owner@edk2.groups.io > Unsubscribe: https://edk2.groups.io/g/devel/unsub [chasel.chiu@intel.com] > -=3D-=3D-=3D-=3D-=3D-=3D >=20